Rollup merge of #57107 - mjbshaw:thread_local_test, r=nikomatsakis

[rust.git] / src / test / ui / lub-if.stderr

diff --git a/src/test/ui/lub-if.stderr b/src/test/ui/lub-if.stderr
index 4a436810170d539e4d755f5c22db1c17dcb716d1..2cf12ba60414d9be862603c328f8b104cc804ed3 100644 (file)
--- a/src/test/ui/lub-if.stderr
+++ b/src/test/ui/lub-if.stderr
@@ -1,25 +1,25 @@
 error[E0312]: lifetime of reference outlives lifetime of borrowed content...
-  --> $DIR/lub-if.rs:38:9
+  --> $DIR/lub-if.rs:28:9
    |
 LL |         s  //~ ERROR E0312
    |         ^
    |
    = note: ...the reference is valid for the static lifetime...
-note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 33:17
-  --> $DIR/lub-if.rs:33:17
+note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 23:17
+  --> $DIR/lub-if.rs:23:17
    |
 LL | pub fn opt_str2<'a>(maybestr: &'a Option<String>) -> &'static str {
    |                 ^^
 
 error[E0312]: lifetime of reference outlives lifetime of borrowed content...
-  --> $DIR/lub-if.rs:45:9
+  --> $DIR/lub-if.rs:35:9
    |
 LL |         s  //~ ERROR E0312
    |         ^
    |
    = note: ...the reference is valid for the static lifetime...
-note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 42:17
-  --> $DIR/lub-if.rs:42:17
+note: ...but the borrowed content is only valid for the lifetime 'a as defined on the function body at 32:17
+  --> $DIR/lub-if.rs:32:17
    |
 LL | pub fn opt_str3<'a>(maybestr: &'a Option<String>) -> &'static str {
    |                 ^^