Merging upstream version 1.68.2+dfsg1.

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

15 files changed, 0 insertions, 0 deletions

diff --git a/src/test/ui/try-trait/bad-interconversion.rs b/tests/ui/try-trait/bad-interconversion.rs
index 385f5510f..385f5510f 100644
--- a/src/test/ui/try-trait/bad-interconversion.rs
+++ b/tests/ui/try-trait/bad-interconversion.rs
diff --git a/src/test/ui/try-trait/bad-interconversion.stderr b/tests/ui/try-trait/bad-interconversion.stderr
index a49630adb..a49630adb 100644
--- a/src/test/ui/try-trait/bad-interconversion.stderr
+++ b/tests/ui/try-trait/bad-interconversion.stderr
diff --git a/src/test/ui/try-trait/option-to-result.rs b/tests/ui/try-trait/option-to-result.rs
index 45aaf361a..45aaf361a 100644
--- a/src/test/ui/try-trait/option-to-result.rs
+++ b/tests/ui/try-trait/option-to-result.rs
diff --git a/src/test/ui/try-trait/option-to-result.stderr b/tests/ui/try-trait/option-to-result.stderr
index fabc1ff2c..fabc1ff2c 100644
--- a/src/test/ui/try-trait/option-to-result.stderr
+++ b/tests/ui/try-trait/option-to-result.stderr
diff --git a/src/test/ui/try-trait/try-as-monad.rs b/tests/ui/try-trait/try-as-monad.rs
index cf09838b3..cf09838b3 100644
--- a/src/test/ui/try-trait/try-as-monad.rs
+++ b/tests/ui/try-trait/try-as-monad.rs
diff --git a/src/test/ui/try-trait/try-on-option-diagnostics.rs b/tests/ui/try-trait/try-on-option-diagnostics.rs
index 7ffa0de6c..7ffa0de6c 100644
--- a/src/test/ui/try-trait/try-on-option-diagnostics.rs
+++ b/tests/ui/try-trait/try-on-option-diagnostics.rs
diff --git a/src/test/ui/try-trait/try-on-option-diagnostics.stderr b/tests/ui/try-trait/try-on-option-diagnostics.stderr
index 9ee540c79..9ee540c79 100644
--- a/src/test/ui/try-trait/try-on-option-diagnostics.stderr
+++ b/tests/ui/try-trait/try-on-option-diagnostics.stderr
diff --git a/src/test/ui/try-trait/try-on-option.rs b/tests/ui/try-trait/try-on-option.rs
index 8519932a6..8519932a6 100644
--- a/src/test/ui/try-trait/try-on-option.rs
+++ b/tests/ui/try-trait/try-on-option.rs
diff --git a/src/test/ui/try-trait/try-on-option.stderr b/tests/ui/try-trait/try-on-option.stderr
index fad6a1fe8..fad6a1fe8 100644
--- a/src/test/ui/try-trait/try-on-option.stderr
+++ b/tests/ui/try-trait/try-on-option.stderr
diff --git a/src/test/ui/try-trait/try-operator-custom.rs b/tests/ui/try-trait/try-operator-custom.rs
index 45636a7fc..45636a7fc 100644
--- a/src/test/ui/try-trait/try-operator-custom.rs
+++ b/tests/ui/try-trait/try-operator-custom.rs
diff --git a/src/test/ui/try-trait/try-operator-on-main.rs b/tests/ui/try-trait/try-operator-on-main.rs
index 3b364f7e7..3b364f7e7 100644
--- a/src/test/ui/try-trait/try-operator-on-main.rs
+++ b/tests/ui/try-trait/try-operator-on-main.rs
diff --git a/src/test/ui/try-trait/try-operator-on-main.stderr b/tests/ui/try-trait/try-operator-on-main.stderr
index 7cd38e0cf..7cd38e0cf 100644
--- a/src/test/ui/try-trait/try-operator-on-main.stderr
+++ b/tests/ui/try-trait/try-operator-on-main.stderr
diff --git a/src/test/ui/try-trait/try-poll.rs b/tests/ui/try-trait/try-poll.rs
index d42e51c74..d42e51c74 100644
--- a/src/test/ui/try-trait/try-poll.rs
+++ b/tests/ui/try-trait/try-poll.rs
diff --git a/src/test/ui/try-trait/yeet-for-option.rs b/tests/ui/try-trait/yeet-for-option.rs
index 753fbc1de..753fbc1de 100644
--- a/src/test/ui/try-trait/yeet-for-option.rs
+++ b/tests/ui/try-trait/yeet-for-option.rs
diff --git a/src/test/ui/try-trait/yeet-for-result.rs b/tests/ui/try-trait/yeet-for-result.rs
index b7b113797..b7b113797 100644
--- a/src/test/ui/try-trait/yeet-for-result.rs
+++ b/tests/ui/try-trait/yeet-for-result.rs