From 64d98f8ee037282c35007b64c2649055c56af1db Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:03 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- src/test/ui/invalid-self-argument/bare-fn-start.rs | 6 ------ src/test/ui/invalid-self-argument/bare-fn-start.stderr | 10 ---------- src/test/ui/invalid-self-argument/bare-fn.rs | 5 ----- src/test/ui/invalid-self-argument/bare-fn.stderr | 8 -------- src/test/ui/invalid-self-argument/trait-fn.rs | 11 ----------- src/test/ui/invalid-self-argument/trait-fn.stderr | 8 -------- 6 files changed, 48 deletions(-) delete mode 100644 src/test/ui/invalid-self-argument/bare-fn-start.rs delete mode 100644 src/test/ui/invalid-self-argument/bare-fn-start.stderr delete mode 100644 src/test/ui/invalid-self-argument/bare-fn.rs delete mode 100644 src/test/ui/invalid-self-argument/bare-fn.stderr delete mode 100644 src/test/ui/invalid-self-argument/trait-fn.rs delete mode 100644 src/test/ui/invalid-self-argument/trait-fn.stderr (limited to 'src/test/ui/invalid-self-argument') diff --git a/src/test/ui/invalid-self-argument/bare-fn-start.rs b/src/test/ui/invalid-self-argument/bare-fn-start.rs deleted file mode 100644 index 7c580bc5a..000000000 --- a/src/test/ui/invalid-self-argument/bare-fn-start.rs +++ /dev/null @@ -1,6 +0,0 @@ -fn a(&self) { } -//~^ ERROR `self` parameter is only allowed in associated functions -//~| NOTE not semantically valid as function parameter -//~| NOTE associated functions are those in `impl` or `trait` definitions - -fn main() { } diff --git a/src/test/ui/invalid-self-argument/bare-fn-start.stderr b/src/test/ui/invalid-self-argument/bare-fn-start.stderr deleted file mode 100644 index 37753e61f..000000000 --- a/src/test/ui/invalid-self-argument/bare-fn-start.stderr +++ /dev/null @@ -1,10 +0,0 @@ -error: `self` parameter is only allowed in associated functions - --> $DIR/bare-fn-start.rs:1:6 - | -LL | fn a(&self) { } - | ^^^^^ not semantically valid as function parameter - | - = note: associated functions are those in `impl` or `trait` definitions - -error: aborting due to previous error - diff --git a/src/test/ui/invalid-self-argument/bare-fn.rs b/src/test/ui/invalid-self-argument/bare-fn.rs deleted file mode 100644 index 342bdc31a..000000000 --- a/src/test/ui/invalid-self-argument/bare-fn.rs +++ /dev/null @@ -1,5 +0,0 @@ -fn b(foo: u32, &mut self) { } -//~^ ERROR unexpected `self` parameter in function -//~| NOTE must be the first parameter of an associated function - -fn main() { } diff --git a/src/test/ui/invalid-self-argument/bare-fn.stderr b/src/test/ui/invalid-self-argument/bare-fn.stderr deleted file mode 100644 index ff2217b5e..000000000 --- a/src/test/ui/invalid-self-argument/bare-fn.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: unexpected `self` parameter in function - --> $DIR/bare-fn.rs:1:16 - | -LL | fn b(foo: u32, &mut self) { } - | ^^^^^^^^^ must be the first parameter of an associated function - -error: aborting due to previous error - diff --git a/src/test/ui/invalid-self-argument/trait-fn.rs b/src/test/ui/invalid-self-argument/trait-fn.rs deleted file mode 100644 index 5ccea5895..000000000 --- a/src/test/ui/invalid-self-argument/trait-fn.rs +++ /dev/null @@ -1,11 +0,0 @@ -struct Foo {} - -impl Foo { - fn c(foo: u32, self) {} - //~^ ERROR unexpected `self` parameter in function - //~| NOTE must be the first parameter of an associated function - - fn good(&mut self, foo: u32) {} -} - -fn main() { } diff --git a/src/test/ui/invalid-self-argument/trait-fn.stderr b/src/test/ui/invalid-self-argument/trait-fn.stderr deleted file mode 100644 index b9887af96..000000000 --- a/src/test/ui/invalid-self-argument/trait-fn.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: unexpected `self` parameter in function - --> $DIR/trait-fn.rs:4:20 - | -LL | fn c(foo: u32, self) {} - | ^^^^ must be the first parameter of an associated function - -error: aborting due to previous error - -- cgit v1.2.3