Merging upstream version 1.68.2+dfsg1.

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

6 files changed, 0 insertions, 89 deletions

diff --git a/src/test/ui/closure_context/issue-26046-fn-mut.rs b/src/test/ui/closure_context/issue-26046-fn-mut.rs
deleted file mode 100644
index 0a015ea14..000000000
--- a/src/test/ui/closure_context/issue-26046-fn-mut.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-fn foo() -> Box<dyn Fn()> {
-    let num = 5;
-
-    let closure = || { //~ ERROR expected a closure that
-        num += 1;
-    };
-
-    Box::new(closure)
-}
-
-fn main() {}
diff --git a/src/test/ui/closure_context/issue-26046-fn-mut.stderr b/src/test/ui/closure_context/issue-26046-fn-mut.stderr
deleted file mode 100644
index f744b71c2..000000000
--- a/src/test/ui/closure_context/issue-26046-fn-mut.stderr
+++ /dev/null
@@ -1,16 +0,0 @@
-error[E0525]: expected a closure that implements the `Fn` trait, but this closure only implements `FnMut`
-  --> $DIR/issue-26046-fn-mut.rs:4:19
-   |
-LL |     let closure = || {
-   |                   ^^ this closure implements `FnMut`, not `Fn`
-LL |         num += 1;
-   |         --- closure is `FnMut` because it mutates the variable `num` here
-...
-LL |     Box::new(closure)
-   |     ----------------- the requirement to implement `Fn` derives from here
-   |
-   = note: required for the cast from `[closure@$DIR/issue-26046-fn-mut.rs:4:19: 4:21]` to the object type `dyn Fn()`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0525`.
diff --git a/src/test/ui/closure_context/issue-26046-fn-once.rs b/src/test/ui/closure_context/issue-26046-fn-once.rs
deleted file mode 100644
index 511690e9d..000000000
--- a/src/test/ui/closure_context/issue-26046-fn-once.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-fn get_closure() -> Box<dyn Fn() -> Vec<u8>> {
-    let vec = vec![1u8, 2u8];
-
-    let closure = move || { //~ ERROR expected a closure
-        vec
-    };
-
-    Box::new(closure)
-}
-
-fn main() {}
diff --git a/src/test/ui/closure_context/issue-26046-fn-once.stderr b/src/test/ui/closure_context/issue-26046-fn-once.stderr
deleted file mode 100644
index 34f94f9dc..000000000
--- a/src/test/ui/closure_context/issue-26046-fn-once.stderr
+++ /dev/null
@@ -1,16 +0,0 @@
-error[E0525]: expected a closure that implements the `Fn` trait, but this closure only implements `FnOnce`
-  --> $DIR/issue-26046-fn-once.rs:4:19
-   |
-LL |     let closure = move || {
-   |                   ^^^^^^^ this closure implements `FnOnce`, not `Fn`
-LL |         vec
-   |         --- closure is `FnOnce` because it moves the variable `vec` out of its environment
-...
-LL |     Box::new(closure)
-   |     ----------------- the requirement to implement `Fn` derives from here
-   |
-   = note: required for the cast from `[closure@$DIR/issue-26046-fn-once.rs:4:19: 4:26]` to the object type `dyn Fn() -> Vec<u8>`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0525`.
diff --git a/src/test/ui/closure_context/issue-42065.rs b/src/test/ui/closure_context/issue-42065.rs
deleted file mode 100644
index c506600f4..000000000
--- a/src/test/ui/closure_context/issue-42065.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use std::collections::HashMap;
-
-fn main() {
-    let dict: HashMap<i32, i32> = HashMap::new();
-    let debug_dump_dict = || {
-        for (key, value) in dict {
-            println!("{:?} - {:?}", key, value);
-        }
-    };
-    debug_dump_dict();
-    debug_dump_dict();
-    //~^ ERROR use of moved value: `debug_dump_dict`
-}
diff --git a/src/test/ui/closure_context/issue-42065.stderr b/src/test/ui/closure_context/issue-42065.stderr
deleted file mode 100644
index 896bb6dc6..000000000
--- a/src/test/ui/closure_context/issue-42065.stderr
+++ /dev/null
@@ -1,22 +0,0 @@
-error[E0382]: use of moved value: `debug_dump_dict`
-  --> $DIR/issue-42065.rs:11:5
-   |
-LL |     debug_dump_dict();
-   |     ----------------- `debug_dump_dict` moved due to this call
-LL |     debug_dump_dict();
-   |     ^^^^^^^^^^^^^^^ value used here after move
-   |
-note: closure cannot be invoked more than once because it moves the variable `dict` out of its environment
-  --> $DIR/issue-42065.rs:6:29
-   |
-LL |         for (key, value) in dict {
-   |                             ^^^^
-note: this value implements `FnOnce`, which causes it to be moved when called
-  --> $DIR/issue-42065.rs:10:5
-   |
-LL |     debug_dump_dict();
-   |     ^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0382`.