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

remove random newlines from error messages, fix compile-fail test

Browse source 
That kind of formatting seems like the job of other code.
This commit is contained in:
Niko Matsakis 2017-09-12 17:21:53 -04:00
parent d7bb575b06
commit 9e4649ebf8
7 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -114,15 +114,15 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
(Some(ret_span), _) => {
(ty_sub.span,
ret_span,
format!("this parameter and the return type are declared
with different lifetimes...",),
format!("this parameter and the return type are declared \
with different lifetimes...",),
format!("...but data{} is returned here", span_label_var1))
}
(_, Some(ret_span)) => {
(ty_sup.span,
ret_span,
format!("this parameter and the return type are declared
with different lifetimes...",),
format!("this parameter and the return type are declared \
with different lifetimes...",),
format!("...but data{} is returned here", span_label_var1))
}
};

2
src/test/compile-fail/object-lifetime-default-mybox.rs
View file

@ -34,7 +34,7 @@ fn load1<'a,'b>(a: &'a MyBox<SomeTrait>,
b: &'b MyBox<SomeTrait>)
-> &'b MyBox<SomeTrait>
{
a //~ ERROR E0312
a //~ ERROR lifetime mismatch
}
fn load2<'a>(ss: &MyBox<SomeTrait+'a>) -> MyBox<SomeTrait+'a> {

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

@ -4,8 +4,7 @@ error[E0623]: lifetime mismatch
19 | fn foo<'a>(x: &i32, y: &'a i32) -> &'a i32 {
| ---- -------
| |
| this parameter and the return type are declared
with different lifetimes...
| this parameter and the return type are declared with different lifetimes...
20 |
21 | if x > y { x } else { y }
| ^ ...but data from `x` is returned here

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

@ -4,8 +4,7 @@ error[E0623]: lifetime mismatch
16 | fn foo<'a>(&self, x: &'a i32) -> &i32 {
| ------- ----
| |
| this parameter and the return type are declared
with different lifetimes...
| this parameter and the return type are declared with different lifetimes...
17 |
18 | x
| ^ ...but data from `x` is returned here

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

@ -4,8 +4,7 @@ error[E0623]: lifetime mismatch
16 | fn foo<'a>(&self, x: &'a Foo) -> &'a Foo {
| ----- -------
| |
| this parameter and the return type are declared
with different lifetimes...
| this parameter and the return type are declared with different lifetimes...
17 |
18 | if true { x } else { self }
| ^^^^ ...but data from `self` is returned here

3
src/test/ui/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.stderr
View file

@ -4,8 +4,7 @@ error[E0623]: lifetime mismatch
16 | fn foo<'a>(&self, x: &i32) -> &i32 {
| ---- ----
| |
| this parameter and the return type are declared
with different lifetimes...
| this parameter and the return type are declared with different lifetimes...
17 | x
| ^ ...but data from `x` is returned here

3
src/test/ui/lifetime-errors/ex3-both-anon-regions-self-is-anon.stderr
View file

@ -4,8 +4,7 @@ error[E0623]: lifetime mismatch
16 | fn foo<'a>(&self, x: &Foo) -> &Foo {
| ---- ----
| |
| this parameter and the return type are declared
with different lifetimes...
| this parameter and the return type are declared with different lifetimes...
17 | if true { x } else { self }
| ^ ...but data from `x` is returned here