Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 50 deletions

diff --git a/src/test/ui/error-codes/E0424.stderr b/src/test/ui/error-codes/E0424.stderr
deleted file mode 100644
index d02da3e4e..000000000
--- a/src/test/ui/error-codes/E0424.stderr
+++ /dev/null
@@ -1,50 +0,0 @@
-error[E0424]: expected value, found module `self`
-  --> $DIR/E0424.rs:7:9
-   |
-LL |     fn foo() {
-   |        --- this function doesn't have a `self` parameter
-LL |         self.bar();
-   |         ^^^^ `self` value is a keyword only available in methods with a `self` parameter
-   |
-help: add a `self` receiver parameter to make the associated `fn` a method
-   |
-LL |     fn foo(&self) {
-   |            +++++
-
-error[E0424]: expected value, found module `self`
-  --> $DIR/E0424.rs:11:9
-   |
-LL |     fn baz(_: i32) {
-   |        --- this function doesn't have a `self` parameter
-LL |         self.bar();
-   |         ^^^^ `self` value is a keyword only available in methods with a `self` parameter
-   |
-help: add a `self` receiver parameter to make the associated `fn` a method
-   |
-LL |     fn baz(&self, _: i32) {
-   |            ++++++
-
-error[E0424]: expected value, found module `self`
-  --> $DIR/E0424.rs:15:20
-   |
-LL |     fn qux() {
-   |        --- this function doesn't have a `self` parameter
-LL |         let _ = || self.bar();
-   |                    ^^^^ `self` value is a keyword only available in methods with a `self` parameter
-   |
-help: add a `self` receiver parameter to make the associated `fn` a method
-   |
-LL |     fn qux(&self) {
-   |            +++++
-
-error[E0424]: expected unit struct, unit variant or constant, found module `self`
-  --> $DIR/E0424.rs:20:9
-   |
-LL | fn main () {
-   |    ---- this function can't have a `self` parameter
-LL |     let self = "self";
-   |         ^^^^ `self` value is a keyword and may not be bound to variables or shadowed
-
-error: aborting due to 4 previous errors
-
-For more information about this error, try `rustc --explain E0424`.