Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 30 deletions

diff --git a/src/test/ui/nll/issue-69114-static-mut-ty.rs b/src/test/ui/nll/issue-69114-static-mut-ty.rs
deleted file mode 100644
index ce37da053..000000000
--- a/src/test/ui/nll/issue-69114-static-mut-ty.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Check that borrowck ensures that `static mut` items have the expected type.
-
-static FOO: u8 = 42;
-static mut BAR: &'static u8 = &FOO;
-static mut BAR_ELIDED: &u8 = &FOO;
-
-fn main() {
-    unsafe {
-        println!("{} {}", BAR, BAR_ELIDED);
-        set_bar();
-        set_bar_elided();
-        println!("{} {}", BAR, BAR_ELIDED);
-    }
-}
-
-fn set_bar() {
-    let n = 42;
-    unsafe {
-        BAR = &n;
-        //~^ ERROR does not live long enough
-    }
-}
-
-fn set_bar_elided() {
-    let n = 42;
-    unsafe {
-        BAR_ELIDED = &n;
-        //~^ ERROR does not live long enough
-    }
-}