Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 62 deletions

diff --git a/src/test/ui/consts/control-flow/drop-fail.rs b/src/test/ui/consts/control-flow/drop-fail.rs
deleted file mode 100644
index 41341f312..000000000
--- a/src/test/ui/consts/control-flow/drop-fail.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-// revisions: stock precise
-
-#![cfg_attr(precise, feature(const_precise_live_drops))]
-
-// `x` is *not* always moved into the final value and may be dropped inside the initializer.
-const _: Option<Vec<i32>> = {
-    let y: Option<Vec<i32>> = None;
-    let x = Some(Vec::new());
-    //[stock,precise]~^ ERROR destructor of
-
-    if true {
-        x
-    } else {
-        y
-    }
-};
-
-// We only clear `NeedsDrop` if a local is moved from in entirely. This is a shortcoming of the
-// existing analysis.
-const _: Vec<i32> = {
-    let vec_tuple = (Vec::new(),);
-    //[stock]~^ ERROR destructor of
-
-    vec_tuple.0
-};
-
-// This applies to single-field enum variants as well.
-const _: Vec<i32> = {
-    let x: Result<_, Vec<i32>> = Ok(Vec::new());
-    //[stock]~^ ERROR destructor of
-
-    match x {
-        Ok(x) | Err(x) => x,
-    }
-};
-
-const _: Option<Vec<i32>> = {
-    let mut some = Some(Vec::new());
-    let mut tmp = None;
-    //[stock,precise]~^ ERROR destructor of
-
-    let mut i = 0;
-    while i < 10 {
-        tmp = some;
-        some = None;
-
-        // We can escape the loop with `Some` still in `tmp`,
-        // which would require that it be dropped at the end of the block.
-        if i > 100 {
-            break;
-        }
-
-        some = tmp;
-        tmp = None;
-
-        i += 1;
-    }
-
-    some
-};
-
-fn main() {}