deduplicate warnings

Author: RalfJung

src/librustc_mir/transform/check_consts/validation.rs

@@ -253,7 +253,7 @@ impl Validator<'mir, 'tcx> {
         let is_unleashable = O::IS_SUPPORTED_IN_MIRI;
 
         if is_unleashable && self.tcx.sess.opts.debugging_opts.unleash_the_miri_inside_of_you {
-            self.tcx.sess.span_warn(span, "skipping const checks");
+            self.tcx.sess.span_warn(self.tcx.def_span(self.def_id), "skipping const checks");
             return;
         }
 

src/test/ui/consts/const-eval/const_fn_ptr.rs

@@ -8,16 +8,16 @@ const fn double_const(x: usize) -> usize { x * 2 }
 const X: fn(usize) -> usize = double;
 const X_CONST: fn(usize) -> usize = double_const;
 
-const fn bar(x: usize) -> usize {
-    X(x) //~ WARNING skipping const checks
+const fn bar(x: usize) -> usize { //~ WARNING skipping const checks
+    X(x)
 }
 
-const fn bar_const(x: usize) -> usize {
-    X_CONST(x) //~ WARNING skipping const checks
+const fn bar_const(x: usize) -> usize { //~ WARNING skipping const checks
+    X_CONST(x)
 }
 
-const fn foo(x: fn(usize) -> usize, y: usize)  -> usize {
-    x(y) //~ WARNING skipping const checks
+const fn foo(x: fn(usize) -> usize, y: usize)  -> usize { //~ WARNING skipping const checks
+    x(y)
 }
 
 fn main() {

src/test/ui/consts/const-eval/const_fn_ptr.stderr

@@ -1,20 +1,26 @@
 warning: skipping const checks
-  --> $DIR/const_fn_ptr.rs:12:5
+  --> $DIR/const_fn_ptr.rs:11:1
    |
-LL |     X(x)
-   |     ^^^^
+LL | / const fn bar(x: usize) -> usize {
+LL | |     X(x)
+LL | | }
+   | |_^
 
 warning: skipping const checks
-  --> $DIR/const_fn_ptr.rs:16:5
+  --> $DIR/const_fn_ptr.rs:15:1
    |
-LL |     X_CONST(x)
-   |     ^^^^^^^^^^
+LL | / const fn bar_const(x: usize) -> usize {
+LL | |     X_CONST(x)
+LL | | }
+   | |_^
 
 warning: skipping const checks
-  --> $DIR/const_fn_ptr.rs:20:5
+  --> $DIR/const_fn_ptr.rs:19:1
    |
-LL |     x(y)
-   |     ^^^^
+LL | / const fn foo(x: fn(usize) -> usize, y: usize)  -> usize {
+LL | |     x(y)
+LL | | }
+   | |_^
 
 warning: 3 warnings emitted
 

src/test/ui/consts/const-eval/const_fn_ptr_fail.rs

@@ -6,9 +6,8 @@
 fn double(x: usize) -> usize { x * 2 }
 const X: fn(usize) -> usize = double;
 
-const fn bar(x: usize) -> usize {
+const fn bar(x: usize) -> usize { //~ WARNING skipping const checks
     X(x) // FIXME: this should error someday
-    //~^ WARN: skipping const checks
 }
 
 fn main() {}

src/test/ui/consts/const-eval/const_fn_ptr_fail.stderr

@@ -1,8 +1,10 @@
 warning: skipping const checks
-  --> $DIR/const_fn_ptr_fail.rs:10:5
+  --> $DIR/const_fn_ptr_fail.rs:9:1
    |
-LL |     X(x) // FIXME: this should error someday
-   |     ^^^^
+LL | / const fn bar(x: usize) -> usize {
+LL | |     X(x) // FIXME: this should error someday
+LL | | }
+   | |_^
 
 warning: 1 warning emitted
 

src/test/ui/consts/const-eval/const_fn_ptr_fail2.rs

@@ -9,8 +9,8 @@ fn double(x: usize) -> usize {
 }
 const X: fn(usize) -> usize = double;
 
-const fn bar(x: fn(usize) -> usize, y: usize) -> usize {
-    x(y) //~ WARN skipping const checks
+const fn bar(x: fn(usize) -> usize, y: usize) -> usize { //~ WARN skipping const checks
+    x(y)
 }
 
 const Y: usize = bar(X, 2); // FIXME: should fail to typeck someday

src/test/ui/consts/const-eval/const_fn_ptr_fail2.stderr

@@ -1,8 +1,10 @@
 warning: skipping const checks
-  --> $DIR/const_fn_ptr_fail2.rs:13:5
+  --> $DIR/const_fn_ptr_fail2.rs:12:1
    |
-LL |     x(y)
-   |     ^^^^
+LL | / const fn bar(x: fn(usize) -> usize, y: usize) -> usize {
+LL | |     x(y)
+LL | | }
+   | |_^
 
 error[E0080]: evaluation of constant expression failed
   --> $DIR/const_fn_ptr_fail2.rs:20:5

src/test/ui/consts/const-points-to-static.stderr

@@ -1,8 +1,8 @@
 warning: skipping const checks
-  --> $DIR/const-points-to-static.rs:5:20
+  --> $DIR/const-points-to-static.rs:5:1
    |
 LL | const TEST: &u8 = &MY_STATIC;
-   |                    ^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0080]: it is undefined behavior to use this value
   --> $DIR/const-points-to-static.rs:5:1

src/test/ui/consts/const-prop-read-static-in-const.stderr

@@ -1,8 +1,8 @@
 warning: skipping const checks
-  --> $DIR/const-prop-read-static-in-const.rs:5:18
+  --> $DIR/const-prop-read-static-in-const.rs:5:1
    |
 LL | const TEST: u8 = MY_STATIC;
-   |                  ^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: any use of this value will cause an error
   --> $DIR/const-prop-read-static-in-const.rs:5:18

src/test/ui/consts/miri_unleashed/abi-mismatch.rs

@@ -7,9 +7,9 @@
 const extern "C" fn c_fn() {}
 
 const fn call_rust_fn(my_fn: extern "Rust" fn()) {
+//~^ WARN skipping const checks
     my_fn();
-    //~^ WARN skipping const checks
-    //~| ERROR could not evaluate static initializer
+    //~^ ERROR could not evaluate static initializer
     //~| NOTE calling a function with ABI C using caller ABI Rust
     //~| NOTE inside `call_rust_fn`
 }