Rustup https://github.com/rust-lang/rust/pull/67359

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

diff --git a/tests/ui/mem_discriminant.stderr b/tests/ui/mem_discriminant.stderr
index c445b96a90f6a3913b21230a8e8eb4ff3f5789ff..8d9810970adee1bbe7d8301b15eec78c6d36f6ee 100644 (file)
--- a/tests/ui/mem_discriminant.stderr
+++ b/tests/ui/mem_discriminant.stderr
@@ -1,25 +1,19 @@
-error: calling `mem::discriminant` on non-enum type `&str`
-  --> $DIR/mem_discriminant.rs:23:5
-   |
-LL |     mem::discriminant(&"hello");
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-note: lint level defined here
-  --> $DIR/mem_discriminant.rs:10:9
-   |
-LL | #![deny(clippy::mem_discriminant_non_enum)]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
 error: calling `mem::discriminant` on non-enum type `&std::option::Option<i32>`
-  --> $DIR/mem_discriminant.rs:24:5
+  --> $DIR/mem_discriminant.rs:14:5
    |
 LL |     mem::discriminant(&&Some(2));
    |     ^^^^^^^^^^^^^^^^^^---------^
    |                       |
    |                       help: try dereferencing: `&Some(2)`
+   |
+note: the lint level is defined here
+  --> $DIR/mem_discriminant.rs:3:9
+   |
+LL | #![deny(clippy::mem_discriminant_non_enum)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: calling `mem::discriminant` on non-enum type `&std::option::Option<u8>`
-  --> $DIR/mem_discriminant.rs:25:5
+  --> $DIR/mem_discriminant.rs:15:5
    |
 LL |     mem::discriminant(&&None::<u8>);
    |     ^^^^^^^^^^^^^^^^^^------------^
@@ -27,7 +21,7 @@ LL |     mem::discriminant(&&None::<u8>);
    |                       help: try dereferencing: `&None::<u8>`
 
 error: calling `mem::discriminant` on non-enum type `&Foo`
-  --> $DIR/mem_discriminant.rs:26:5
+  --> $DIR/mem_discriminant.rs:16:5
    |
 LL |     mem::discriminant(&&Foo::One(5));
    |     ^^^^^^^^^^^^^^^^^^-------------^
@@ -35,21 +29,15 @@ LL |     mem::discriminant(&&Foo::One(5));
    |                       help: try dereferencing: `&Foo::One(5)`
 
 error: calling `mem::discriminant` on non-enum type `&Foo`
-  --> $DIR/mem_discriminant.rs:27:5
+  --> $DIR/mem_discriminant.rs:17:5
    |
 LL |     mem::discriminant(&&Foo::Two(5));
    |     ^^^^^^^^^^^^^^^^^^-------------^
    |                       |
    |                       help: try dereferencing: `&Foo::Two(5)`
 
-error: calling `mem::discriminant` on non-enum type `A`
-  --> $DIR/mem_discriminant.rs:28:5
-   |
-LL |     mem::discriminant(&A(Foo::One(0)));
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
 error: calling `mem::discriminant` on non-enum type `&std::option::Option<i32>`
-  --> $DIR/mem_discriminant.rs:32:5
+  --> $DIR/mem_discriminant.rs:21:5
    |
 LL |     mem::discriminant(&ro);
    |     ^^^^^^^^^^^^^^^^^^---^
@@ -57,7 +45,7 @@ LL |     mem::discriminant(&ro);
    |                       help: try dereferencing: `ro`
 
 error: calling `mem::discriminant` on non-enum type `&std::option::Option<i32>`
-  --> $DIR/mem_discriminant.rs:33:5
+  --> $DIR/mem_discriminant.rs:22:5
    |
 LL |     mem::discriminant(rro);
    |     ^^^^^^^^^^^^^^^^^^---^
@@ -65,7 +53,7 @@ LL |     mem::discriminant(rro);
    |                       help: try dereferencing: `*rro`
 
 error: calling `mem::discriminant` on non-enum type `&&std::option::Option<i32>`
-  --> $DIR/mem_discriminant.rs:34:5
+  --> $DIR/mem_discriminant.rs:23:5
    |
 LL |     mem::discriminant(&rro);
    |     ^^^^^^^^^^^^^^^^^^----^
@@ -73,7 +61,7 @@ LL |     mem::discriminant(&rro);
    |                       help: try dereferencing: `*rro`
 
 error: calling `mem::discriminant` on non-enum type `&&std::option::Option<i32>`
-  --> $DIR/mem_discriminant.rs:38:13
+  --> $DIR/mem_discriminant.rs:27:13
    |
 LL |             mem::discriminant($param)
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -83,9 +71,11 @@ LL |     mem_discriminant_but_in_a_macro!(&rro);
    |     |                                |
    |     |                                help: try dereferencing: `*rro`
    |     in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: calling `mem::discriminant` on non-enum type `&&&&&std::option::Option<i32>`
-  --> $DIR/mem_discriminant.rs:45:5
+  --> $DIR/mem_discriminant.rs:34:5
    |
 LL |     mem::discriminant(&rrrrro);
    |     ^^^^^^^^^^^^^^^^^^-------^
@@ -93,12 +83,12 @@ LL |     mem::discriminant(&rrrrro);
    |                       help: try dereferencing: `****rrrrro`
 
 error: calling `mem::discriminant` on non-enum type `&&&std::option::Option<i32>`
-  --> $DIR/mem_discriminant.rs:46:5
+  --> $DIR/mem_discriminant.rs:35:5
    |
 LL |     mem::discriminant(*rrrrro);
    |     ^^^^^^^^^^^^^^^^^^-------^
    |                       |
    |                       help: try dereferencing: `****rrrrro`
 
-error: aborting due to 12 previous errors
+error: aborting due to 10 previous errors