mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove primary label for more readable output

Browse Source
This commit is contained in:
Esteban Küber 2018-06-08 16:27:07 -07:00
parent 82d3a49564
commit 6be16baa4a
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librustc/infer/error_reporting/nice_region_error/static_impl_trait.rs
View File

@ -35,9 +35,8 @@ impl<'a, 'gcx, 'tcx> NiceRegionError<'a, 'gcx, 'tcx> {
let return_sp = sub_origin.span();
let mut err = self.tcx.sess.struct_span_err(
sp,
"can't infer an appropriate lifetime",
"cannot infer an appropriate lifetime",
);
err.span_label(sp, "can't infer an appropriate lifetime");
err.span_label(
return_sp,
"this return type evaluates to the `'static` lifetime...",

4
src/test/ui/impl-trait/static-return-lifetime-infered.rs
View File

@ -16,11 +16,11 @@ impl A {
fn iter_values_anon(&self) -> impl Iterator<Item=u32> {
self.x.iter().map(|a| a.0)
}
//~^^^ ERROR can't infer an appropriate lifetime
//~^^ ERROR cannot infer an appropriate lifetime
fn iter_values<'a>(&'a self) -> impl Iterator<Item=u32> {
self.x.iter().map(|a| a.0)
}
//~^^^ ERROR can't infer an appropriate lifetime
//~^^ ERROR cannot infer an appropriate lifetime
}
fn main() {}

8
src/test/ui/impl-trait/static-return-lifetime-infered.stderr
View File

@ -1,10 +1,10 @@
error: can't infer an appropriate lifetime
error: cannot infer an appropriate lifetime
--> $DIR/static-return-lifetime-infered.rs:17:16
|
LL | fn iter_values_anon(&self) -> impl Iterator<Item=u32> {
| ----------------------- this return type evaluates to the `'static` lifetime...
LL | self.x.iter().map(|a| a.0)
| ------ ^^^^ can't infer an appropriate lifetime
| ------ ^^^^
| |
| ...but this borrow...
|
@ -20,13 +20,13 @@ help: you can add a constraint to the return type to make it last less than `'st
LL | fn iter_values_anon(&self) -> impl Iterator<Item=u32> + '_ {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: can't infer an appropriate lifetime
error: cannot infer an appropriate lifetime
--> $DIR/static-return-lifetime-infered.rs:21:16
|
LL | fn iter_values<'a>(&'a self) -> impl Iterator<Item=u32> {
| ----------------------- this return type evaluates to the `'static` lifetime...
LL | self.x.iter().map(|a| a.0)
| ------ ^^^^ can't infer an appropriate lifetime
| ------ ^^^^
| |
| ...but this borrow...
|