Fixed tests.

Author: Alexander Regueiro

src/librustc_typeck/lib.rs

@@ -150,7 +150,7 @@ fn allow_type_alias_enum_variants<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>,
             if let Def::TyAlias(_) = path.def {
                 let mut err = tcx.sess.struct_span_err(
                     span,
-                    "type alias enum variants are not yet allowed"
+                    "enum variants on type aliases are experimental"
                 );
                 if nightly_options::is_nightly_build() {
                     help!(&mut err,

src/test/ui/feature-gates/feature-gate-type_alias_enum_variants.rs

@@ -17,9 +17,17 @@ type Alias = Foo;
 
 fn main() {
     let t = Alias::Bar(0);
+    //~^ ERROR enum variants on type aliases are experimental
+    //~^^ ERROR no variant named `Bar` found for type `Foo` in the current scope
     let t = Alias::Baz { i: 0 };
+    //~^ ERROR enum variants on type aliases are experimental
+    //~^^ ERROR ambiguous associated type
     match t {
         Alias::Bar(_i) => {}
+        //~^ ERROR enum variants on type aliases are experimental
+        //~^^ ERROR no variant named `Bar` found for type `Foo` in the current scope
         Alias::Baz { i: _i } => {}
+        //~^ ERROR enum variants on type aliases are experimental
+        //~^^ ERROR ambiguous associated type
     }
 }

src/test/ui/feature-gates/feature-gate-type_alias_enum_variants.stderr

@@ -1,4 +1,4 @@
-error: type alias enum variants are not yet allowed
+error: enum variants on type aliases are experimental
   --> $DIR/feature-gate-type_alias_enum_variants.rs:19:13
    |
 LL |     let t = Alias::Bar(0);
@@ -19,30 +19,30 @@ LL |     let t = Alias::Bar(0);
    |
    = help: did you mean `Bar`?
 
-error: type alias enum variants are not yet allowed
-  --> $DIR/feature-gate-type_alias_enum_variants.rs:20:13
+error: enum variants on type aliases are experimental
+  --> $DIR/feature-gate-type_alias_enum_variants.rs:22:13
    |
 LL |     let t = Alias::Baz { i: 0 };
    |             ^^^^^^^^^^
    |
    = help: add `#![feature(type_alias_enum_variants)]` to the crate attributes to enable
 
 error[E0223]: ambiguous associated type
-  --> $DIR/feature-gate-type_alias_enum_variants.rs:20:13
+  --> $DIR/feature-gate-type_alias_enum_variants.rs:22:13
    |
 LL |     let t = Alias::Baz { i: 0 };
    |             ^^^^^^^^^^ help: use fully-qualified syntax: `<Foo as Trait>::Baz`
 
-error: type alias enum variants are not yet allowed
-  --> $DIR/feature-gate-type_alias_enum_variants.rs:22:9
+error: enum variants on type aliases are experimental
+  --> $DIR/feature-gate-type_alias_enum_variants.rs:26:9
    |
 LL |         Alias::Bar(_i) => {}
    |         ^^^^^^^^^^^^^^
    |
    = help: add `#![feature(type_alias_enum_variants)]` to the crate attributes to enable
 
 error[E0599]: no variant named `Bar` found for type `Foo` in the current scope
-  --> $DIR/feature-gate-type_alias_enum_variants.rs:22:16
+  --> $DIR/feature-gate-type_alias_enum_variants.rs:26:16
    |
 LL | enum Foo {
    | -------- variant `Bar` not found here
@@ -52,16 +52,16 @@ LL |         Alias::Bar(_i) => {}
    |
    = help: did you mean `Bar`?
 
-error: type alias enum variants are not yet allowed
-  --> $DIR/feature-gate-type_alias_enum_variants.rs:23:9
+error: enum variants on type aliases are experimental
+  --> $DIR/feature-gate-type_alias_enum_variants.rs:29:9
    |
 LL |         Alias::Baz { i: _i } => {}
    |         ^^^^^^^^^^
    |
    = help: add `#![feature(type_alias_enum_variants)]` to the crate attributes to enable
 
 error[E0223]: ambiguous associated type
-  --> $DIR/feature-gate-type_alias_enum_variants.rs:23:9
+  --> $DIR/feature-gate-type_alias_enum_variants.rs:29:9
    |
 LL |         Alias::Baz { i: _i } => {}
    |         ^^^^^^^^^^ help: use fully-qualified syntax: `<Foo as Trait>::Baz`

src/test/ui/type-alias-enum-variants.rs

@@ -7,4 +7,5 @@ fn main() {
     let _ = Option::None::<u8>; // OK (Lint in future!)
     let _ = Alias::<u8>::None; // OK
     let _ = Alias::None::<u8>; // Error
+    //~^ type parameters are not allowed on this type
 }