about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/test/ui/type-alias-enum-variants/enum-variant-generic-args-pats-pass.rs (renamed from src/test/ui/pattern/enum-variant-generic-args.rs)2
-rw-r--r--src/test/ui/type-alias-enum-variants/enum-variant-generic-args.rs (renamed from src/test/ui/enum-variant-generic-args.rs)2
-rw-r--r--src/test/ui/type-alias-enum-variants/enum-variant-generic-args.stderr (renamed from src/test/ui/enum-variant-generic-args.stderr)56
-rw-r--r--src/test/ui/type-alias-enum-variants/issue-57866.rs (renamed from src/test/ui/issues/issue-57866.rs)2
-rw-r--r--src/test/ui/type-alias-enum-variants/issue-58006.rs (renamed from src/test/ui/issues/issue-58006.rs)1
-rw-r--r--src/test/ui/type-alias-enum-variants/issue-58006.stderr (renamed from src/test/ui/issues/issue-58006.stderr)2
-rw-r--r--src/test/ui/type-alias-enum-variants/issue-61801-path-pattern-can-infer.rs2
-rw-r--r--src/test/ui/type-alias-enum-variants/type-alias-enum-variants-panic.rs (renamed from src/test/ui/type-alias-enum-variants-panic.rs)2
-rw-r--r--src/test/ui/type-alias-enum-variants/type-alias-enum-variants-panic.stderr (renamed from src/test/ui/type-alias-enum-variants-panic.stderr)6
-rw-r--r--src/test/ui/type-alias-enum-variants/type-alias-enum-variants-pass-2.rs (renamed from src/test/run-pass/type-alias-enum-variants-2.rs)2
-rw-r--r--src/test/ui/type-alias-enum-variants/type-alias-enum-variants-pass.rs (renamed from src/test/run-pass/type-alias-enum-variants.rs)2
-rw-r--r--src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority-2.rs (renamed from src/test/ui/type-alias-enum-variants-priority-2.rs)2
-rw-r--r--src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority-2.stderr (renamed from src/test/ui/type-alias-enum-variants-priority-2.stderr)2
-rw-r--r--src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority-3.rs (renamed from src/test/ui/type-alias-enum-variants-priority-3.rs)2
-rw-r--r--src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority-3.stderr (renamed from src/test/ui/type-alias-enum-variants-priority-3.stderr)2
-rw-r--r--src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority.rs (renamed from src/test/ui/type-alias-enum-variants-priority.rs)2
-rw-r--r--src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority.stderr (renamed from src/test/ui/type-alias-enum-variants-priority.stderr)6
-rw-r--r--src/test/ui/type-alias-enum-variants/type-alias-enum-variants.rs (renamed from src/test/ui/type-alias-enum-variants.rs)2
-rw-r--r--src/test/ui/type-alias-enum-variants/type-alias-enum-variants.stderr (renamed from src/test/ui/type-alias-enum-variants.stderr)2
19 files changed, 40 insertions, 59 deletions
diff --git a/src/test/ui/pattern/enum-variant-generic-args.rs b/src/test/ui/type-alias-enum-variants/enum-variant-generic-args-pats-pass.rs
index 85599530ea6..faef1fab879 100644
--- a/src/test/ui/pattern/enum-variant-generic-args.rs
+++ b/src/test/ui/type-alias-enum-variants/enum-variant-generic-args-pats-pass.rs
@@ -1,7 +1,5 @@
 // run-pass
 
-#![feature(type_alias_enum_variants)]
-
 #![allow(irrefutable_let_patterns)]
 
 #[allow(dead_code)]
diff --git a/src/test/ui/enum-variant-generic-args.rs b/src/test/ui/type-alias-enum-variants/enum-variant-generic-args.rs
index dd1f5f334df..c22a9c4ecaa 100644
--- a/src/test/ui/enum-variant-generic-args.rs
+++ b/src/test/ui/type-alias-enum-variants/enum-variant-generic-args.rs
@@ -1,5 +1,3 @@
-#![feature(type_alias_enum_variants)]
-
 enum Enum<T> { TSVariant(T), SVariant { v: T } }
 type Alias<T> = Enum<T>;
 type AliasFixed = Enum<()>;
diff --git a/src/test/ui/enum-variant-generic-args.stderr b/src/test/ui/type-alias-enum-variants/enum-variant-generic-args.stderr
index 97b111a5c85..d3a2e8635e3 100644
--- a/src/test/ui/enum-variant-generic-args.stderr
+++ b/src/test/ui/type-alias-enum-variants/enum-variant-generic-args.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/enum-variant-generic-args.rs:9:25
+  --> $DIR/enum-variant-generic-args.rs:7:25
    |
 LL |         Self::TSVariant(());
    |                         ^^ expected type parameter, found ()
@@ -8,19 +8,19 @@ LL |         Self::TSVariant(());
               found type `()`
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:11:27
+  --> $DIR/enum-variant-generic-args.rs:9:27
    |
 LL |         Self::TSVariant::<()>(());
    |                           ^^ type argument not allowed
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:13:16
+  --> $DIR/enum-variant-generic-args.rs:11:16
    |
 LL |         Self::<()>::TSVariant(());
    |                ^^ type argument not allowed
 
 error[E0308]: mismatched types
-  --> $DIR/enum-variant-generic-args.rs:13:31
+  --> $DIR/enum-variant-generic-args.rs:11:31
    |
 LL |         Self::<()>::TSVariant(());
    |                               ^^ expected type parameter, found ()
@@ -29,19 +29,19 @@ LL |         Self::<()>::TSVariant(());
               found type `()`
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:16:16
+  --> $DIR/enum-variant-generic-args.rs:14:16
    |
 LL |         Self::<()>::TSVariant::<()>(());
    |                ^^ type argument not allowed
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:16:33
+  --> $DIR/enum-variant-generic-args.rs:14:33
    |
 LL |         Self::<()>::TSVariant::<()>(());
    |                                 ^^ type argument not allowed
 
 error[E0308]: mismatched types
-  --> $DIR/enum-variant-generic-args.rs:22:29
+  --> $DIR/enum-variant-generic-args.rs:20:29
    |
 LL |         Self::SVariant { v: () };
    |                             ^^ expected type parameter, found ()
@@ -50,13 +50,13 @@ LL |         Self::SVariant { v: () };
               found type `()`
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:24:26
+  --> $DIR/enum-variant-generic-args.rs:22:26
    |
 LL |         Self::SVariant::<()> { v: () };
    |                          ^^ type argument not allowed
 
 error[E0308]: mismatched types
-  --> $DIR/enum-variant-generic-args.rs:24:35
+  --> $DIR/enum-variant-generic-args.rs:22:35
    |
 LL |         Self::SVariant::<()> { v: () };
    |                                   ^^ expected type parameter, found ()
@@ -65,13 +65,13 @@ LL |         Self::SVariant::<()> { v: () };
               found type `()`
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:27:16
+  --> $DIR/enum-variant-generic-args.rs:25:16
    |
 LL |         Self::<()>::SVariant { v: () };
    |                ^^ type argument not allowed
 
 error[E0308]: mismatched types
-  --> $DIR/enum-variant-generic-args.rs:27:35
+  --> $DIR/enum-variant-generic-args.rs:25:35
    |
 LL |         Self::<()>::SVariant { v: () };
    |                                   ^^ expected type parameter, found ()
@@ -80,19 +80,19 @@ LL |         Self::<()>::SVariant { v: () };
               found type `()`
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:30:16
+  --> $DIR/enum-variant-generic-args.rs:28:16
    |
 LL |         Self::<()>::SVariant::<()> { v: () };
    |                ^^ type argument not allowed
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:30:32
+  --> $DIR/enum-variant-generic-args.rs:28:32
    |
 LL |         Self::<()>::SVariant::<()> { v: () };
    |                                ^^ type argument not allowed
 
 error[E0308]: mismatched types
-  --> $DIR/enum-variant-generic-args.rs:30:41
+  --> $DIR/enum-variant-generic-args.rs:28:41
    |
 LL |         Self::<()>::SVariant::<()> { v: () };
    |                                         ^^ expected type parameter, found ()
@@ -101,85 +101,85 @@ LL |         Self::<()>::SVariant::<()> { v: () };
               found type `()`
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:40:29
+  --> $DIR/enum-variant-generic-args.rs:38:29
    |
 LL |     Enum::<()>::TSVariant::<()>(());
    |                             ^^ type argument not allowed
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:43:24
+  --> $DIR/enum-variant-generic-args.rs:41:24
    |
 LL |     Alias::TSVariant::<()>(());
    |                        ^^ type argument not allowed
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:45:30
+  --> $DIR/enum-variant-generic-args.rs:43:30
    |
 LL |     Alias::<()>::TSVariant::<()>(());
    |                              ^^ type argument not allowed
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:48:29
+  --> $DIR/enum-variant-generic-args.rs:46:29
    |
 LL |     AliasFixed::TSVariant::<()>(());
    |                             ^^ type argument not allowed
 
 error[E0107]: wrong number of type arguments: expected 0, found 1
-  --> $DIR/enum-variant-generic-args.rs:50:18
+  --> $DIR/enum-variant-generic-args.rs:48:18
    |
 LL |     AliasFixed::<()>::TSVariant(());
    |                  ^^ unexpected type argument
 
 error[E0107]: wrong number of type arguments: expected 0, found 1
-  --> $DIR/enum-variant-generic-args.rs:52:18
+  --> $DIR/enum-variant-generic-args.rs:50:18
    |
 LL |     AliasFixed::<()>::TSVariant::<()>(());
    |                  ^^ unexpected type argument
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:52:35
+  --> $DIR/enum-variant-generic-args.rs:50:35
    |
 LL |     AliasFixed::<()>::TSVariant::<()>(());
    |                                   ^^ type argument not allowed
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:58:28
+  --> $DIR/enum-variant-generic-args.rs:56:28
    |
 LL |     Enum::<()>::SVariant::<()> { v: () };
    |                            ^^ type argument not allowed
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:61:23
+  --> $DIR/enum-variant-generic-args.rs:59:23
    |
 LL |     Alias::SVariant::<()> { v: () };
    |                       ^^ type argument not allowed
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:63:29
+  --> $DIR/enum-variant-generic-args.rs:61:29
    |
 LL |     Alias::<()>::SVariant::<()> { v: () };
    |                             ^^ type argument not allowed
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:66:28
+  --> $DIR/enum-variant-generic-args.rs:64:28
    |
 LL |     AliasFixed::SVariant::<()> { v: () };
    |                            ^^ type argument not allowed
 
 error[E0107]: wrong number of type arguments: expected 0, found 1
-  --> $DIR/enum-variant-generic-args.rs:68:18
+  --> $DIR/enum-variant-generic-args.rs:66:18
    |
 LL |     AliasFixed::<()>::SVariant { v: () };
    |                  ^^ unexpected type argument
 
 error[E0107]: wrong number of type arguments: expected 0, found 1
-  --> $DIR/enum-variant-generic-args.rs:70:18
+  --> $DIR/enum-variant-generic-args.rs:68:18
    |
 LL |     AliasFixed::<()>::SVariant::<()> { v: () };
    |                  ^^ unexpected type argument
 
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/enum-variant-generic-args.rs:70:34
+  --> $DIR/enum-variant-generic-args.rs:68:34
    |
 LL |     AliasFixed::<()>::SVariant::<()> { v: () };
    |                                  ^^ type argument not allowed
diff --git a/src/test/ui/issues/issue-57866.rs b/src/test/ui/type-alias-enum-variants/issue-57866.rs
index 77c50e53868..fa351ed51dd 100644
--- a/src/test/ui/issues/issue-57866.rs
+++ b/src/test/ui/type-alias-enum-variants/issue-57866.rs
@@ -1,7 +1,5 @@
 // compile-pass
 
-#![feature(type_alias_enum_variants)]
-
 enum Outer<T> {
     A(T)
 }
diff --git a/src/test/ui/issues/issue-58006.rs b/src/test/ui/type-alias-enum-variants/issue-58006.rs
index 1fb5fefa759..c1e56fc4caa 100644
--- a/src/test/ui/issues/issue-58006.rs
+++ b/src/test/ui/type-alias-enum-variants/issue-58006.rs
@@ -1,4 +1,3 @@
-#![feature(type_alias_enum_variants)]
 pub enum Enum {
     A(usize),
 }
diff --git a/src/test/ui/issues/issue-58006.stderr b/src/test/ui/type-alias-enum-variants/issue-58006.stderr
index c34e133c6c4..dc606957d63 100644
--- a/src/test/ui/issues/issue-58006.stderr
+++ b/src/test/ui/type-alias-enum-variants/issue-58006.stderr
@@ -1,5 +1,5 @@
 error[E0533]: expected unit struct/variant or constant, found tuple variant `<Self>::A`
-  --> $DIR/issue-58006.rs:9:13
+  --> $DIR/issue-58006.rs:8:13
    |
 LL |             Self::A => (),
    |             ^^^^^^^
diff --git a/src/test/ui/type-alias-enum-variants/issue-61801-path-pattern-can-infer.rs b/src/test/ui/type-alias-enum-variants/issue-61801-path-pattern-can-infer.rs
index 21be61acb0c..dfc618b1649 100644
--- a/src/test/ui/type-alias-enum-variants/issue-61801-path-pattern-can-infer.rs
+++ b/src/test/ui/type-alias-enum-variants/issue-61801-path-pattern-can-infer.rs
@@ -3,8 +3,6 @@
 
 // compile-pass
 
-#![feature(type_alias_enum_variants)]
-
 enum Opt<T> {
     N,
     S(T),
diff --git a/src/test/ui/type-alias-enum-variants-panic.rs b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-panic.rs
index f97592f5d3b..c75fe6a8fd9 100644
--- a/src/test/ui/type-alias-enum-variants-panic.rs
+++ b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-panic.rs
@@ -1,7 +1,5 @@
 // ignore-tidy-linelength
 
-#![feature(type_alias_enum_variants)]
-
 #![allow(unreachable_code)]
 
 enum Enum { Variant {} }
diff --git a/src/test/ui/type-alias-enum-variants-panic.stderr b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-panic.stderr
index 24cf85f5278..7a17596cd4a 100644
--- a/src/test/ui/type-alias-enum-variants-panic.stderr
+++ b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-panic.stderr
@@ -1,17 +1,17 @@
 error[E0533]: expected unit struct/variant or constant, found struct variant `<Alias>::Variant`
-  --> $DIR/type-alias-enum-variants-panic.rs:11:5
+  --> $DIR/type-alias-enum-variants-panic.rs:9:5
    |
 LL |     Alias::Variant;
    |     ^^^^^^^^^^^^^^
 
 error[E0533]: expected unit struct/variant or constant, found struct variant `<Alias>::Variant`
-  --> $DIR/type-alias-enum-variants-panic.rs:13:9
+  --> $DIR/type-alias-enum-variants-panic.rs:11:9
    |
 LL |     let Alias::Variant = panic!();
    |         ^^^^^^^^^^^^^^
 
 error[E0164]: expected tuple struct/variant, found struct variant `<Alias>::Variant`
-  --> $DIR/type-alias-enum-variants-panic.rs:15:9
+  --> $DIR/type-alias-enum-variants-panic.rs:13:9
    |
 LL |     let Alias::Variant(..) = panic!();
    |         ^^^^^^^^^^^^^^^^^^ not a tuple variant or struct
diff --git a/src/test/run-pass/type-alias-enum-variants-2.rs b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-pass-2.rs
index 0cf413babcb..00b787be3bc 100644
--- a/src/test/run-pass/type-alias-enum-variants-2.rs
+++ b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-pass-2.rs
@@ -1,4 +1,4 @@
-#![feature(type_alias_enum_variants)]
+// run-pass
 
 #[derive(Debug, PartialEq, Eq)]
 enum Foo {
diff --git a/src/test/run-pass/type-alias-enum-variants.rs b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-pass.rs
index 0cf413babcb..00b787be3bc 100644
--- a/src/test/run-pass/type-alias-enum-variants.rs
+++ b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-pass.rs
@@ -1,4 +1,4 @@
-#![feature(type_alias_enum_variants)]
+// run-pass
 
 #[derive(Debug, PartialEq, Eq)]
 enum Foo {
diff --git a/src/test/ui/type-alias-enum-variants-priority-2.rs b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority-2.rs
index 295f8acf62f..e7719dc7155 100644
--- a/src/test/ui/type-alias-enum-variants-priority-2.rs
+++ b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority-2.rs
@@ -1,5 +1,3 @@
-#![feature(type_alias_enum_variants)]
-
 enum E {
     V(u8)
 }
diff --git a/src/test/ui/type-alias-enum-variants-priority-2.stderr b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority-2.stderr
index 10a4b44084a..a6300a3323d 100644
--- a/src/test/ui/type-alias-enum-variants-priority-2.stderr
+++ b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority-2.stderr
@@ -1,5 +1,5 @@
 error[E0061]: this function takes 1 parameter but 0 parameters were supplied
-  --> $DIR/type-alias-enum-variants-priority-2.rs:12:5
+  --> $DIR/type-alias-enum-variants-priority-2.rs:10:5
    |
 LL |     V(u8)
    |     ----- defined here
diff --git a/src/test/ui/type-alias-enum-variants-priority-3.rs b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority-3.rs
index 33f96553b57..ff0bfee1ecc 100644
--- a/src/test/ui/type-alias-enum-variants-priority-3.rs
+++ b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority-3.rs
@@ -1,5 +1,3 @@
-#![feature(type_alias_enum_variants)]
-
 enum E {
     V
 }
diff --git a/src/test/ui/type-alias-enum-variants-priority-3.stderr b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority-3.stderr
index b3451542a25..f179fd82d75 100644
--- a/src/test/ui/type-alias-enum-variants-priority-3.stderr
+++ b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority-3.stderr
@@ -1,5 +1,5 @@
 error: expected type, found variant `V`
-  --> $DIR/type-alias-enum-variants-priority-3.rs:7:15
+  --> $DIR/type-alias-enum-variants-priority-3.rs:5:15
    |
 LL | fn check() -> <E>::V {}
    |               ^^^^^^
diff --git a/src/test/ui/type-alias-enum-variants-priority.rs b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority.rs
index 82cd21b09d3..229046cc5cd 100644
--- a/src/test/ui/type-alias-enum-variants-priority.rs
+++ b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority.rs
@@ -1,5 +1,3 @@
-#![feature(type_alias_enum_variants)]
-
 enum E {
     V
 }
diff --git a/src/test/ui/type-alias-enum-variants-priority.stderr b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority.stderr
index b8271807b83..df75cbc6b2b 100644
--- a/src/test/ui/type-alias-enum-variants-priority.stderr
+++ b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants-priority.stderr
@@ -1,5 +1,5 @@
 error: ambiguous associated item
-  --> $DIR/type-alias-enum-variants-priority.rs:14:15
+  --> $DIR/type-alias-enum-variants-priority.rs:12:15
    |
 LL |     fn f() -> Self::V { 0 }
    |               ^^^^^^^ help: use fully-qualified syntax: `<E as Trait>::V`
@@ -8,12 +8,12 @@ LL |     fn f() -> Self::V { 0 }
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #57644 <https://github.com/rust-lang/rust/issues/57644>
 note: `V` could refer to variant defined here
-  --> $DIR/type-alias-enum-variants-priority.rs:4:5
+  --> $DIR/type-alias-enum-variants-priority.rs:2:5
    |
 LL |     V
    |     ^
 note: `V` could also refer to associated type defined here
-  --> $DIR/type-alias-enum-variants-priority.rs:8:5
+  --> $DIR/type-alias-enum-variants-priority.rs:6:5
    |
 LL |     type V;
    |     ^^^^^^^
diff --git a/src/test/ui/type-alias-enum-variants.rs b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants.rs
index c5974e55692..8fe9695aa59 100644
--- a/src/test/ui/type-alias-enum-variants.rs
+++ b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants.rs
@@ -1,5 +1,3 @@
-#![feature(type_alias_enum_variants)]
-
 type Alias<T> = Option<T>;
 
 fn main() {
diff --git a/src/test/ui/type-alias-enum-variants.stderr b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants.stderr
index 55f250fa7ee..0a03166b3b6 100644
--- a/src/test/ui/type-alias-enum-variants.stderr
+++ b/src/test/ui/type-alias-enum-variants/type-alias-enum-variants.stderr
@@ -1,5 +1,5 @@
 error[E0109]: type arguments are not allowed for this type
-  --> $DIR/type-alias-enum-variants.rs:9:27
+  --> $DIR/type-alias-enum-variants.rs:7:27
    |
 LL |     let _ = Alias::None::<u8>; // Error
    |                           ^^ type argument not allowed