test failures caused by emitting more StorageDead statements

test.log

failures:

---- [ui] ui/nll/user-annotations/constant-in-expr-inherent-2.rs stdout ----
diff of stderr:

10	LL | }
11	   | - `x` dropped here while still borrowed
12	
-	error[E0597]: `x` does not live long enough
-	  --> $DIR/constant-in-expr-inherent-2.rs:26:23
-	   |
-	LL |     A::ASSOCIATED_FUN(&x);
-	   |     ------------------^^-
-	   |     |                 |
-	   |     |                 borrowed value does not live long enough
-	   |     argument requires that `x` is borrowed for `'static`
-	...
-	LL | }
-	   | - `x` dropped here while still borrowed
-	
-	error[E0597]: `x` does not live long enough
-	  --> $DIR/constant-in-expr-inherent-2.rs:27:28
-	   |
-	LL |     B::ALSO_ASSOCIATED_FUN(&x);
-	   |     -----------------------^^-
-	   |     |                      |
-	   |     |                      borrowed value does not live long enough
-	   |     argument requires that `x` is borrowed for `'static`
-	LL |     <_>::TRAIT_ASSOCIATED_FUN(&x);
-	LL | }
-	   | - `x` dropped here while still borrowed
-	
-	error[E0597]: `x` does not live long enough
-	  --> $DIR/constant-in-expr-inherent-2.rs:28:31
-	   |
-	LL |     <_>::TRAIT_ASSOCIATED_FUN(&x);
-	   |     --------------------------^^-
-	   |     |                         |
-	   |     |                         borrowed value does not live long enough
-	   |     argument requires that `x` is borrowed for `'static`
-	LL | }
-	   | - `x` dropped here while still borrowed
-	
-	error: aborting due to 4 previous errors
+	error: aborting due to previous error
49	
50	For more information about this error, try `rustc --explain E0597`.
51	


The actual stderr differed from the expected stderr.
Actual stderr saved to /home/tmandry/code/rust/build/x86_64-unknown-linux-gnu/test/ui/nll/user-annotations/constant-in-expr-inherent-2/constant-in-expr-inherent-2.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args nll/user-annotations/constant-in-expr-inherent-2.rs`

error: 1 errors occurred comparing output.
status: exit code: 1
command: "/home/tmandry/code/rust/build/x86_64-unknown-linux-gnu/stage1/bin/rustc" "/home/tmandry/code/rust/src/test/ui/nll/user-annotations/constant-in-expr-inherent-2.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/home/tmandry/code/rust/build/x86_64-unknown-linux-gnu/test/ui/nll/user-annotations/constant-in-expr-inherent-2/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/home/tmandry/code/rust/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/home/tmandry/code/rust/build/x86_64-unknown-linux-gnu/test/ui/nll/user-annotations/constant-in-expr-inherent-2/auxiliary" "-A" "unused"
stdout:
------------------------------------------

------------------------------------------
stderr:
------------------------------------------
{"message":"`x` does not live long enough","code":{"code":"E0597","explanation":"\nThis error occurs because a borrow was made inside a variable which has a\ngreater lifetime than the borrowed one.\n\nExample of erroneous code:\n\n```compile_fail,E0597\nstruct Foo<'a> {\n    x: Option<&'a u32>,\n}\n\nlet mut x = Foo { x: None };\nlet y = 0;\nx.x = Some(&y); // error: `y` does not live long enough\n```\n\nIn here, `x` is created before `y` and therefore has a greater lifetime. Always\nkeep in mind that values in a scope are dropped in the opposite order they are\ncreated. So to fix the previous example, just make the `y` lifetime greater than\nthe `x`'s one:\n\n```\nstruct Foo<'a> {\n    x: Option<&'a u32>,\n}\n\nlet y = 0;\nlet mut x = Foo { x: None };\nx.x = Some(&y);\n```\n"},"level":"error","spans":[{"file_name":"/home/tmandry/code/rust/src/test/ui/nll/user-annotations/constant-in-expr-inherent-2.rs","byte_start":474,"byte_end":476,"line_start":25,"line_end":25,"column_start":9,"column_end":11,"is_primary":true,"text":[{"text":"    FUN(&x);                        //~ ERROR `x` does not live long enough","highlight_start":9,"highlight_end":11}],"label":"borrowed value does not live long enough","suggested_replacement":null,"suggestion_applicability":null,"expansion":null},{"file_name":"/home/tmandry/code/rust/src/test/ui/nll/user-annotations/constant-in-expr-inherent-2.rs","byte_start":770,"byte_end":771,"line_start":29,"line_end":29,"column_start":1,"column_end":2,"is_primary":false,"text":[{"text":"}","highlight_start":1,"highlight_end":2}],"label":"`x` dropped here while still borrowed","suggested_replacement":null,"suggestion_applicability":null,"expansion":null},{"file_name":"/home/tmandry/code/rust/src/test/ui/nll/user-annotations/constant-in-expr-inherent-2.rs","byte_start":470,"byte_end":477,"line_start":25,"line_end":25,"column_start":5,"column_end":12,"is_primary":false,"text":[{"text":"    FUN(&x);                        //~ ERROR `x` does not live long enough","highlight_start":5,"highlight_end":12}],"label":"argument requires that `x` is borrowed for `'static`","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":"error[E0597]: `x` does not live long enough\n  --> /home/tmandry/code/rust/src/test/ui/nll/user-annotations/constant-in-expr-inherent-2.rs:25:9\n   |\nLL |     FUN(&x);                        //~ ERROR `x` does not live long enough\n   |     ----^^-\n   |     |   |\n   |     |   borrowed value does not live long enough\n   |     argument requires that `x` is borrowed for `'static`\n...\nLL | }\n   | - `x` dropped here while still borrowed\n\n"}
{"message":"aborting due to previous error","code":null,"level":"error","spans":[],"children":[],"rendered":"error: aborting due to previous error\n\n"}
{"message":"For more information about this error, try `rustc --explain E0597`.","code":null,"level":"","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0597`.\n"}

------------------------------------------

thread '[ui] ui/nll/user-annotations/constant-in-expr-inherent-2.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3425:9

---- [ui] ui/nll/user-annotations/method-ufcs-inherent-2.rs stdout ----
diff of stderr:

13	LL | }
14	   | - `v` dropped here while still borrowed
15	
-	error[E0597]: `v` does not live long enough
-	  --> $DIR/method-ufcs-inherent-2.rs:16:41
-	   |
-	LL | fn foo<'a>() {
-	   |        -- lifetime `'a` defined here
-	LL |     let v = 22;
-	LL |     let x = A::<'a>::new::<&'a u32>(&v, &v);
-	   |             ----------------------------^^-
-	   |             |                           |
-	   |             |                           borrowed value does not live long enough
-	   |             argument requires that `v` is borrowed for `'a`
-	...
-	LL | }
-	   | - `v` dropped here while still borrowed
-	
-	error: aborting due to 2 previous errors
+	error: aborting due to previous error
32	
33	For more information about this error, try `rustc --explain E0597`.
34	


The actual stderr differed from the expected stderr.
Actual stderr saved to /home/tmandry/code/rust/build/x86_64-unknown-linux-gnu/test/ui/nll/user-annotations/method-ufcs-inherent-2/method-ufcs-inherent-2.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args nll/user-annotations/method-ufcs-inherent-2.rs`

error: 1 errors occurred comparing output.
status: exit code: 1
command: "/home/tmandry/code/rust/build/x86_64-unknown-linux-gnu/stage1/bin/rustc" "/home/tmandry/code/rust/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/home/tmandry/code/rust/build/x86_64-unknown-linux-gnu/test/ui/nll/user-annotations/method-ufcs-inherent-2/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/home/tmandry/code/rust/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/home/tmandry/code/rust/build/x86_64-unknown-linux-gnu/test/ui/nll/user-annotations/method-ufcs-inherent-2/auxiliary" "-A" "unused"
stdout:
------------------------------------------

------------------------------------------
stderr:
------------------------------------------
{"message":"`v` does not live long enough","code":{"code":"E0597","explanation":"\nThis error occurs because a borrow was made inside a variable which has a\ngreater lifetime than the borrowed one.\n\nExample of erroneous code:\n\n```compile_fail,E0597\nstruct Foo<'a> {\n    x: Option<&'a u32>,\n}\n\nlet mut x = Foo { x: None };\nlet y = 0;\nx.x = Some(&y); // error: `y` does not live long enough\n```\n\nIn here, `x` is created before `y` and therefore has a greater lifetime. Always\nkeep in mind that values in a scope are dropped in the opposite order they are\ncreated. So to fix the previous example, just make the `y` lifetime greater than\nthe `x`'s one:\n\n```\nstruct Foo<'a> {\n    x: Option<&'a u32>,\n}\n\nlet y = 0;\nlet mut x = Foo { x: None };\nx.x = Some(&y);\n```\n"},"level":"error","spans":[{"file_name":"/home/tmandry/code/rust/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.rs","byte_start":344,"byte_end":346,"line_start":16,"line_end":16,"column_start":37,"column_end":39,"is_primary":true,"text":[{"text":"    let x = A::<'a>::new::<&'a u32>(&v, &v);","highlight_start":37,"highlight_end":39}],"label":"borrowed value does not live long enough","suggested_replacement":null,"suggestion_applicability":null,"expansion":null},{"file_name":"/home/tmandry/code/rust/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.rs","byte_start":383,"byte_end":384,"line_start":19,"line_end":19,"column_start":1,"column_end":2,"is_primary":false,"text":[{"text":"}","highlight_start":1,"highlight_end":2}],"label":"`v` dropped here while still borrowed","suggested_replacement":null,"suggestion_applicability":null,"expansion":null},{"file_name":"/home/tmandry/code/rust/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.rs","byte_start":284,"byte_end":286,"line_start":14,"line_end":14,"column_start":8,"column_end":10,"is_primary":false,"text":[{"text":"fn foo<'a>() {","highlight_start":8,"highlight_end":10}],"label":"lifetime `'a` defined here","suggested_replacement":null,"suggestion_applicability":null,"expansion":null},{"file_name":"/home/tmandry/code/rust/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.rs","byte_start":320,"byte_end":351,"line_start":16,"line_end":16,"column_start":13,"column_end":44,"is_primary":false,"text":[{"text":"    let x = A::<'a>::new::<&'a u32>(&v, &v);","highlight_start":13,"highlight_end":44}],"label":"argument requires that `v` is borrowed for `'a`","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":"error[E0597]: `v` does not live long enough\n  --> /home/tmandry/code/rust/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.rs:16:37\n   |\nLL | fn foo<'a>() {\n   |        -- lifetime `'a` defined here\nLL |     let v = 22;\nLL |     let x = A::<'a>::new::<&'a u32>(&v, &v);\n   |             ------------------------^^-----\n   |             |                       |\n   |             |                       borrowed value does not live long enough\n   |             argument requires that `v` is borrowed for `'a`\n...\nLL | }\n   | - `v` dropped here while still borrowed\n\n"}
{"message":"aborting due to previous error","code":null,"level":"error","spans":[],"children":[],"rendered":"error: aborting due to previous error\n\n"}
{"message":"For more information about this error, try `rustc --explain E0597`.","code":null,"level":"","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0597`.\n"}

------------------------------------------

thread '[ui] ui/nll/user-annotations/method-ufcs-inherent-2.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3425:9

---- [ui] ui/nll/user-annotations/method-ufcs-inherent-4.rs stdout ----
diff of stderr:

13	LL | }
14	   | - `v` dropped here while still borrowed
15	
-	error[E0597]: `v` does not live long enough
-	  --> $DIR/method-ufcs-inherent-4.rs:17:41
-	   |
-	LL | fn foo<'a>() {
-	   |        -- lifetime `'a` defined here
-	LL |     let v = 22;
-	LL |     let x = <A<'a>>::new::<&'a u32>(&v, &v);
-	   |             ----------------------------^^-
-	   |             |                           |
-	   |             |                           borrowed value does not live long enough
-	   |             argument requires that `v` is borrowed for `'a`
-	...
-	LL | }
-	   | - `v` dropped here while still borrowed
-	
-	error: aborting due to 2 previous errors
+	error: aborting due to previous error
32	
33	For more information about this error, try `rustc --explain E0597`.
34	


The actual stderr differed from the expected stderr.
Actual stderr saved to /home/tmandry/code/rust/build/x86_64-unknown-linux-gnu/test/ui/nll/user-annotations/method-ufcs-inherent-4/method-ufcs-inherent-4.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args nll/user-annotations/method-ufcs-inherent-4.rs`

error: 1 errors occurred comparing output.
status: exit code: 1
command: "/home/tmandry/code/rust/build/x86_64-unknown-linux-gnu/stage1/bin/rustc" "/home/tmandry/code/rust/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "-o" "/home/tmandry/code/rust/build/x86_64-unknown-linux-gnu/test/ui/nll/user-annotations/method-ufcs-inherent-4/a" "-Crpath" "-O" "-Zunstable-options" "-Lnative=/home/tmandry/code/rust/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/home/tmandry/code/rust/build/x86_64-unknown-linux-gnu/test/ui/nll/user-annotations/method-ufcs-inherent-4/auxiliary" "-A" "unused"
stdout:
------------------------------------------

------------------------------------------
stderr:
------------------------------------------
{"message":"`v` does not live long enough","code":{"code":"E0597","explanation":"\nThis error occurs because a borrow was made inside a variable which has a\ngreater lifetime than the borrowed one.\n\nExample of erroneous code:\n\n```compile_fail,E0597\nstruct Foo<'a> {\n    x: Option<&'a u32>,\n}\n\nlet mut x = Foo { x: None };\nlet y = 0;\nx.x = Some(&y); // error: `y` does not live long enough\n```\n\nIn here, `x` is created before `y` and therefore has a greater lifetime. Always\nkeep in mind that values in a scope are dropped in the opposite order they are\ncreated. So to fix the previous example, just make the `y` lifetime greater than\nthe `x`'s one:\n\n```\nstruct Foo<'a> {\n    x: Option<&'a u32>,\n}\n\nlet y = 0;\nlet mut x = Foo { x: None };\nx.x = Some(&y);\n```\n"},"level":"error","spans":[{"file_name":"/home/tmandry/code/rust/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.rs","byte_start":355,"byte_end":357,"line_start":17,"line_end":17,"column_start":37,"column_end":39,"is_primary":true,"text":[{"text":"    let x = <A<'a>>::new::<&'a u32>(&v, &v);","highlight_start":37,"highlight_end":39}],"label":"borrowed value does not live long enough","suggested_replacement":null,"suggestion_applicability":null,"expansion":null},{"file_name":"/home/tmandry/code/rust/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.rs","byte_start":394,"byte_end":395,"line_start":20,"line_end":20,"column_start":1,"column_end":2,"is_primary":false,"text":[{"text":"}","highlight_start":1,"highlight_end":2}],"label":"`v` dropped here while still borrowed","suggested_replacement":null,"suggestion_applicability":null,"expansion":null},{"file_name":"/home/tmandry/code/rust/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.rs","byte_start":295,"byte_end":297,"line_start":15,"line_end":15,"column_start":8,"column_end":10,"is_primary":false,"text":[{"text":"fn foo<'a>() {","highlight_start":8,"highlight_end":10}],"label":"lifetime `'a` defined here","suggested_replacement":null,"suggestion_applicability":null,"expansion":null},{"file_name":"/home/tmandry/code/rust/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.rs","byte_start":331,"byte_end":362,"line_start":17,"line_end":17,"column_start":13,"column_end":44,"is_primary":false,"text":[{"text":"    let x = <A<'a>>::new::<&'a u32>(&v, &v);","highlight_start":13,"highlight_end":44}],"label":"argument requires that `v` is borrowed for `'a`","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":"error[E0597]: `v` does not live long enough\n  --> /home/tmandry/code/rust/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.rs:17:37\n   |\nLL | fn foo<'a>() {\n   |        -- lifetime `'a` defined here\nLL |     let v = 22;\nLL |     let x = <A<'a>>::new::<&'a u32>(&v, &v);\n   |             ------------------------^^-----\n   |             |                       |\n   |             |                       borrowed value does not live long enough\n   |             argument requires that `v` is borrowed for `'a`\n...\nLL | }\n   | - `v` dropped here while still borrowed\n\n"}
{"message":"aborting due to previous error","code":null,"level":"error","spans":[],"children":[],"rendered":"error: aborting due to previous error\n\n"}
{"message":"For more information about this error, try `rustc --explain E0597`.","code":null,"level":"","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0597`.\n"}

------------------------------------------

thread '[ui] ui/nll/user-annotations/method-ufcs-inherent-4.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3425:9


failures:
    [ui] ui/nll/user-annotations/constant-in-expr-inherent-2.rs
    [ui] ui/nll/user-annotations/method-ufcs-inherent-2.rs
    [ui] ui/nll/user-annotations/method-ufcs-inherent-4.rs

test result: FAILED. 5506 passed; 3 failed; 21 ignored; 0 measured; 0 filtered out