Skip to content

[beta] Processing merged backports #50127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 17 commits into from
Apr 21, 2018
Merged

[beta] Processing merged backports #50127

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
164d1f1
Fix path attribute in rustdoc
GuillaumeGomez Mar 26, 2018
2bdfb33
Add docs for the test crate with the std docs
ollie27 Mar 28, 2018
ffcb0cc
Remove `underscore_lifetimes` and `match_default_bindings` from activ…
kennytm Apr 4, 2018
41cf3c7
Fix ICE with `main`'s return type containing lifetimes
sinkuu Apr 5, 2018
0fe037d
add `failure-status: 1` to the test
nikomatsakis Apr 5, 2018
06ae85c
Use InternedString instead of Symbol for type parameters.
michaelwoerister Mar 21, 2018
ac03f1e
Fix rustdoc after changing type param representation.
michaelwoerister Apr 3, 2018
4484548
Fix error in rustc_driver::test.
michaelwoerister Apr 4, 2018
013dbef
make mem-categorization use adjusted type for patterns
nikomatsakis Apr 5, 2018
54db8bf
do not propagate `Err` when determing causal info
nikomatsakis Apr 6, 2018
568e9c6
Fix ICE with impl Trait
sinkuu Apr 6, 2018
1860c05
Print region in case of ICE
sinkuu Apr 8, 2018
992e2f8
Disallow `impl Trait` in unsupported position
sinkuu Apr 10, 2018
632aaa4
Properly handle ranges of signed enums using both extremums (fixes #4…
nox Apr 15, 2018
6027efe
ci: Remove x86_64-gnu-incremental builder
alexcrichton Apr 5, 2018
b00f39b
Paper over a bug on master
alexcrichton Apr 20, 2018
84fdaf0
Update rustfmt to fix compile
alexcrichton Apr 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Print region in case of ICE
  • Loading branch information
@sinkuu @alexcrichton
sinkuu authored and alexcrichton committed Apr 20, 2018
commit 1860c0573dd1bc5017f518014a674f5c7469c2ea
2 changes: 1 addition & 1 deletion src/librustc/infer/error_reporting/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
self.msg_span_from_early_bound_and_free_regions(region)
},
ty::ReStatic => ("the static lifetime".to_owned(), None),
_ => bug!(),
_ => bug!("{:?}", region),
}
}

Expand Down