diff options
| author | Oliver S̶c̶h̶n̶e̶i̶d̶e̶r Scherer <github35764891676564198441@oli-obk.de> | 2018-10-19 10:43:43 -0700 |
|---|---|---|
| committer | Esteban Küber <esteban@kuber.com.ar> | 2018-10-22 14:56:03 -0700 |
| commit | dd91c8fc5a7c097c508cdffdd236adc64dae01c9 (patch) | |
| tree | 43ddb7c0e6b1ed987b8201ab7305d115168dd1be /src | |
| parent | d0bd69a2d559177724df95463a79af9c2a2ad63d (diff) | |
| download | rust-dd91c8fc5a7c097c508cdffdd236adc64dae01c9.tar.gz rust-dd91c8fc5a7c097c508cdffdd236adc64dae01c9.zip | |
[review comments] modify test and clean up code
Co-Authored-By: estebank <esteban@kuber.com.ar>
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/middle/resolve_lifetime.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/lifetimes/lifetime-elision-return-type-trait.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/lifetimes/lifetime-elision-return-type-trait.stderr | 9 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs index 7547e803915..361abb16896 100644 --- a/src/librustc/middle/resolve_lifetime.rs +++ b/src/librustc/middle/resolve_lifetime.rs @@ -2252,7 +2252,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> { fn suggest_lifetime(&self, db: &mut DiagnosticBuilder<'_>, span: Span, msg: &str) -> bool { match self.tcx.sess.source_map().span_to_snippet(span) { Ok(ref snippet) => { - let (sugg, applicability) = if &snippet[..] == "&" { + let (sugg, applicability) = if snippet == "&" { ("&'static ".to_owned(), Applicability::MachineApplicable) } else if snippet == "'_" { ("'static".to_owned(), Applicability::MachineApplicable) diff --git a/src/test/ui/lifetimes/lifetime-elision-return-type-trait.rs b/src/test/ui/lifetimes/lifetime-elision-return-type-trait.rs index 6b6e263b7fd..eb959bfbcb5 100644 --- a/src/test/ui/lifetimes/lifetime-elision-return-type-trait.rs +++ b/src/test/ui/lifetimes/lifetime-elision-return-type-trait.rs @@ -8,3 +8,5 @@ use std::error::Error; fn foo() -> impl Future<Item=(), Error=Box<Error>> { Ok(()) } + +fn main() {} diff --git a/src/test/ui/lifetimes/lifetime-elision-return-type-trait.stderr b/src/test/ui/lifetimes/lifetime-elision-return-type-trait.stderr index ab429b9df06..b2a3d9a9436 100644 --- a/src/test/ui/lifetimes/lifetime-elision-return-type-trait.stderr +++ b/src/test/ui/lifetimes/lifetime-elision-return-type-trait.stderr @@ -1,7 +1,3 @@ -error[E0601]: `main` function not found in crate `lifetime_elision_return_type_trait` - | - = note: consider adding a `main` function to `$DIR/lifetime-elision-return-type-trait.rs` - error[E0106]: missing lifetime specifier --> $DIR/lifetime-elision-return-type-trait.rs:8:44 | @@ -10,7 +6,6 @@ LL | fn foo() -> impl Future<Item=(), Error=Box<Error>> { | = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from -error: aborting due to 2 previous errors +error: aborting due to previous error -Some errors occurred: E0106, E0601. -For more information about an error, try `rustc --explain E0106`. +For more information about this error, try `rustc --explain E0106`. |