Merging upstream version 1.68.2+dfsg1.

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

14 files changed, 1 insertions, 1 deletions

diff --git a/src/test/ui/extenv/extenv-arg-2-not-string-literal.rs b/tests/ui/extenv/extenv-arg-2-not-string-literal.rs
index 66dced478..66dced478 100644
--- a/src/test/ui/extenv/extenv-arg-2-not-string-literal.rs
+++ b/tests/ui/extenv/extenv-arg-2-not-string-literal.rs
diff --git a/src/test/ui/extenv/extenv-arg-2-not-string-literal.stderr b/tests/ui/extenv/extenv-arg-2-not-string-literal.stderr
index 258e2b347..258e2b347 100644
--- a/src/test/ui/extenv/extenv-arg-2-not-string-literal.stderr
+++ b/tests/ui/extenv/extenv-arg-2-not-string-literal.stderr
diff --git a/src/test/ui/extenv/extenv-no-args.rs b/tests/ui/extenv/extenv-no-args.rs
index 9f221ed10..9f221ed10 100644
--- a/src/test/ui/extenv/extenv-no-args.rs
+++ b/tests/ui/extenv/extenv-no-args.rs
diff --git a/src/test/ui/extenv/extenv-no-args.stderr b/tests/ui/extenv/extenv-no-args.stderr
index 318ed635b..318ed635b 100644
--- a/src/test/ui/extenv/extenv-no-args.stderr
+++ b/tests/ui/extenv/extenv-no-args.stderr
diff --git a/src/test/ui/extenv/extenv-not-defined-custom.rs b/tests/ui/extenv/extenv-not-defined-custom.rs
index 30b72783f..30b72783f 100644
--- a/src/test/ui/extenv/extenv-not-defined-custom.rs
+++ b/tests/ui/extenv/extenv-not-defined-custom.rs
diff --git a/src/test/ui/extenv/extenv-not-defined-custom.stderr b/tests/ui/extenv/extenv-not-defined-custom.stderr
index e7da4e046..e7da4e046 100644
--- a/src/test/ui/extenv/extenv-not-defined-custom.stderr
+++ b/tests/ui/extenv/extenv-not-defined-custom.stderr
diff --git a/src/test/ui/extenv/extenv-not-defined-default.rs b/tests/ui/extenv/extenv-not-defined-default.rs
index 30a06a254..30a06a254 100644
--- a/src/test/ui/extenv/extenv-not-defined-default.rs
+++ b/tests/ui/extenv/extenv-not-defined-default.rs
diff --git a/src/test/ui/extenv/extenv-not-defined-default.stderr b/tests/ui/extenv/extenv-not-defined-default.stderr
index 884875dca..884875dca 100644
--- a/src/test/ui/extenv/extenv-not-defined-default.stderr
+++ b/tests/ui/extenv/extenv-not-defined-default.stderr
diff --git a/src/test/ui/extenv/extenv-not-string-literal.rs b/tests/ui/extenv/extenv-not-string-literal.rs
index 3eaa0b5da..3eaa0b5da 100644
--- a/src/test/ui/extenv/extenv-not-string-literal.rs
+++ b/tests/ui/extenv/extenv-not-string-literal.rs
diff --git a/src/test/ui/extenv/extenv-not-string-literal.stderr b/tests/ui/extenv/extenv-not-string-literal.stderr
index 342a9f709..342a9f709 100644
--- a/src/test/ui/extenv/extenv-not-string-literal.stderr
+++ b/tests/ui/extenv/extenv-not-string-literal.stderr
diff --git a/src/test/ui/extenv/extenv-too-many-args.rs b/tests/ui/extenv/extenv-too-many-args.rs
index 1adbee583..1adbee583 100644
--- a/src/test/ui/extenv/extenv-too-many-args.rs
+++ b/tests/ui/extenv/extenv-too-many-args.rs
diff --git a/src/test/ui/extenv/extenv-too-many-args.stderr b/tests/ui/extenv/extenv-too-many-args.stderr
index 54150a332..54150a332 100644
--- a/src/test/ui/extenv/extenv-too-many-args.stderr
+++ b/tests/ui/extenv/extenv-too-many-args.stderr
diff --git a/src/test/ui/extenv/issue-55897.rs b/tests/ui/extenv/issue-55897.rs
index b7533f413..b7533f413 100644
--- a/src/test/ui/extenv/issue-55897.rs
+++ b/tests/ui/extenv/issue-55897.rs
diff --git a/src/test/ui/extenv/issue-55897.stderr b/tests/ui/extenv/issue-55897.stderr
index 63797d4a7..92e8a44b5 100644
--- a/src/test/ui/extenv/issue-55897.stderr
+++ b/tests/ui/extenv/issue-55897.stderr
@@ -30,7 +30,7 @@ LL |     use env;
 help: consider importing this module instead
    |
 LL |     use std::env;
-   |         ~~~~~~~~~
+   |         ~~~~~~~~
 
 error: cannot determine resolution for the macro `env`
   --> $DIR/issue-55897.rs:6:22