Merging upstream version 1.68.2+dfsg1.

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

16 files changed, 0 insertions, 154 deletions

diff --git a/src/test/ui/recursion_limit/empty.rs b/src/test/ui/recursion_limit/empty.rs
deleted file mode 100644
index 59dae106c..000000000
--- a/src/test/ui/recursion_limit/empty.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Test the parse error for an empty recursion_limit
-
-#![recursion_limit = ""] //~ ERROR `limit` must be a non-negative integer
-                         //~| `limit` must be a non-negative integer
-                         //~| ERROR `limit` must be a non-negative integer
-                         //~| `limit` must be a non-negative integer
-
-fn main() {}
diff --git a/src/test/ui/recursion_limit/empty.stderr b/src/test/ui/recursion_limit/empty.stderr
deleted file mode 100644
index cb5c0c35a..000000000
--- a/src/test/ui/recursion_limit/empty.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: `limit` must be a non-negative integer
-  --> $DIR/empty.rs:3:1
-   |
-LL | #![recursion_limit = ""]
-   | ^^^^^^^^^^^^^^^^^^^^^--^
-   |                      |
-   |                      `limit` must be a non-negative integer
-
-error: `limit` must be a non-negative integer
-  --> $DIR/empty.rs:3:1
-   |
-LL | #![recursion_limit = ""]
-   | ^^^^^^^^^^^^^^^^^^^^^--^
-   |                      |
-   |                      `limit` must be a non-negative integer
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/recursion_limit/invalid_digit.rs b/src/test/ui/recursion_limit/invalid_digit.rs
deleted file mode 100644
index 03df3e7a9..000000000
--- a/src/test/ui/recursion_limit/invalid_digit.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// Test the parse error for an invalid digit in recursion_limit
-
-#![recursion_limit = "-100"] //~ ERROR `limit` must be a non-negative integer
-                             //~| not a valid integer
-                             //~| ERROR `limit` must be a non-negative integer
-                             //~| not a valid integer
-fn main() {}
diff --git a/src/test/ui/recursion_limit/invalid_digit.stderr b/src/test/ui/recursion_limit/invalid_digit.stderr
deleted file mode 100644
index 4dc93ad5f..000000000
--- a/src/test/ui/recursion_limit/invalid_digit.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: `limit` must be a non-negative integer
-  --> $DIR/invalid_digit.rs:3:1
-   |
-LL | #![recursion_limit = "-100"]
-   | ^^^^^^^^^^^^^^^^^^^^^------^
-   |                      |
-   |                      not a valid integer
-
-error: `limit` must be a non-negative integer
-  --> $DIR/invalid_digit.rs:3:1
-   |
-LL | #![recursion_limit = "-100"]
-   | ^^^^^^^^^^^^^^^^^^^^^------^
-   |                      |
-   |                      not a valid integer
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/recursion_limit/invalid_digit_type.rs b/src/test/ui/recursion_limit/invalid_digit_type.rs
deleted file mode 100644
index e408109b3..000000000
--- a/src/test/ui/recursion_limit/invalid_digit_type.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-#![recursion_limit = 123] //~ ERROR malformed `recursion_limit` attribute
-
-fn main() {}
diff --git a/src/test/ui/recursion_limit/invalid_digit_type.stderr b/src/test/ui/recursion_limit/invalid_digit_type.stderr
deleted file mode 100644
index 6d1409bb3..000000000
--- a/src/test/ui/recursion_limit/invalid_digit_type.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: malformed `recursion_limit` attribute input
-  --> $DIR/invalid_digit_type.rs:1:1
-   |
-LL | #![recursion_limit = 123]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![recursion_limit = "N"]`
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/recursion_limit/invalid_macro.rs b/src/test/ui/recursion_limit/invalid_macro.rs
deleted file mode 100644
index 7db67a8d1..000000000
--- a/src/test/ui/recursion_limit/invalid_macro.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#![recursion_limit = foo!()] //~ ERROR malformed `recursion_limit` attribute
-
-macro_rules! foo {
-    () => {"128"};
-}
-
-fn main() {}
diff --git a/src/test/ui/recursion_limit/invalid_macro.stderr b/src/test/ui/recursion_limit/invalid_macro.stderr
deleted file mode 100644
index 0189e99da..000000000
--- a/src/test/ui/recursion_limit/invalid_macro.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: malformed `recursion_limit` attribute input
-  --> $DIR/invalid_macro.rs:1:1
-   |
-LL | #![recursion_limit = foo!()]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![recursion_limit = "N"]`
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/recursion_limit/no-value.rs b/src/test/ui/recursion_limit/no-value.rs
deleted file mode 100644
index 2202e5b77..000000000
--- a/src/test/ui/recursion_limit/no-value.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// Test the parse error for no value provided to recursion_limit
-
-#![recursion_limit]
-//~^ ERROR malformed `recursion_limit` attribute input
-
-fn main() {}
diff --git a/src/test/ui/recursion_limit/no-value.stderr b/src/test/ui/recursion_limit/no-value.stderr
deleted file mode 100644
index 35ac2c4cd..000000000
--- a/src/test/ui/recursion_limit/no-value.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: malformed `recursion_limit` attribute input
-  --> $DIR/no-value.rs:3:1
-   |
-LL | #![recursion_limit]
-   | ^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![recursion_limit = "N"]`
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/recursion_limit/overflow.rs b/src/test/ui/recursion_limit/overflow.rs
deleted file mode 100644
index c733ba6b9..000000000
--- a/src/test/ui/recursion_limit/overflow.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Test the parse error for an overflowing recursion_limit
-
-#![recursion_limit = "999999999999999999999999"]
-//~^ ERROR `limit` must be a non-negative integer
-//~| `limit` is too large
-//~| ERROR `limit` must be a non-negative integer
-//~| `limit` is too large
-
-fn main() {}
diff --git a/src/test/ui/recursion_limit/overflow.stderr b/src/test/ui/recursion_limit/overflow.stderr
deleted file mode 100644
index 2f622d28b..000000000
--- a/src/test/ui/recursion_limit/overflow.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: `limit` must be a non-negative integer
-  --> $DIR/overflow.rs:3:1
-   |
-LL | #![recursion_limit = "999999999999999999999999"]
-   | ^^^^^^^^^^^^^^^^^^^^^--------------------------^
-   |                      |
-   |                      `limit` is too large
-
-error: `limit` must be a non-negative integer
-  --> $DIR/overflow.rs:3:1
-   |
-LL | #![recursion_limit = "999999999999999999999999"]
-   | ^^^^^^^^^^^^^^^^^^^^^--------------------------^
-   |                      |
-   |                      `limit` is too large
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/recursion_limit/zero-overflow.rs b/src/test/ui/recursion_limit/zero-overflow.rs
deleted file mode 100644
index 77bd81856..000000000
--- a/src/test/ui/recursion_limit/zero-overflow.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-//~ ERROR overflow evaluating the requirement `&mut Self: DispatchFromDyn<&mut RustaceansAreAwesome>
-//~| HELP consider increasing the recursion limit
-// build-fail
-
-#![recursion_limit = "0"]
-
-fn main() {}
diff --git a/src/test/ui/recursion_limit/zero-overflow.stderr b/src/test/ui/recursion_limit/zero-overflow.stderr
deleted file mode 100644
index 9007ec0d7..000000000
--- a/src/test/ui/recursion_limit/zero-overflow.stderr
+++ /dev/null
@@ -1,7 +0,0 @@
-error[E0275]: overflow evaluating the requirement `&mut Self: DispatchFromDyn<&mut RustaceansAreAwesome>`
-   |
-   = help: consider increasing the recursion limit by adding a `#![recursion_limit = "2"]` attribute to your crate (`zero_overflow`)
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0275`.
diff --git a/src/test/ui/recursion_limit/zero.rs b/src/test/ui/recursion_limit/zero.rs
deleted file mode 100644
index 3a2d904cb..000000000
--- a/src/test/ui/recursion_limit/zero.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Test that a `limit` of 0 is valid
-
-#![recursion_limit = "0"]
-
-macro_rules! test {
-    () => {};
-    ($tt:tt) => { test!(); };
-}
-
-test!(test); //~ ERROR recursion limit reached while expanding `test!`
-
-fn main() {}
diff --git a/src/test/ui/recursion_limit/zero.stderr b/src/test/ui/recursion_limit/zero.stderr
deleted file mode 100644
index b43565909..000000000
--- a/src/test/ui/recursion_limit/zero.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-error: recursion limit reached while expanding `test!`
-  --> $DIR/zero.rs:10:1
-   |
-LL | test!(test);
-   | ^^^^^^^^^^^
-   |
-   = help: consider increasing the recursion limit by adding a `#![recursion_limit = "2"]` attribute to your crate (`zero`)
-
-error: aborting due to previous error
-