bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Region inference error messages no longer start with 'free region'

Browse source
This commit is contained in:
David Wood 2018-07-26 15:36:41 +02:00
parent f44807ae1e
commit 2e4224a998
No known key found for this signature in database
GPG key ID: 01760B4F9F53F154
8 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/librustc_mir/borrow_check/nll/region_infer/error_reporting/mod.rs
View file

@ -39,12 +39,13 @@ enum ConstraintCategory {
impl fmt::Display for ConstraintCategory {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
// Must end with a space. Allows for empty names to be provided.
match self {
ConstraintCategory::Assignment => write!(f, "assignment"),
ConstraintCategory::Return => write!(f, "return"),
ConstraintCategory::Cast => write!(f, "cast"),
ConstraintCategory::CallArgument => write!(f, "argument"),
_ => write!(f, "free region"),
ConstraintCategory::Assignment => write!(f, "assignment "),
ConstraintCategory::Return => write!(f, "return "),
ConstraintCategory::Cast => write!(f, "cast "),
ConstraintCategory::CallArgument => write!(f, "argument "),
_ => write!(f, ""),
}
}
}
@ -421,7 +422,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
},
_ => {
diag.span_label(span, format!(
"{} requires that `{}` must outlive `{}`",
"{}requires that `{}` must outlive `{}`",
category, fr_name, outlived_fr_name,
));
},

2
src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr
View file

@ -10,7 +10,7 @@ error: unsatisfied lifetime constraints
LL | invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
| ----------^^^^^-----------------
| | | |
| | | free region requires that `'1` must outlive `'2`
| | | requires that `'1` must outlive `'2`
| | has type `&'1 i32`
| lifetime `'2` appears in return type

4
src/test/ui/impl-trait/static-return-lifetime-infered.nll.stderr
View file

@ -16,13 +16,13 @@ error: unsatisfied lifetime constraints
LL | fn iter_values_anon(&self) -> impl Iterator<Item=u32> {
| - let's call the lifetime of this reference `'1`
LL | self.x.iter().map(|a| a.0)
| ^^^^^^^^^^^^^ free region requires that `'1` must outlive `'static`
| ^^^^^^^^^^^^^ requires that `'1` must outlive `'static`
error: unsatisfied lifetime constraints
--> $DIR/static-return-lifetime-infered.rs:21:9
|
LL | self.x.iter().map(|a| a.0)
| ^^^^^^^^^^^^^ free region requires that `'a` must outlive `'static`
| ^^^^^^^^^^^^^ requires that `'a` must outlive `'static`
error: aborting due to 2 previous errors

2
src/test/ui/issue-10291.nll.stderr
View file

@ -8,7 +8,7 @@ error: unsatisfied lifetime constraints
--> $DIR/issue-10291.rs:12:5
|
LL | drop::<Box<for<'z> FnMut(&'z isize) -> &'z isize>>(Box::new(|z| {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ free region requires that `'x` must outlive `'static`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ requires that `'x` must outlive `'static`
error: aborting due to previous error

2
src/test/ui/issue-40510-3.nll.stderr
View file

@ -9,7 +9,7 @@ LL | || || {
| ||_________^
LL | ||| x.push(())
LL | ||| }
| |||_________^ free region requires that `'1` must outlive `'2`
| |||_________^ requires that `'1` must outlive `'2`
LL | || };
| || -
| ||_____|

2
src/test/ui/issue-52213.nll.stderr
View file

@ -8,7 +8,7 @@ error: unsatisfied lifetime constraints
--> $DIR/issue-52213.rs:13:11
|
LL | ((u,),) => u,
| ^ free region requires that `'a` must outlive `'b`
| ^ requires that `'a` must outlive `'b`
error: aborting due to previous error

2
src/test/ui/nll/closure-requirements/escape-argument-callee.stderr
View file

@ -8,7 +8,7 @@ error: unsatisfied lifetime constraints
--> $DIR/escape-argument-callee.rs:36:45
|
LL | let mut closure = expect_sig(|p, y| *p = y);
| - - ^^^^^^ free region requires that `'1` must outlive `'2`
| - - ^^^^^^ requires that `'1` must outlive `'2`
| | |
| | has type `&'1 i32`
| has type `&mut &'2 i32`

2
src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.stderr
View file

@ -8,7 +8,7 @@ error: unsatisfied lifetime constraints
--> $DIR/region-lbr-named-does-not-outlive-static.rs:19:5
|
LL | &*x
| ^^^ free region requires that `'a` must outlive `'static`
| ^^^ requires that `'a` must outlive `'static`
error: aborting due to previous error