about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-06-16 22:00:49 +0200
committerMazdak Farrokhzad <twingoow@gmail.com>2019-06-16 22:00:49 +0200
commit57e6869a6be56cd75e382deb313fb5f4d1bb1fda (patch)
treea3d426ade77821f4d83f0be027c47426430db1ae /src
parent46f405ec4d7c6bf16fc2eaafe7541019f1da2996 (diff)
downloadrust-57e6869a6be56cd75e382deb313fb5f4d1bb1fda.tar.gz
rust-57e6869a6be56cd75e382deb313fb5f4d1bb1fda.zip
type_alias_enum_variants: cleanup redundant 'allow(unused)'.
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/type-alias-enum-variants/enum-variant-generic-args-pass.rs1
-rw-r--r--src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.rs2
-rw-r--r--src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.stderr10
3 files changed, 5 insertions, 8 deletions
diff --git a/src/test/ui/type-alias-enum-variants/enum-variant-generic-args-pass.rs b/src/test/ui/type-alias-enum-variants/enum-variant-generic-args-pass.rs
index af05dd1b715..0c212096f92 100644
--- a/src/test/ui/type-alias-enum-variants/enum-variant-generic-args-pass.rs
+++ b/src/test/ui/type-alias-enum-variants/enum-variant-generic-args-pass.rs
@@ -9,7 +9,6 @@
 
 #![allow(irrefutable_let_patterns)]
 
-#[allow(dead_code)]
 enum Enum<T> { TSVariant(T), SVariant { v: T }, UVariant }
 type Alias<T> = Enum<T>;
 type AliasFixed = Enum<()>;
diff --git a/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.rs b/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.rs
index f474c078ba4..ce45d59198a 100644
--- a/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.rs
+++ b/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.rs
@@ -3,8 +3,6 @@
 // Check that creating/matching on an enum variant through an alias with
 // the wrong braced/unit form is caught as an error.
 
-#![allow(unreachable_code)]
-
 enum Enum { Braced {}, Unit, Tuple() }
 type Alias = Enum;
 
diff --git a/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.stderr b/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.stderr
index 1ee00a0d22d..c1ea816b7fa 100644
--- a/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.stderr
+++ b/src/test/ui/type-alias-enum-variants/incorrect-variant-form-through-alias-caught.stderr
@@ -1,23 +1,23 @@
 error[E0533]: expected unit struct/variant or constant, found struct variant `<Alias>::Braced`
-  --> $DIR/incorrect-variant-form-through-alias-caught.rs:12:5
+  --> $DIR/incorrect-variant-form-through-alias-caught.rs:10:5
    |
 LL |     Alias::Braced;
    |     ^^^^^^^^^^^^^
 
 error[E0533]: expected unit struct/variant or constant, found struct variant `<Alias>::Braced`
-  --> $DIR/incorrect-variant-form-through-alias-caught.rs:14:9
+  --> $DIR/incorrect-variant-form-through-alias-caught.rs:12:9
    |
 LL |     let Alias::Braced = panic!();
    |         ^^^^^^^^^^^^^
 
 error[E0164]: expected tuple struct/variant, found struct variant `<Alias>::Braced`
-  --> $DIR/incorrect-variant-form-through-alias-caught.rs:16:9
+  --> $DIR/incorrect-variant-form-through-alias-caught.rs:14:9
    |
 LL |     let Alias::Braced(..) = panic!();
    |         ^^^^^^^^^^^^^^^^^ not a tuple variant or struct
 
 error[E0618]: expected function, found enum variant `<Alias>::Unit`
-  --> $DIR/incorrect-variant-form-through-alias-caught.rs:19:5
+  --> $DIR/incorrect-variant-form-through-alias-caught.rs:17:5
    |
 LL | enum Enum { Braced {}, Unit, Tuple() }
    |                        ---- `<Alias>::Unit` defined here
@@ -32,7 +32,7 @@ LL |     <Alias>::Unit;
    |     ^^^^^^^^^^^^^
 
 error[E0164]: expected tuple struct/variant, found unit variant `<Alias>::Unit`
-  --> $DIR/incorrect-variant-form-through-alias-caught.rs:21:9
+  --> $DIR/incorrect-variant-form-through-alias-caught.rs:19:9
    |
 LL |     let Alias::Unit() = panic!();
    |         ^^^^^^^^^^^^^ not a tuple variant or struct