about summary refs log tree commit diff
diff options
context:
space:
mode:
authorr0cky <mu001999@outlook.com>2023-08-15 10:58:33 +0000
committerr0cky <mu001999@outlook.com>2023-08-15 10:58:33 +0000
commit860fc246088c349bd95ce2da3e8637bb0c590105 (patch)
tree6c3e048e3484ccb6347526564d9ed710dcecea94
parentb1ddd57b5c0d306c02d06fbf8c3750f1c5a16d3c (diff)
downloadrust-860fc246088c349bd95ce2da3e8637bb0c590105.tar.gz
rust-860fc246088c349bd95ce2da3e8637bb0c590105.zip
Remove extra errors
-rw-r--r--tests/ui/suggestions/issue-114701.rs4
-rw-r--r--tests/ui/suggestions/issue-114701.stderr41
2 files changed, 6 insertions, 39 deletions
diff --git a/tests/ui/suggestions/issue-114701.rs b/tests/ui/suggestions/issue-114701.rs
index 09d573f054b..81d7803ec8c 100644
--- a/tests/ui/suggestions/issue-114701.rs
+++ b/tests/ui/suggestions/issue-114701.rs
@@ -1,11 +1,11 @@
-enum Enum<T> { , SVariant { v: T }, UVariant } //~ ERROR expected identifier, found `,`
+enum Enum<T> { SVariant { v: T }, UVariant }
 
 macro_rules! is_variant {
     (TSVariant, ) => (!);
     (SVariant, ) => (!);
     (UVariant, $expr:expr) => (is_variant!(@check UVariant, {}, $expr));
     (@check $variant:ident, $matcher:tt, $expr:expr) => (
-        assert!(if let Enum::$variant::<()> $matcher = $expr () else { false }, //~ ERROR this `if` expression
+        assert!(if let Enum::$variant::<()> $matcher = $expr () { true } else { false },
                 );
     );
 }
diff --git a/tests/ui/suggestions/issue-114701.stderr b/tests/ui/suggestions/issue-114701.stderr
index bccc98e0608..67462a09c78 100644
--- a/tests/ui/suggestions/issue-114701.stderr
+++ b/tests/ui/suggestions/issue-114701.stderr
@@ -1,48 +1,15 @@
-error: expected identifier, found `,`
-  --> $DIR/issue-114701.rs:1:16
-   |
-LL | enum Enum<T> { , SVariant { v: T }, UVariant }
-   |                ^
-   |                |
-   |                expected identifier
-   |                help: remove this comma
-
-error: this `if` expression is missing a block after the condition
-  --> $DIR/issue-114701.rs:8:17
-   |
-LL |         assert!(if let Enum::$variant::<()> $matcher = $expr () else { false },
-   |                 ^^
-...
-LL |     is_variant!(UVariant, Enum::<()>::UVariant);
-   |     ------------------------------------------- in this macro invocation
-   |
-help: add a block here
-  --> $DIR/issue-114701.rs:8:64
-   |
-LL |         assert!(if let Enum::$variant::<()> $matcher = $expr () else { false },
-   |                                                                ^
-...
-LL |     is_variant!(UVariant, Enum::<()>::UVariant);
-   |     ------------------------------------------- in this macro invocation
-   = note: this error originates in the macro `is_variant` (in Nightly builds, run with -Z macro-backtrace for more info)
-help: remove the `if` if you meant to write a `let...else` statement
-   |
-LL -         assert!(if let Enum::$variant::<()> $matcher = $expr () else { false },
-LL +         assert!(let Enum::$variant::<()> $matcher = $expr () else { false },
-   |
-
 error[E0618]: expected function, found `Enum<()>`
   --> $DIR/issue-114701.rs:14:27
    |
-LL | enum Enum<T> { , SVariant { v: T }, UVariant }
-   |                                     -------- `Enum::UVariant` defined here
+LL | enum Enum<T> { SVariant { v: T }, UVariant }
+   |                                   -------- `Enum::UVariant` defined here
 ...
-LL |         assert!(if let Enum::$variant::<()> $matcher = $expr () else { false },
+LL |         assert!(if let Enum::$variant::<()> $matcher = $expr () { true } else { false },
    |                                                        -------- call expression requires function
 ...
 LL |     is_variant!(UVariant, Enum::<()>::UVariant);
    |                           ^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 3 previous errors
+error: aborting due to previous error
 
 For more information about this error, try `rustc --explain E0618`.