Deduplicate all the ~~things~~ errors

Author: oli-obk

src/librustc_mir/const_eval.rs

@@ -23,6 +23,7 @@ use rustc::mir;
 use rustc::ty::{self, Ty, TyCtxt, Instance, query::TyCtxtAt};
 use rustc::ty::layout::{self, Size, LayoutOf, TyLayout};
 use rustc::ty::subst::Subst;
+use rustc::traits::Reveal;
 use rustc::util::nodemap::FxHashSet;
 use rustc_data_structures::indexed_vec::IndexVec;
 use rustc_data_structures::fx::FxHashMap;
@@ -576,6 +577,16 @@ pub fn const_eval_provider<'a, 'tcx>(
     tcx: TyCtxt<'a, 'tcx, 'tcx>,
     key: ty::ParamEnvAnd<'tcx, GlobalId<'tcx>>,
 ) -> ::rustc::mir::interpret::ConstEvalResult<'tcx> {
+    if key.param_env.reveal == Reveal::All {
+        let mut key = key.clone();
+        key.param_env.reveal = Reveal::UserFacing;
+        match tcx.const_eval(key) {
+            // try again with reveal all as requested
+            Err(ErrorHandled::TooGeneric) => {},
+            // dedupliate calls
+            other => return other,
+        }
+    }
     tcx.const_eval_raw(key).and_then(|val| {
         validate_const(tcx, val, key)
     })
@@ -585,6 +596,16 @@ pub fn const_eval_raw_provider<'a, 'tcx>(
     tcx: TyCtxt<'a, 'tcx, 'tcx>,
     key: ty::ParamEnvAnd<'tcx, GlobalId<'tcx>>,
 ) -> ::rustc::mir::interpret::ConstEvalResult<'tcx> {
+    if key.param_env.reveal == Reveal::All {
+        let mut key = key.clone();
+        key.param_env.reveal = Reveal::UserFacing;
+        match tcx.const_eval_raw(key) {
+            // try again with reveal all as requested
+            Err(ErrorHandled::TooGeneric) => {},
+            // dedupliate calls
+            other => return other,
+        }
+    }
     trace!("const eval: {:?}", key);
     let cid = key.value;
     let def_id = cid.instance.def.def_id();

src/test/ui/array_const_index-0.rs

@@ -12,7 +12,6 @@ const A: &'static [i32] = &[];
 const B: i32 = (&A)[1];
 //~^ index out of bounds: the len is 0 but the index is 1
 //~| ERROR any use of this value will cause an error
-//~| ERROR any use of this value will cause an error
 
 fn main() {
     let _ = B; //~ ERROR erroneous constant used

src/test/ui/array_const_index-0.stderr

@@ -8,20 +8,12 @@ LL | const B: i32 = (&A)[1];
    |
    = note: #[deny(const_err)] on by default
 
-error: any use of this value will cause an error
-  --> $DIR/array_const_index-0.rs:12:1
-   |
-LL | const B: i32 = (&A)[1];
-   | ^^^^^^^^^^^^^^^-------^
-   |                |
-   |                index out of bounds: the len is 0 but the index is 1
-
 error[E0080]: erroneous constant used
-  --> $DIR/array_const_index-0.rs:18:13
+  --> $DIR/array_const_index-0.rs:17:13
    |
 LL |     let _ = B; //~ ERROR erroneous constant used
    |             ^ referenced constant has errors
 
-error: aborting due to 3 previous errors
+error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0080`.

src/test/ui/array_const_index-1.rs

@@ -12,7 +12,6 @@ const A: [i32; 0] = [];
 const B: i32 = A[1];
 //~^ index out of bounds: the len is 0 but the index is 1
 //~| ERROR any use of this value will cause an error
-//~| ERROR any use of this value will cause an error
 
 fn main() {
     let _ = B; //~ ERROR erroneous constant used

src/test/ui/array_const_index-1.stderr

@@ -8,20 +8,12 @@ LL | const B: i32 = A[1];
    |
    = note: #[deny(const_err)] on by default
 
-error: any use of this value will cause an error
-  --> $DIR/array_const_index-1.rs:12:1
-   |
-LL | const B: i32 = A[1];
-   | ^^^^^^^^^^^^^^^----^
-   |                |
-   |                index out of bounds: the len is 0 but the index is 1
-
 error[E0080]: erroneous constant used
-  --> $DIR/array_const_index-1.rs:18:13
+  --> $DIR/array_const_index-1.rs:17:13
    |
 LL |     let _ = B; //~ ERROR erroneous constant used
    |             ^ referenced constant has errors
 
-error: aborting due to 3 previous errors
+error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0080`.

src/test/ui/consts/const-err-early.rs

@@ -11,7 +11,6 @@
 #![deny(const_err)]
 
 pub const A: i8 = -std::i8::MIN; //~ ERROR const_err
-//~^ ERROR const_err
 pub const B: u8 = 200u8 + 200u8; //~ ERROR const_err
 pub const C: u8 = 200u8 * 4; //~ ERROR const_err
 pub const D: u8 = 42u8 - (42u8 + 1); //~ ERROR const_err

src/test/ui/consts/const-err-early.stderr

@@ -13,81 +13,73 @@ LL | #![deny(const_err)]
    |         ^^^^^^^^^
 
 error: any use of this value will cause an error
-  --> $DIR/const-err-early.rs:15:1
+  --> $DIR/const-err-early.rs:14:1
    |
 LL | pub const B: u8 = 200u8 + 200u8; //~ ERROR const_err
    | ^^^^^^^^^^^^^^^^^^-------------^
    |                   |
    |                   attempt to add with overflow
 
 error: any use of this value will cause an error
-  --> $DIR/const-err-early.rs:16:1
+  --> $DIR/const-err-early.rs:15:1
    |
 LL | pub const C: u8 = 200u8 * 4; //~ ERROR const_err
    | ^^^^^^^^^^^^^^^^^^---------^
    |                   |
    |                   attempt to multiply with overflow
 
 error: any use of this value will cause an error
-  --> $DIR/const-err-early.rs:17:1
+  --> $DIR/const-err-early.rs:16:1
    |
 LL | pub const D: u8 = 42u8 - (42u8 + 1); //~ ERROR const_err
    | ^^^^^^^^^^^^^^^^^^-----------------^
    |                   |
    |                   attempt to subtract with overflow
 
 error: any use of this value will cause an error
-  --> $DIR/const-err-early.rs:18:1
+  --> $DIR/const-err-early.rs:17:1
    |
 LL | pub const E: u8 = [5u8][1]; //~ ERROR const_err
    | ^^^^^^^^^^^^^^^^^^--------^
    |                   |
    |                   index out of bounds: the len is 1 but the index is 1
 
-error: any use of this value will cause an error
-  --> $DIR/const-err-early.rs:13:1
-   |
-LL | pub const A: i8 = -std::i8::MIN; //~ ERROR const_err
-   | ^^^^^^^^^^^^^^^^^^-------------^
-   |                   |
-   |                   attempt to negate with overflow
-
 error[E0080]: erroneous constant used
-  --> $DIR/const-err-early.rs:21:14
+  --> $DIR/const-err-early.rs:20:14
    |
 LL |     let _a = A; //~ ERROR erroneous constant used
    |              ^ referenced constant has errors
 
 error[E0080]: erroneous constant used
-  --> $DIR/const-err-early.rs:22:14
+  --> $DIR/const-err-early.rs:21:14
    |
 LL |     let _b = B; //~ ERROR erroneous constant used
    |              ^ referenced constant has errors
 
 error[E0080]: erroneous constant used
-  --> $DIR/const-err-early.rs:23:14
+  --> $DIR/const-err-early.rs:22:14
    |
 LL |     let _c = C; //~ ERROR erroneous constant used
    |              ^ referenced constant has errors
 
 error[E0080]: erroneous constant used
-  --> $DIR/const-err-early.rs:24:14
+  --> $DIR/const-err-early.rs:23:14
    |
 LL |     let _d = D; //~ ERROR erroneous constant used
    |              ^ referenced constant has errors
 
 error[E0080]: erroneous constant used
-  --> $DIR/const-err-early.rs:25:14
+  --> $DIR/const-err-early.rs:24:14
    |
 LL |     let _e = E; //~ ERROR erroneous constant used
    |              ^ referenced constant has errors
 
 error: index out of bounds: the len is 1 but the index is 1
-  --> $DIR/const-err-early.rs:26:14
+  --> $DIR/const-err-early.rs:25:14
    |
 LL |     let _e = [6u8][1]; //~ ERROR index out of bounds
    |              ^^^^^^^^
 
-error: aborting due to 12 previous errors
+error: aborting due to 11 previous errors
 
 For more information about this error, try `rustc --explain E0080`.

src/test/ui/consts/const-err-multi.rs

@@ -12,7 +12,6 @@
 
 pub const A: i8 = -std::i8::MIN;
 //~^ ERROR const_err
-//~| ERROR const_err
 pub const B: i8 = A;
 //~^ ERROR const_err
 pub const C: u8 = A as u8;

src/test/ui/consts/const-err-multi.stderr

@@ -13,43 +13,35 @@ LL | #![deny(const_err)]
    |         ^^^^^^^^^
 
 error: any use of this value will cause an error
-  --> $DIR/const-err-multi.rs:16:1
+  --> $DIR/const-err-multi.rs:15:1
    |
 LL | pub const B: i8 = A;
    | ^^^^^^^^^^^^^^^^^^-^
    |                   |
    |                   referenced constant has errors
 
 error: any use of this value will cause an error
-  --> $DIR/const-err-multi.rs:18:1
+  --> $DIR/const-err-multi.rs:17:1
    |
 LL | pub const C: u8 = A as u8;
    | ^^^^^^^^^^^^^^^^^^-------^
    |                   |
    |                   referenced constant has errors
 
 error: any use of this value will cause an error
-  --> $DIR/const-err-multi.rs:20:1
+  --> $DIR/const-err-multi.rs:19:1
    |
 LL | pub const D: i8 = 50 - A;
    | ^^^^^^^^^^^^^^^^^^------^
    |                   |
    |                   referenced constant has errors
 
-error: any use of this value will cause an error
-  --> $DIR/const-err-multi.rs:13:1
-   |
-LL | pub const A: i8 = -std::i8::MIN;
-   | ^^^^^^^^^^^^^^^^^^-------------^
-   |                   |
-   |                   attempt to negate with overflow
-
 error[E0080]: erroneous constant used
-  --> $DIR/const-err-multi.rs:24:13
+  --> $DIR/const-err-multi.rs:23:13
    |
 LL |     let _ = (A, B, C, D);
    |             ^^^^^^^^^^^^ referenced constant has errors
 
-error: aborting due to 6 previous errors
+error: aborting due to 5 previous errors
 
 For more information about this error, try `rustc --explain E0080`.

src/test/ui/consts/const-err.rs

@@ -19,7 +19,6 @@ fn black_box<T>(_: T) {
 
 const FOO: u8 = [5u8][1];
 //~^ WARN any use of this value will cause an error
-//~| WARN any use of this value will cause an error
 
 fn main() {
     black_box((FOO, FOO));