From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- .../extern/keyword-extern-as-identifier-expr.rs | 3 --- .../keyword-extern-as-identifier-expr.stderr | 8 ------ .../extern/keyword-extern-as-identifier-pat.rs | 3 --- .../extern/keyword-extern-as-identifier-pat.stderr | 13 ---------- .../extern/keyword-extern-as-identifier-type.rs | 3 --- .../keyword-extern-as-identifier-type.stderr | 8 ------ .../extern/keyword-extern-as-identifier-use.rs | 4 --- .../extern/keyword-extern-as-identifier-use.stderr | 22 ---------------- src/test/ui/keyword/keyword-false-as-identifier.rs | 3 --- .../ui/keyword/keyword-false-as-identifier.stderr | 11 -------- src/test/ui/keyword/keyword-self-as-identifier.rs | 3 --- .../ui/keyword/keyword-self-as-identifier.stderr | 9 ------- src/test/ui/keyword/keyword-self-as-type-param.rs | 10 -------- .../ui/keyword/keyword-self-as-type-param.stderr | 30 ---------------------- src/test/ui/keyword/keyword-super-as-identifier.rs | 3 --- .../ui/keyword/keyword-super-as-identifier.stderr | 9 ------- src/test/ui/keyword/keyword-super.rs | 3 --- src/test/ui/keyword/keyword-super.stderr | 9 ------- src/test/ui/keyword/keyword-true-as-identifier.rs | 3 --- .../ui/keyword/keyword-true-as-identifier.stderr | 11 -------- 20 files changed, 168 deletions(-) delete mode 100644 src/test/ui/keyword/extern/keyword-extern-as-identifier-expr.rs delete mode 100644 src/test/ui/keyword/extern/keyword-extern-as-identifier-expr.stderr delete mode 100644 src/test/ui/keyword/extern/keyword-extern-as-identifier-pat.rs delete mode 100644 src/test/ui/keyword/extern/keyword-extern-as-identifier-pat.stderr delete mode 100644 src/test/ui/keyword/extern/keyword-extern-as-identifier-type.rs delete mode 100644 src/test/ui/keyword/extern/keyword-extern-as-identifier-type.stderr delete mode 100644 src/test/ui/keyword/extern/keyword-extern-as-identifier-use.rs delete mode 100644 src/test/ui/keyword/extern/keyword-extern-as-identifier-use.stderr delete mode 100644 src/test/ui/keyword/keyword-false-as-identifier.rs delete mode 100644 src/test/ui/keyword/keyword-false-as-identifier.stderr delete mode 100644 src/test/ui/keyword/keyword-self-as-identifier.rs delete mode 100644 src/test/ui/keyword/keyword-self-as-identifier.stderr delete mode 100644 src/test/ui/keyword/keyword-self-as-type-param.rs delete mode 100644 src/test/ui/keyword/keyword-self-as-type-param.stderr delete mode 100644 src/test/ui/keyword/keyword-super-as-identifier.rs delete mode 100644 src/test/ui/keyword/keyword-super-as-identifier.stderr delete mode 100644 src/test/ui/keyword/keyword-super.rs delete mode 100644 src/test/ui/keyword/keyword-super.stderr delete mode 100644 src/test/ui/keyword/keyword-true-as-identifier.rs delete mode 100644 src/test/ui/keyword/keyword-true-as-identifier.stderr (limited to 'src/test/ui/keyword') diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-expr.rs b/src/test/ui/keyword/extern/keyword-extern-as-identifier-expr.rs deleted file mode 100644 index b738eb4c7..000000000 --- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-expr.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - let s = extern::foo::Bar; //~ ERROR expected expression, found keyword `extern` -} diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-expr.stderr b/src/test/ui/keyword/extern/keyword-extern-as-identifier-expr.stderr deleted file mode 100644 index 8bb89d2ee..000000000 --- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-expr.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected expression, found keyword `extern` - --> $DIR/keyword-extern-as-identifier-expr.rs:2:13 - | -LL | let s = extern::foo::Bar; - | ^^^^^^ expected expression - -error: aborting due to previous error - diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-pat.rs b/src/test/ui/keyword/extern/keyword-extern-as-identifier-pat.rs deleted file mode 100644 index 8a420f720..000000000 --- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-pat.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - let extern = 0; //~ ERROR expected identifier, found keyword `extern` -} diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-pat.stderr b/src/test/ui/keyword/extern/keyword-extern-as-identifier-pat.stderr deleted file mode 100644 index 9bf416341..000000000 --- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-pat.stderr +++ /dev/null @@ -1,13 +0,0 @@ -error: expected identifier, found keyword `extern` - --> $DIR/keyword-extern-as-identifier-pat.rs:2:9 - | -LL | let extern = 0; - | ^^^^^^ expected identifier, found keyword - | -help: escape `extern` to use it as an identifier - | -LL | let r#extern = 0; - | ++ - -error: aborting due to previous error - diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-type.rs b/src/test/ui/keyword/extern/keyword-extern-as-identifier-type.rs deleted file mode 100644 index 12aa05976..000000000 --- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-type.rs +++ /dev/null @@ -1,3 +0,0 @@ -type A = extern::foo::bar; //~ ERROR expected type, found keyword `extern` - -fn main() {} diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-type.stderr b/src/test/ui/keyword/extern/keyword-extern-as-identifier-type.stderr deleted file mode 100644 index 20ecf6bac..000000000 --- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-type.stderr +++ /dev/null @@ -1,8 +0,0 @@ -error: expected type, found keyword `extern` - --> $DIR/keyword-extern-as-identifier-type.rs:1:10 - | -LL | type A = extern::foo::bar; - | ^^^^^^ expected type - -error: aborting due to previous error - diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-use.rs b/src/test/ui/keyword/extern/keyword-extern-as-identifier-use.rs deleted file mode 100644 index a46ce67d4..000000000 --- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-use.rs +++ /dev/null @@ -1,4 +0,0 @@ -use extern::foo; //~ ERROR expected identifier, found keyword `extern` - //~| ERROR unresolved import `r#extern` - -fn main() {} diff --git a/src/test/ui/keyword/extern/keyword-extern-as-identifier-use.stderr b/src/test/ui/keyword/extern/keyword-extern-as-identifier-use.stderr deleted file mode 100644 index 54ee45c28..000000000 --- a/src/test/ui/keyword/extern/keyword-extern-as-identifier-use.stderr +++ /dev/null @@ -1,22 +0,0 @@ -error: expected identifier, found keyword `extern` - --> $DIR/keyword-extern-as-identifier-use.rs:1:5 - | -LL | use extern::foo; - | ^^^^^^ expected identifier, found keyword - | -help: escape `extern` to use it as an identifier - | -LL | use r#extern::foo; - | ++ - -error[E0432]: unresolved import `r#extern` - --> $DIR/keyword-extern-as-identifier-use.rs:1:5 - | -LL | use extern::foo; - | ^^^^^^ maybe a missing crate `r#extern`? - | - = help: consider adding `extern crate r#extern` to use the `r#extern` crate - -error: aborting due to 2 previous errors - -For more information about this error, try `rustc --explain E0432`. diff --git a/src/test/ui/keyword/keyword-false-as-identifier.rs b/src/test/ui/keyword/keyword-false-as-identifier.rs deleted file mode 100644 index 6382f841b..000000000 --- a/src/test/ui/keyword/keyword-false-as-identifier.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - let false = 22; //~ error: mismatched types -} diff --git a/src/test/ui/keyword/keyword-false-as-identifier.stderr b/src/test/ui/keyword/keyword-false-as-identifier.stderr deleted file mode 100644 index 6dcfa3a48..000000000 --- a/src/test/ui/keyword/keyword-false-as-identifier.stderr +++ /dev/null @@ -1,11 +0,0 @@ -error[E0308]: mismatched types - --> $DIR/keyword-false-as-identifier.rs:2:9 - | -LL | let false = 22; - | ^^^^^ -- this expression has type `{integer}` - | | - | expected integer, found `bool` - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0308`. diff --git a/src/test/ui/keyword/keyword-self-as-identifier.rs b/src/test/ui/keyword/keyword-self-as-identifier.rs deleted file mode 100644 index 72e4f01e2..000000000 --- a/src/test/ui/keyword/keyword-self-as-identifier.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - let Self = 22; //~ ERROR cannot find unit struct, unit variant or constant `Self` in this scope -} diff --git a/src/test/ui/keyword/keyword-self-as-identifier.stderr b/src/test/ui/keyword/keyword-self-as-identifier.stderr deleted file mode 100644 index 060e7c3ea..000000000 --- a/src/test/ui/keyword/keyword-self-as-identifier.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0531]: cannot find unit struct, unit variant or constant `Self` in this scope - --> $DIR/keyword-self-as-identifier.rs:2:9 - | -LL | let Self = 22; - | ^^^^ not found in this scope - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0531`. diff --git a/src/test/ui/keyword/keyword-self-as-type-param.rs b/src/test/ui/keyword/keyword-self-as-type-param.rs deleted file mode 100644 index 55c7ac128..000000000 --- a/src/test/ui/keyword/keyword-self-as-type-param.rs +++ /dev/null @@ -1,10 +0,0 @@ -// Regression test of #36638. - -struct Foo(Self); -//~^ ERROR unexpected keyword `Self` in generic parameters -//~| ERROR recursive type `Foo` has infinite size - -trait Bar {} -//~^ ERROR unexpected keyword `Self` in generic parameters - -fn main() {} diff --git a/src/test/ui/keyword/keyword-self-as-type-param.stderr b/src/test/ui/keyword/keyword-self-as-type-param.stderr deleted file mode 100644 index 5aef94754..000000000 --- a/src/test/ui/keyword/keyword-self-as-type-param.stderr +++ /dev/null @@ -1,30 +0,0 @@ -error: unexpected keyword `Self` in generic parameters - --> $DIR/keyword-self-as-type-param.rs:3:12 - | -LL | struct Foo(Self); - | ^^^^ - | - = note: you cannot use `Self` as a generic parameter because it is reserved for associated items - -error: unexpected keyword `Self` in generic parameters - --> $DIR/keyword-self-as-type-param.rs:7:11 - | -LL | trait Bar {} - | ^^^^ - | - = note: you cannot use `Self` as a generic parameter because it is reserved for associated items - -error[E0072]: recursive type `Foo` has infinite size - --> $DIR/keyword-self-as-type-param.rs:3:1 - | -LL | struct Foo(Self); - | ^^^^^^^^^^^^^^^^ ---- recursive without indirection - | -help: insert some indirection (e.g., a `Box`, `Rc`, or `&`) to break the cycle - | -LL | struct Foo(Box); - | ++++ + - -error: aborting due to 3 previous errors - -For more information about this error, try `rustc --explain E0072`. diff --git a/src/test/ui/keyword/keyword-super-as-identifier.rs b/src/test/ui/keyword/keyword-super-as-identifier.rs deleted file mode 100644 index 02c1b27b0..000000000 --- a/src/test/ui/keyword/keyword-super-as-identifier.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - let super = 22; //~ ERROR failed to resolve: there are too many leading `super` keywords -} diff --git a/src/test/ui/keyword/keyword-super-as-identifier.stderr b/src/test/ui/keyword/keyword-super-as-identifier.stderr deleted file mode 100644 index 1f64f3b73..000000000 --- a/src/test/ui/keyword/keyword-super-as-identifier.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0433]: failed to resolve: there are too many leading `super` keywords - --> $DIR/keyword-super-as-identifier.rs:2:9 - | -LL | let super = 22; - | ^^^^^ there are too many leading `super` keywords - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0433`. diff --git a/src/test/ui/keyword/keyword-super.rs b/src/test/ui/keyword/keyword-super.rs deleted file mode 100644 index c121a6c10..000000000 --- a/src/test/ui/keyword/keyword-super.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - let super: isize; //~ ERROR failed to resolve: there are too many leading `super` keywords -} diff --git a/src/test/ui/keyword/keyword-super.stderr b/src/test/ui/keyword/keyword-super.stderr deleted file mode 100644 index 0e0d67cb9..000000000 --- a/src/test/ui/keyword/keyword-super.stderr +++ /dev/null @@ -1,9 +0,0 @@ -error[E0433]: failed to resolve: there are too many leading `super` keywords - --> $DIR/keyword-super.rs:2:9 - | -LL | let super: isize; - | ^^^^^ there are too many leading `super` keywords - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0433`. diff --git a/src/test/ui/keyword/keyword-true-as-identifier.rs b/src/test/ui/keyword/keyword-true-as-identifier.rs deleted file mode 100644 index 8c4ad7e2a..000000000 --- a/src/test/ui/keyword/keyword-true-as-identifier.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - let true = 22; //~ error: mismatched types -} diff --git a/src/test/ui/keyword/keyword-true-as-identifier.stderr b/src/test/ui/keyword/keyword-true-as-identifier.stderr deleted file mode 100644 index 86f6e0006..000000000 --- a/src/test/ui/keyword/keyword-true-as-identifier.stderr +++ /dev/null @@ -1,11 +0,0 @@ -error[E0308]: mismatched types - --> $DIR/keyword-true-as-identifier.rs:2:9 - | -LL | let true = 22; - | ^^^^ -- this expression has type `{integer}` - | | - | expected integer, found `bool` - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0308`. -- cgit v1.2.3