Auto merge of #4478 - tsurai:master, r=flip1995

[rust.git] / tests / ui / enum_variants.stderr

diff --git a/tests/ui/enum_variants.stderr b/tests/ui/enum_variants.stderr
index 876c4e827dc6480ccbf0956b0b83f8147463e3d4..2835391de7f5838a7013ff98feb3357826c03df7 100644 (file)
--- a/tests/ui/enum_variants.stderr
+++ b/tests/ui/enum_variants.stderr
@@ -1,120 +1,100 @@
 error: Variant name ends with the enum's name
-  --> $DIR/enum_variants.rs:14:5
+  --> $DIR/enum_variants.rs:16:5
    |
-14 |     cFoo,
+LL |     cFoo,
    |     ^^^^
    |
-   = note: #[deny(enum_variant_names)] implied by #[deny(clippy)]
-note: lint level defined here
-  --> $DIR/enum_variants.rs:3:9
-   |
-3  | #![deny(clippy, pub_enum_variant_names)]
-   |         ^^^^^^
+   = note: `-D clippy::enum-variant-names` implied by `-D warnings`
 
 error: Variant name starts with the enum's name
-  --> $DIR/enum_variants.rs:25:5
+  --> $DIR/enum_variants.rs:27:5
    |
-25 |     FoodGood,
+LL |     FoodGood,
    |     ^^^^^^^^
-   |
-   = note: #[deny(enum_variant_names)] implied by #[deny(clippy)]
 
 error: Variant name starts with the enum's name
-  --> $DIR/enum_variants.rs:26:5
+  --> $DIR/enum_variants.rs:28:5
    |
-26 |     FoodMiddle,
+LL |     FoodMiddle,
    |     ^^^^^^^^^^
-   |
-   = note: #[deny(enum_variant_names)] implied by #[deny(clippy)]
 
 error: Variant name starts with the enum's name
-  --> $DIR/enum_variants.rs:27:5
+  --> $DIR/enum_variants.rs:29:5
    |
-27 |     FoodBad,
+LL |     FoodBad,
    |     ^^^^^^^
-   |
-   = note: #[deny(enum_variant_names)] implied by #[deny(clippy)]
 
 error: All variants have the same prefix: `Food`
-  --> $DIR/enum_variants.rs:24:1
+  --> $DIR/enum_variants.rs:26:1
    |
-24 | / enum Food {
-25 | |     FoodGood,
-26 | |     FoodMiddle,
-27 | |     FoodBad,
-28 | | }
+LL | / enum Food {
+LL | |     FoodGood,
+LL | |     FoodMiddle,
+LL | |     FoodBad,
+LL | | }
    | |_^
    |
-   = note: #[deny(enum_variant_names)] implied by #[deny(clippy)]
    = help: remove the prefixes and use full paths to the variants instead of glob imports
 
 error: All variants have the same prefix: `CallType`
-  --> $DIR/enum_variants.rs:34:1
+  --> $DIR/enum_variants.rs:36:1
    |
-34 | / enum BadCallType {
-35 | |     CallTypeCall,
-36 | |     CallTypeCreate,
-37 | |     CallTypeDestroy,
-38 | | }
+LL | / enum BadCallType {
+LL | |     CallTypeCall,
+LL | |     CallTypeCreate,
+LL | |     CallTypeDestroy,
+LL | | }
    | |_^
    |
-   = note: #[deny(enum_variant_names)] implied by #[deny(clippy)]
    = help: remove the prefixes and use full paths to the variants instead of glob imports
 
 error: All variants have the same prefix: `Constant`
-  --> $DIR/enum_variants.rs:45:1
+  --> $DIR/enum_variants.rs:48:1
    |
-45 | / enum Consts {
-46 | |     ConstantInt,
-47 | |     ConstantCake,
-48 | |     ConstantLie,
-49 | | }
+LL | / enum Consts {
+LL | |     ConstantInt,
+LL | |     ConstantCake,
+LL | |     ConstantLie,
+LL | | }
    | |_^
    |
-   = note: #[deny(enum_variant_names)] implied by #[deny(clippy)]
    = help: remove the prefixes and use full paths to the variants instead of glob imports
 
 error: All variants have the same prefix: `With`
-  --> $DIR/enum_variants.rs:78:1
+  --> $DIR/enum_variants.rs:82:1
    |
-78 | / enum Seallll {
-79 | |     WithOutCake,
-80 | |     WithOutTea,
-81 | |     WithOut,
-82 | | }
+LL | / enum Seallll {
+LL | |     WithOutCake,
+LL | |     WithOutTea,
+LL | |     WithOut,
+LL | | }
    | |_^
    |
-   = note: #[deny(enum_variant_names)] implied by #[deny(clippy)]
    = help: remove the prefixes and use full paths to the variants instead of glob imports
 
 error: All variants have the same prefix: `Prefix`
-  --> $DIR/enum_variants.rs:84:1
+  --> $DIR/enum_variants.rs:88:1
    |
-84 | / enum NonCaps {
-85 | |     Prefix的,
-86 | |     PrefixTea,
-87 | |     PrefixCake,
-88 | | }
+LL | / enum NonCaps {
+LL | |     Prefix的,
+LL | |     PrefixTea,
+LL | |     PrefixCake,
+LL | | }
    | |_^
    |
-   = note: #[deny(enum_variant_names)] implied by #[deny(clippy)]
    = help: remove the prefixes and use full paths to the variants instead of glob imports
 
 error: All variants have the same prefix: `With`
-  --> $DIR/enum_variants.rs:90:1
+  --> $DIR/enum_variants.rs:94:1
    |
-90 | / pub enum PubSeall {
-91 | |     WithOutCake,
-92 | |     WithOutTea,
-93 | |     WithOut,
-94 | | }
+LL | / pub enum PubSeall {
+LL | |     WithOutCake,
+LL | |     WithOutTea,
+LL | |     WithOut,
+LL | | }
    | |_^
    |
-note: lint level defined here
-  --> $DIR/enum_variants.rs:3:17
-   |
-3  | #![deny(clippy, pub_enum_variant_names)]
-   |                 ^^^^^^^^^^^^^^^^^^^^^^
+   = note: `-D clippy::pub-enum-variant-names` implied by `-D warnings`
    = help: remove the prefixes and use full paths to the variants instead of glob imports
 
 error: aborting due to 10 previous errors