Merging upstream version 1.68.2+dfsg1.

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

55 files changed, 2 insertions, 2 deletions

diff --git a/src/test/ui/use-import-export.rs b/tests/ui/use-import-export.rs
index 07a6866ba..07a6866ba 100644
--- a/src/test/ui/use-import-export.rs
+++ b/tests/ui/use-import-export.rs
diff --git a/src/test/ui/use-keyword-2.rs b/tests/ui/use-keyword-2.rs
index ebddb5d1a..ebddb5d1a 100644
--- a/src/test/ui/use-keyword-2.rs
+++ b/tests/ui/use-keyword-2.rs
diff --git a/src/test/ui/use-module-level-int-consts.rs b/tests/ui/use-module-level-int-consts.rs
index 200f742d7..200f742d7 100644
--- a/src/test/ui/use-module-level-int-consts.rs
+++ b/tests/ui/use-module-level-int-consts.rs
diff --git a/src/test/ui/use-nested-groups.rs b/tests/ui/use-nested-groups.rs
index 5c739709e..5c739709e 100644
--- a/src/test/ui/use-nested-groups.rs
+++ b/tests/ui/use-nested-groups.rs
diff --git a/src/test/ui/use.rs b/tests/ui/use.rs
index 1beee4a51..1beee4a51 100644
--- a/src/test/ui/use.rs
+++ b/tests/ui/use.rs
diff --git a/src/test/ui/use/auxiliary/extern-use-primitive-type-lib.rs b/tests/ui/use/auxiliary/extern-use-primitive-type-lib.rs
index 3c7756ef7..3c7756ef7 100644
--- a/src/test/ui/use/auxiliary/extern-use-primitive-type-lib.rs
+++ b/tests/ui/use/auxiliary/extern-use-primitive-type-lib.rs
diff --git a/src/test/ui/use/auxiliary/use-from-trait-xc.rs b/tests/ui/use/auxiliary/use-from-trait-xc.rs
index 4abe11941..4abe11941 100644
--- a/src/test/ui/use/auxiliary/use-from-trait-xc.rs
+++ b/tests/ui/use/auxiliary/use-from-trait-xc.rs
diff --git a/src/test/ui/use/issue-18986.rs b/tests/ui/use/issue-18986.rs
index f0b292f29..f0b292f29 100644
--- a/src/test/ui/use/issue-18986.rs
+++ b/tests/ui/use/issue-18986.rs
diff --git a/src/test/ui/use/issue-18986.stderr b/tests/ui/use/issue-18986.stderr
index 6c23178c7..6c23178c7 100644
--- a/src/test/ui/use/issue-18986.stderr
+++ b/tests/ui/use/issue-18986.stderr
diff --git a/src/test/ui/use/issue-60976-extern-use-primitive-type.rs b/tests/ui/use/issue-60976-extern-use-primitive-type.rs
index 4cd458302..4cd458302 100644
--- a/src/test/ui/use/issue-60976-extern-use-primitive-type.rs
+++ b/tests/ui/use/issue-60976-extern-use-primitive-type.rs
diff --git a/src/test/ui/use/use-after-move-based-on-type.rs b/tests/ui/use/use-after-move-based-on-type.rs
index ba7aa0345..ba7aa0345 100644
--- a/src/test/ui/use/use-after-move-based-on-type.rs
+++ b/tests/ui/use/use-after-move-based-on-type.rs
diff --git a/src/test/ui/use/use-after-move-based-on-type.stderr b/tests/ui/use/use-after-move-based-on-type.stderr
index 7b4d24549..7b4d24549 100644
--- a/src/test/ui/use/use-after-move-based-on-type.stderr
+++ b/tests/ui/use/use-after-move-based-on-type.stderr
diff --git a/src/test/ui/use/use-after-move-implicity-coerced-object.rs b/tests/ui/use/use-after-move-implicity-coerced-object.rs
index 47fbb5bf1..47fbb5bf1 100644
--- a/src/test/ui/use/use-after-move-implicity-coerced-object.rs
+++ b/tests/ui/use/use-after-move-implicity-coerced-object.rs
diff --git a/src/test/ui/use/use-after-move-implicity-coerced-object.stderr b/tests/ui/use/use-after-move-implicity-coerced-object.stderr
index dfa0c0483..dfa0c0483 100644
--- a/src/test/ui/use/use-after-move-implicity-coerced-object.stderr
+++ b/tests/ui/use/use-after-move-implicity-coerced-object.stderr
diff --git a/src/test/ui/use/use-after-move-self-based-on-type.rs b/tests/ui/use/use-after-move-self-based-on-type.rs
index 932583495..932583495 100644
--- a/src/test/ui/use/use-after-move-self-based-on-type.rs
+++ b/tests/ui/use/use-after-move-self-based-on-type.rs
diff --git a/src/test/ui/use/use-after-move-self-based-on-type.stderr b/tests/ui/use/use-after-move-self-based-on-type.stderr
index 7fdc4ab25..1bdf49801 100644
--- a/src/test/ui/use/use-after-move-self-based-on-type.stderr
+++ b/tests/ui/use/use-after-move-self-based-on-type.stderr
@@ -8,7 +8,7 @@ LL |         self.bar();
 LL |         return self.x;
    |                ^^^^^^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `self`
+note: `S::bar` takes ownership of the receiver `self`, which moves `self`
   --> $DIR/use-after-move-self-based-on-type.rs:15:16
    |
 LL |     pub fn bar(self) {}
diff --git a/src/test/ui/use/use-after-move-self.rs b/tests/ui/use/use-after-move-self.rs
index f7a3c0ecc..f7a3c0ecc 100644
--- a/src/test/ui/use/use-after-move-self.rs
+++ b/tests/ui/use/use-after-move-self.rs
diff --git a/src/test/ui/use/use-after-move-self.stderr b/tests/ui/use/use-after-move-self.stderr
index 073deee63..59cc22ead 100644
--- a/src/test/ui/use/use-after-move-self.stderr
+++ b/tests/ui/use/use-after-move-self.stderr
@@ -8,7 +8,7 @@ LL |         self.bar();
 LL |         return *self.x;
    |                ^^^^^^^ value used here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `self`
+note: `S::bar` takes ownership of the receiver `self`, which moves `self`
   --> $DIR/use-after-move-self.rs:13:16
    |
 LL |     pub fn bar(self) {}
diff --git a/src/test/ui/use/use-associated-const.rs b/tests/ui/use/use-associated-const.rs
index 714fbdabb..714fbdabb 100644
--- a/src/test/ui/use/use-associated-const.rs
+++ b/tests/ui/use/use-associated-const.rs
diff --git a/src/test/ui/use/use-associated-const.stderr b/tests/ui/use/use-associated-const.stderr
index 4bc0d7e61..4bc0d7e61 100644
--- a/src/test/ui/use/use-associated-const.stderr
+++ b/tests/ui/use/use-associated-const.stderr
diff --git a/src/test/ui/use/use-crate-self.rs b/tests/ui/use/use-crate-self.rs
index 65ab94814..65ab94814 100644
--- a/src/test/ui/use/use-crate-self.rs
+++ b/tests/ui/use/use-crate-self.rs
diff --git a/src/test/ui/use/use-crate-self.stderr b/tests/ui/use/use-crate-self.stderr
index dd4036bff..dd4036bff 100644
--- a/src/test/ui/use/use-crate-self.stderr
+++ b/tests/ui/use/use-crate-self.stderr
diff --git a/src/test/ui/use/use-from-trait-xc.rs b/tests/ui/use/use-from-trait-xc.rs
index 695ed66a1..695ed66a1 100644
--- a/src/test/ui/use/use-from-trait-xc.rs
+++ b/tests/ui/use/use-from-trait-xc.rs
diff --git a/src/test/ui/use/use-from-trait-xc.stderr b/tests/ui/use/use-from-trait-xc.stderr
index 4c4c2f622..4c4c2f622 100644
--- a/src/test/ui/use/use-from-trait-xc.stderr
+++ b/tests/ui/use/use-from-trait-xc.stderr
diff --git a/src/test/ui/use/use-from-trait.rs b/tests/ui/use/use-from-trait.rs
index eab4bb6e3..eab4bb6e3 100644
--- a/src/test/ui/use/use-from-trait.rs
+++ b/tests/ui/use/use-from-trait.rs
diff --git a/src/test/ui/use/use-from-trait.stderr b/tests/ui/use/use-from-trait.stderr
index a5b0e356b..a5b0e356b 100644
--- a/src/test/ui/use/use-from-trait.stderr
+++ b/tests/ui/use/use-from-trait.stderr
diff --git a/src/test/ui/use/use-keyword.rs b/tests/ui/use/use-keyword.rs
index c30c2e06c..c30c2e06c 100644
--- a/src/test/ui/use/use-keyword.rs
+++ b/tests/ui/use/use-keyword.rs
diff --git a/src/test/ui/use/use-keyword.stderr b/tests/ui/use/use-keyword.stderr
index 501d14be5..501d14be5 100644
--- a/src/test/ui/use/use-keyword.stderr
+++ b/tests/ui/use/use-keyword.stderr
diff --git a/src/test/ui/use/use-meta-mismatch.rs b/tests/ui/use/use-meta-mismatch.rs
index 975209efb..975209efb 100644
--- a/src/test/ui/use/use-meta-mismatch.rs
+++ b/tests/ui/use/use-meta-mismatch.rs
diff --git a/src/test/ui/use/use-meta-mismatch.stderr b/tests/ui/use/use-meta-mismatch.stderr
index 62b71fe8e..62b71fe8e 100644
--- a/src/test/ui/use/use-meta-mismatch.stderr
+++ b/tests/ui/use/use-meta-mismatch.stderr
diff --git a/src/test/ui/use/use-mod.rs b/tests/ui/use/use-mod.rs
index 87064c6a4..87064c6a4 100644
--- a/src/test/ui/use/use-mod.rs
+++ b/tests/ui/use/use-mod.rs
diff --git a/src/test/ui/use/use-mod.stderr b/tests/ui/use/use-mod.stderr
index 0cae5eb14..0cae5eb14 100644
--- a/src/test/ui/use/use-mod.stderr
+++ b/tests/ui/use/use-mod.stderr
diff --git a/src/test/ui/use/use-mod/use-mod-2.rs b/tests/ui/use/use-mod/use-mod-2.rs
index 9373a62ba..9373a62ba 100644
--- a/src/test/ui/use/use-mod/use-mod-2.rs
+++ b/tests/ui/use/use-mod/use-mod-2.rs
diff --git a/src/test/ui/use/use-mod/use-mod-2.stderr b/tests/ui/use/use-mod/use-mod-2.stderr
index 843767849..843767849 100644
--- a/src/test/ui/use/use-mod/use-mod-2.stderr
+++ b/tests/ui/use/use-mod/use-mod-2.stderr
diff --git a/src/test/ui/use/use-mod/use-mod-3.rs b/tests/ui/use/use-mod/use-mod-3.rs
index 0afa486b9..0afa486b9 100644
--- a/src/test/ui/use/use-mod/use-mod-3.rs
+++ b/tests/ui/use/use-mod/use-mod-3.rs
diff --git a/src/test/ui/use/use-mod/use-mod-3.stderr b/tests/ui/use/use-mod/use-mod-3.stderr
index 1b12b3c6f..1b12b3c6f 100644
--- a/src/test/ui/use/use-mod/use-mod-3.stderr
+++ b/tests/ui/use/use-mod/use-mod-3.stderr
diff --git a/src/test/ui/use/use-mod/use-mod-4.rs b/tests/ui/use/use-mod/use-mod-4.rs
index 46ae8ddad..46ae8ddad 100644
--- a/src/test/ui/use/use-mod/use-mod-4.rs
+++ b/tests/ui/use/use-mod/use-mod-4.rs
diff --git a/src/test/ui/use/use-mod/use-mod-4.stderr b/tests/ui/use/use-mod/use-mod-4.stderr
index 0b4fbadb4..0b4fbadb4 100644
--- a/src/test/ui/use/use-mod/use-mod-4.stderr
+++ b/tests/ui/use/use-mod/use-mod-4.stderr
diff --git a/src/test/ui/use/use-mod/use-mod-5.rs b/tests/ui/use/use-mod/use-mod-5.rs
index df5b423ec..df5b423ec 100644
--- a/src/test/ui/use/use-mod/use-mod-5.rs
+++ b/tests/ui/use/use-mod/use-mod-5.rs
diff --git a/src/test/ui/use/use-mod/use-mod-5.stderr b/tests/ui/use/use-mod/use-mod-5.stderr
index 62859e261..62859e261 100644
--- a/src/test/ui/use/use-mod/use-mod-5.stderr
+++ b/tests/ui/use/use-mod/use-mod-5.stderr
diff --git a/src/test/ui/use/use-mod/use-mod-6.rs b/tests/ui/use/use-mod/use-mod-6.rs
index 1f8777dac..1f8777dac 100644
--- a/src/test/ui/use/use-mod/use-mod-6.rs
+++ b/tests/ui/use/use-mod/use-mod-6.rs
diff --git a/src/test/ui/use/use-mod/use-mod-6.stderr b/tests/ui/use/use-mod/use-mod-6.stderr
index 2d2c90067..2d2c90067 100644
--- a/src/test/ui/use/use-mod/use-mod-6.stderr
+++ b/tests/ui/use/use-mod/use-mod-6.stderr
diff --git a/src/test/ui/use/use-nested-groups-error.rs b/tests/ui/use/use-nested-groups-error.rs
index d8b189d19..d8b189d19 100644
--- a/src/test/ui/use/use-nested-groups-error.rs
+++ b/tests/ui/use/use-nested-groups-error.rs
diff --git a/src/test/ui/use/use-nested-groups-error.stderr b/tests/ui/use/use-nested-groups-error.stderr
index 7234c8ec6..7234c8ec6 100644
--- a/src/test/ui/use/use-nested-groups-error.stderr
+++ b/tests/ui/use/use-nested-groups-error.stderr
diff --git a/src/test/ui/use/use-nested-groups-unused-imports.rs b/tests/ui/use/use-nested-groups-unused-imports.rs
index ca6b8ba94..ca6b8ba94 100644
--- a/src/test/ui/use/use-nested-groups-unused-imports.rs
+++ b/tests/ui/use/use-nested-groups-unused-imports.rs
diff --git a/src/test/ui/use/use-nested-groups-unused-imports.stderr b/tests/ui/use/use-nested-groups-unused-imports.stderr
index 6610f8ecd..6610f8ecd 100644
--- a/src/test/ui/use/use-nested-groups-unused-imports.stderr
+++ b/tests/ui/use/use-nested-groups-unused-imports.stderr
diff --git a/src/test/ui/use/use-paths-as-items.rs b/tests/ui/use/use-paths-as-items.rs
index 7b5eb56b1..7b5eb56b1 100644
--- a/src/test/ui/use/use-paths-as-items.rs
+++ b/tests/ui/use/use-paths-as-items.rs
diff --git a/src/test/ui/use/use-paths-as-items.stderr b/tests/ui/use/use-paths-as-items.stderr
index b09001a9b..b09001a9b 100644
--- a/src/test/ui/use/use-paths-as-items.stderr
+++ b/tests/ui/use/use-paths-as-items.stderr
diff --git a/src/test/ui/use/use-self-type.rs b/tests/ui/use/use-self-type.rs
index 3b4ce4297..3b4ce4297 100644
--- a/src/test/ui/use/use-self-type.rs
+++ b/tests/ui/use/use-self-type.rs
diff --git a/src/test/ui/use/use-self-type.stderr b/tests/ui/use/use-self-type.stderr
index e61539411..e61539411 100644
--- a/src/test/ui/use/use-self-type.stderr
+++ b/tests/ui/use/use-self-type.stderr
diff --git a/src/test/ui/use/use-super-global-path.rs b/tests/ui/use/use-super-global-path.rs
index 64bfd14b7..64bfd14b7 100644
--- a/src/test/ui/use/use-super-global-path.rs
+++ b/tests/ui/use/use-super-global-path.rs
diff --git a/src/test/ui/use/use-super-global-path.stderr b/tests/ui/use/use-super-global-path.stderr
index 7014a12e9..7014a12e9 100644
--- a/src/test/ui/use/use-super-global-path.stderr
+++ b/tests/ui/use/use-super-global-path.stderr
diff --git a/src/test/ui/used.rs b/tests/ui/used.rs
index f008724f4..f008724f4 100644
--- a/src/test/ui/used.rs
+++ b/tests/ui/used.rs
diff --git a/src/test/ui/used.stderr b/tests/ui/used.stderr
index ea77f129d..ea77f129d 100644
--- a/src/test/ui/used.stderr
+++ b/tests/ui/used.stderr
diff --git a/src/test/ui/user-defined-macro-rules.rs b/tests/ui/user-defined-macro-rules.rs
index 09e071ec4..09e071ec4 100644
--- a/src/test/ui/user-defined-macro-rules.rs
+++ b/tests/ui/user-defined-macro-rules.rs