diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2017-09-12 10:53:00 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2017-09-26 11:55:53 -0400 |
| commit | d7bb575b063d10d3dcc4de5facb7453c419d3086 (patch) | |
| tree | 0d13e82b8991c34bbf91a9e7e98df57d482d701e /src | |
| parent | bbf82be0766ead2a5e989a9c5bbb507841ebaef4 (diff) | |
| download | rust-d7bb575b063d10d3dcc4de5facb7453c419d3086.tar.gz rust-d7bb575b063d10d3dcc4de5facb7453c419d3086.zip | |
use present tense consistently and update references
Diffstat (limited to 'src')
5 files changed, 6 insertions, 6 deletions
diff --git a/src/librustc/infer/error_reporting/different_lifetimes.rs b/src/librustc/infer/error_reporting/different_lifetimes.rs index aca6db1f9a0..5ae5568ff71 100644 --- a/src/librustc/infer/error_reporting/different_lifetimes.rs +++ b/src/librustc/infer/error_reporting/different_lifetimes.rs @@ -98,12 +98,12 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> { (None, None) => { let (main_label_1, span_label_1) = if ty_sup == ty_sub { - (format!("this type was declared with multiple lifetimes..."), + (format!("this type is declared with multiple lifetimes..."), format!("...but data{} flows{} here", format!(" with one lifetime"), format!(" into the other"))) } else { - (format!("these two types was declared with different lifetimes..."), + (format!("these two types are declared with different lifetimes..."), format!("...but data{} flows{} here", span_label_var1, span_label_var2)) diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr index f383a4dcf67..311433b828c 100644 --- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr +++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr @@ -8,7 +8,7 @@ error[E0623]: lifetime mismatch with different lifetimes... 20 | 21 | if x > y { x } else { y } - | ^ ...but data flows `x` is returned here + | ^ ...but data from `x` is returned here error: aborting due to previous error diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr index 27a674e5bb7..a187ed3160b 100644 --- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr +++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr @@ -8,7 +8,7 @@ error[E0623]: lifetime mismatch with different lifetimes... 17 | 18 | x - | ^ ...but data flows from `x` is returned here + | ^ ...but data from `x` is returned here error: aborting due to previous error diff --git a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr index 8f957d1b009..67574f422a3 100644 --- a/src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr +++ b/src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr @@ -8,7 +8,7 @@ error[E0623]: lifetime mismatch with different lifetimes... 17 | 18 | if true { x } else { self } - | ^^^^ ...but data flows from `self` is returned here + | ^^^^ ...but data from `self` is returned here error: aborting due to previous error diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr index 1b5ac7c7b57..73460277de4 100644 --- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr +++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr @@ -4,7 +4,7 @@ error[E0623]: lifetime mismatch 15 | fn foo(mut x: Ref) { | --- | | - | this type was declared with multiple lifetimes... + | this type is declared with multiple lifetimes... 16 | x.a = x.b; | ^^^ ...but data with one lifetime flows into the other here |