From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- .../liveness-assign/liveness-assign-imm-local-in-loop.rs | 12 ------------ .../liveness-assign-imm-local-in-loop.stderr | 12 ------------ .../liveness-assign/liveness-assign-imm-local-in-op-eq.rs | 12 ------------ .../liveness-assign-imm-local-in-op-eq.stderr | 14 -------------- .../liveness-assign-imm-local-with-drop.rs | 12 ------------ .../liveness-assign-imm-local-with-drop.stderr | 15 --------------- .../liveness-assign-imm-local-with-init.rs | 12 ------------ .../liveness-assign-imm-local-with-init.stderr | 15 --------------- 8 files changed, 104 deletions(-) delete mode 100644 src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs delete mode 100644 src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.stderr delete mode 100644 src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs delete mode 100644 src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.stderr delete mode 100644 src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs delete mode 100644 src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.stderr delete mode 100644 src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs delete mode 100644 src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.stderr (limited to 'src/test/ui/liveness/liveness-assign') diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs deleted file mode 100644 index 08911c5bd..000000000 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.rs +++ /dev/null @@ -1,12 +0,0 @@ -fn test() { - let v: isize; - //~^ HELP consider making this binding mutable - //~| SUGGESTION mut v - loop { - v = 1; //~ ERROR cannot assign twice to immutable variable `v` - //~| NOTE cannot assign twice to immutable variable - } -} - -fn main() { -} diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.stderr deleted file mode 100644 index 66cdce7da..000000000 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-loop.stderr +++ /dev/null @@ -1,12 +0,0 @@ -error[E0384]: cannot assign twice to immutable variable `v` - --> $DIR/liveness-assign-imm-local-in-loop.rs:6:9 - | -LL | let v: isize; - | - help: consider making this binding mutable: `mut v` -... -LL | v = 1; - | ^^^^^ cannot assign twice to immutable variable - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0384`. diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs deleted file mode 100644 index 1752d9690..000000000 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs +++ /dev/null @@ -1,12 +0,0 @@ -fn test() { - let v: isize; - //~^ HELP consider making this binding mutable - //~| SUGGESTION mut v - v = 2; //~ NOTE first assignment - v += 1; //~ ERROR cannot assign twice to immutable variable `v` - //~| NOTE cannot assign twice to immutable - v.clone(); -} - -fn main() { -} diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.stderr deleted file mode 100644 index 5db9539cb..000000000 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.stderr +++ /dev/null @@ -1,14 +0,0 @@ -error[E0384]: cannot assign twice to immutable variable `v` - --> $DIR/liveness-assign-imm-local-in-op-eq.rs:6:5 - | -LL | let v: isize; - | - help: consider making this binding mutable: `mut v` -... -LL | v = 2; - | ----- first assignment to `v` -LL | v += 1; - | ^^^^^^ cannot assign twice to immutable variable - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0384`. diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs deleted file mode 100644 index c9b16e439..000000000 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.rs +++ /dev/null @@ -1,12 +0,0 @@ -fn test() { - let b = Box::new(1); //~ NOTE first assignment - //~| HELP consider making this binding mutable - //~| SUGGESTION mut b - drop(b); - b = Box::new(2); //~ ERROR cannot assign twice to immutable variable `b` - //~| NOTE cannot assign twice to immutable - drop(b); -} - -fn main() { -} diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.stderr deleted file mode 100644 index bb7e7e27a..000000000 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-drop.stderr +++ /dev/null @@ -1,15 +0,0 @@ -error[E0384]: cannot assign twice to immutable variable `b` - --> $DIR/liveness-assign-imm-local-with-drop.rs:6:5 - | -LL | let b = Box::new(1); - | - - | | - | first assignment to `b` - | help: consider making this binding mutable: `mut b` -... -LL | b = Box::new(2); - | ^ cannot assign twice to immutable variable - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0384`. diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs deleted file mode 100644 index 4bb2db27a..000000000 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.rs +++ /dev/null @@ -1,12 +0,0 @@ -fn test() { - let v: isize = 1; //~ NOTE first assignment - //~| HELP consider making this binding mutable - //~| SUGGESTION mut v - v.clone(); - v = 2; //~ ERROR cannot assign twice to immutable variable `v` - //~| NOTE cannot assign twice to immutable - v.clone(); -} - -fn main() { -} diff --git a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.stderr b/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.stderr deleted file mode 100644 index 80458a70a..000000000 --- a/src/test/ui/liveness/liveness-assign/liveness-assign-imm-local-with-init.stderr +++ /dev/null @@ -1,15 +0,0 @@ -error[E0384]: cannot assign twice to immutable variable `v` - --> $DIR/liveness-assign-imm-local-with-init.rs:6:5 - | -LL | let v: isize = 1; - | - - | | - | first assignment to `v` - | help: consider making this binding mutable: `mut v` -... -LL | v = 2; - | ^^^^^ cannot assign twice to immutable variable - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0384`. -- cgit v1.2.3