user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use present tense consistently and update references

Browse source
This commit is contained in:
Niko Matsakis 2017-09-12 10:53:00 -04:00
parent bbf82be076
commit d7bb575b06
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc/infer/error_reporting/different_lifetimes.rs
View file

@ -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))

2
src/test/ui/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.stderr
View file

@ -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

2
src/test/ui/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.stderr
View file

@ -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

2
src/test/ui/lifetime-errors/ex1-return-one-existing-name-self-is-anon.stderr
View file

@ -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

2
src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-3.stderr
View file

@ -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