Adding upstream version 1.68.2+dfsg1.upstream/1.68.2+dfsg1

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

21 files changed, 0 insertions, 3 deletions

diff --git a/src/test/ui/rfc-1937-termination-trait/issue-103052-1.rs b/tests/ui/rfc-1937-termination-trait/issue-103052-1.rs
index a75c91cc9..a75c91cc9 100644
--- a/src/test/ui/rfc-1937-termination-trait/issue-103052-1.rs
+++ b/tests/ui/rfc-1937-termination-trait/issue-103052-1.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/issue-103052-1.stderr b/tests/ui/rfc-1937-termination-trait/issue-103052-1.stderr
index 409dede1a..409dede1a 100644
--- a/src/test/ui/rfc-1937-termination-trait/issue-103052-1.stderr
+++ b/tests/ui/rfc-1937-termination-trait/issue-103052-1.stderr
diff --git a/src/test/ui/rfc-1937-termination-trait/issue-103052-2.rs b/tests/ui/rfc-1937-termination-trait/issue-103052-2.rs
index fa9182b6d..fa9182b6d 100644
--- a/src/test/ui/rfc-1937-termination-trait/issue-103052-2.rs
+++ b/tests/ui/rfc-1937-termination-trait/issue-103052-2.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/issue-103052-2.stderr b/tests/ui/rfc-1937-termination-trait/issue-103052-2.stderr
index a700c72ea..a700c72ea 100644
--- a/src/test/ui/rfc-1937-termination-trait/issue-103052-2.stderr
+++ b/tests/ui/rfc-1937-termination-trait/issue-103052-2.stderr
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
index 10dc6115d..10dc6115d 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-never.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-for-never.rs
index faf2526c8..faf2526c8 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-never.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-for-never.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs
index 6a625fb05..6a625fb05 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-str.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-for-str.rs
index 94f16c6fd..94f16c6fd 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-for-str.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-for-str.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs
index 3b60cbc57..3b60cbc57 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-impl-trait.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr b/tests/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr
index 5ee6d127e..5ee6d127e 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-impl-trait.stderr
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs
index 96808a3ed..96808a3ed 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr b/tests/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr
index 7f6749fc9..7f6749fc9 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-in-test-should-panic.stderr
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-in-test.rs
index 43888cece..43888cece 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-in-test.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-in-test.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs
index 10f7d2215..10f7d2215 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-main-i32.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr b/tests/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr
index 53779d365..53779d365 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-main-i32.stderr
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs
index 687d5f144..687d5f144 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr b/tests/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr
index bc8fd92ce..bc8fd92ce 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs
index 4c6168abb..4c6168abb 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr b/tests/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr
index cb329548d..cb329548d 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-not-satisfied.stderr
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs b/tests/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs
index 193a523ae..193a523ae 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.rs
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr b/tests/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr
index 957795211..a19750cc7 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr
+++ b/tests/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr
@@ -9,9 +9,6 @@ LL | fn can_parse_zero_as_f32() -> Result<f32, ParseFloatError> {
    = note: required for `Result<f32, ParseFloatError>` to implement `Termination`
 note: required by a bound in `assert_test_result`
   --> $SRC_DIR/test/src/lib.rs:LL:COL
-   |
-LL | pub fn assert_test_result<T: Termination>(result: T) -> Result<(), String> {
-   |                              ^^^^^^^^^^^ required by this bound in `assert_test_result`
    = note: this error originates in the attribute macro `test` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error