about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorgaurikholkar <f2013002@goa.bits-pilani.ac.in>2017-09-13 20:56:27 +0530
committergaurikholkar <f2013002@goa.bits-pilani.ac.in>2017-09-13 20:56:27 +0530
commite71eef1775f9da8bc2e8d312b83df007b4751ec6 (patch)
treebf90219b081bb24fb97cd8cb190acfa70a1d9615 /src
parent6e3cdcea4c600b89dd067d8af8b7e1738f7df6a5 (diff)
downloadrust-e71eef1775f9da8bc2e8d312b83df007b4751ec6.tar.gz
rust-e71eef1775f9da8bc2e8d312b83df007b4751ec6.zip
fix ui tests
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr2
-rw-r--r--src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr
index 2ef1cd507f1..689a1ac292b 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-both-are-structs-4.stderr
@@ -4,7 +4,7 @@ error[E0623]: lifetime mismatch
 15 | fn foo(mut x: Ref) {
    |               ---
    |               |
-   |               these two types are declared with different lifetimes...
+   |               this type was declared with multiple lifetimes...
 16 |     x.a = x.b;
    |           ^^^ ...but data with one lifetime flows into the other here
 
diff --git a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr b/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr
index 0913abad3cc..adfc4dc0c27 100644
--- a/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr
+++ b/src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.stderr
@@ -1,5 +1,5 @@
 error[E0623]: lifetime mismatch
-  --> src/test/ui/lifetime-errors/ex3-both-anon-regions-using-fn-items.rs:11:10
+  --> $DIR/ex3-both-anon-regions-using-fn-items.rs:11:10
    |
 10 | fn foo(x:fn(&u8, &u8), y: Vec<&u8>, z: &u8) {
    |                               ---      --- these two types are declared with different lifetimes...