From 628113c3aec78ce40e1d0ca22e9d47ad26eb362f Mon Sep 17 00:00:00 2001 From: Debian Rust Maintainers Date: Sun, 5 Jul 2020 15:06:52 +0100 Subject: [PATCH] Ignore error details with $SRC_DIR Bug: https://github.com/rust-lang/rust/issues/53081 We build with --remap-path-prefix so it doesn't work, see bug below some other small things (indentation, extra output) are also different between stock and Debian rustc Gbp-Pq: Name d-ignore-error-detail-diff.patch --- .../async-await/issues/issue-62009-1.stderr | 5 --- src/test/ui/closures/closure-move-sync.stderr | 10 ------ src/test/ui/consts/const-size_of-cycle.stderr | 8 ----- src/test/ui/consts/miri_unleashed/drop.stderr | 8 ----- src/test/ui/consts/offset_from_ub.stderr | 35 ------------------- ...rives-span-Hash-enum-struct-variant.stderr | 5 --- .../ui/derives/derives-span-Hash-enum.stderr | 5 --- .../derives/derives-span-Hash-struct.stderr | 5 --- .../derives-span-Hash-tuple-struct.stderr | 5 --- .../deriving-meta-unknown-trait.stderr | 18 +++------- .../impl-trait/impl-generic-mismatch.stderr | 5 --- ...e-extern-crate-restricted-shadowing.stderr | 4 --- .../mismatched_trait_impl-2.stderr | 5 --- .../interior-mutability.stderr | 5 --- src/test/ui/issues/issue-17546.stderr | 18 +++------- src/test/ui/issues/issue-21160.stderr | 5 --- src/test/ui/issues/issue-27033.stderr | 5 --- src/test/ui/issues/issue-31173.stderr | 5 --- src/test/ui/issues/issue-38857.stderr | 4 --- src/test/ui/issues/issue-7607-1.stderr | 9 ++--- src/test/ui/macros/macro-name-typo.stderr | 9 ++--- .../macros/macro-path-prelude-fail-3.stderr | 9 ++--- .../ui/mismatched_types/issue-36053-2.stderr | 5 --- src/test/ui/no-send-res-ports.stderr | 5 --- .../ui/proc-macro/parent-source-spans.stderr | 15 -------- src/test/ui/proc-macro/resolve-error.stderr | 18 +++------- src/test/ui/resolve/levenshtein.stderr | 5 --- .../termination-trait-test-wrong-type.stderr | 5 --- .../ui/stability-in-private-module.stderr | 4 --- .../ui/suggestions/attribute-typos.stderr | 9 ++--- .../suggestions/imm-ref-trait-object.stderr | 5 --- .../mut-borrow-needed-by-trait.stderr | 5 --- .../trait-alias-object-fail.stderr | 5 --- .../traits/trait-suggest-where-clause.stderr | 20 ----------- src/test/ui/type_length_limit.stderr | 4 --- src/test/ui/unique-object-noncopyable.stderr | 5 --- src/test/ui/unique-pinned-nocopy.stderr | 5 --- 37 files changed, 20 insertions(+), 282 deletions(-) diff --git a/src/test/ui/async-await/issues/issue-62009-1.stderr b/src/test/ui/async-await/issues/issue-62009-1.stderr index cd6670923c..66388098dc 100644 --- a/src/test/ui/async-await/issues/issue-62009-1.stderr +++ b/src/test/ui/async-await/issues/issue-62009-1.stderr @@ -32,11 +32,6 @@ error[E0277]: the trait bound `[closure@$DIR/issue-62009-1.rs:16:5: 16:15]: std: | LL | (|_| 2333).await; | ^^^^^^^^^^^^^^^^ the trait `std::future::Future` is not implemented for `[closure@$DIR/issue-62009-1.rs:16:5: 16:15]` - | - ::: $SRC_DIR/libstd/future.rs:LL:COL - | -LL | F: Future, - | ------ required by this bound in `std::future::poll_with_tls_context` error: aborting due to 4 previous errors diff --git a/src/test/ui/closures/closure-move-sync.stderr b/src/test/ui/closures/closure-move-sync.stderr index 2187823d75..390b2e11fc 100644 --- a/src/test/ui/closures/closure-move-sync.stderr +++ b/src/test/ui/closures/closure-move-sync.stderr @@ -3,11 +3,6 @@ error[E0277]: `std::sync::mpsc::Receiver<()>` cannot be shared between threads s | LL | let t = thread::spawn(|| { | ^^^^^^^^^^^^^ `std::sync::mpsc::Receiver<()>` cannot be shared between threads safely - | - ::: $SRC_DIR/libstd/thread/mod.rs:LL:COL - | -LL | F: Send + 'static, - | ---- required by this bound in `std::thread::spawn` | = help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Receiver<()>` = note: required because of the requirements on the impl of `std::marker::Send` for `&std::sync::mpsc::Receiver<()>` @@ -18,11 +13,6 @@ error[E0277]: `std::sync::mpsc::Sender<()>` cannot be shared between threads saf | LL | thread::spawn(|| tx.send(()).unwrap()); | ^^^^^^^^^^^^^ `std::sync::mpsc::Sender<()>` cannot be shared between threads safely - | - ::: $SRC_DIR/libstd/thread/mod.rs:LL:COL - | -LL | F: Send + 'static, - | ---- required by this bound in `std::thread::spawn` | = help: the trait `std::marker::Sync` is not implemented for `std::sync::mpsc::Sender<()>` = note: required because of the requirements on the impl of `std::marker::Send` for `&std::sync::mpsc::Sender<()>` diff --git a/src/test/ui/consts/const-size_of-cycle.stderr b/src/test/ui/consts/const-size_of-cycle.stderr index c03b7a19ff..99a9461abb 100644 --- a/src/test/ui/consts/const-size_of-cycle.stderr +++ b/src/test/ui/consts/const-size_of-cycle.stderr @@ -15,15 +15,7 @@ note: ...which requires const-evaluating `Foo::bytes::{{constant}}#0`... LL | bytes: [u8; std::mem::size_of::()] | ^^^^^^^^^^^^^^^^^^^^^^^^^^ note: ...which requires const-evaluating `std::mem::size_of`... - --> $SRC_DIR/libcore/mem/mod.rs:LL:COL - | -LL | intrinsics::size_of::() - | ^^^^^^^^^^^^^^^^^^^^^^^^^^ note: ...which requires const-evaluating + checking `std::intrinsics::size_of`... - --> $SRC_DIR/libcore/intrinsics.rs:LL:COL - | -LL | pub fn size_of() -> usize; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ = note: ...which requires computing layout of `Foo`... = note: ...which requires normalizing `ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: All, def_id: None }, value: [u8; _] }`... = note: ...which again requires const-evaluating + checking `Foo::bytes::{{constant}}#0`, completing the cycle diff --git a/src/test/ui/consts/miri_unleashed/drop.stderr b/src/test/ui/consts/miri_unleashed/drop.stderr index 2439d527bd..fd3281144d 100644 --- a/src/test/ui/consts/miri_unleashed/drop.stderr +++ b/src/test/ui/consts/miri_unleashed/drop.stderr @@ -5,14 +5,6 @@ LL | let _v: Vec = Vec::new(); | ^^ error[E0080]: could not evaluate static initializer - --> $SRC_DIR/libcore/ptr/mod.rs:LL:COL - | -LL | / pub unsafe fn drop_in_place(to_drop: *mut T) { -LL | | // Code here does not matter - this is replaced by the -LL | | // real drop glue by the compiler. -LL | | drop_in_place(to_drop) -LL | | } - | |_^ calling non-const function ` as std::ops::Drop>::drop` | ::: $DIR/drop.rs:23:1 | diff --git a/src/test/ui/consts/offset_from_ub.stderr b/src/test/ui/consts/offset_from_ub.stderr index 24da983cf0..8becdc1009 100644 --- a/src/test/ui/consts/offset_from_ub.stderr +++ b/src/test/ui/consts/offset_from_ub.stderr @@ -1,11 +1,4 @@ error: any use of this value will cause an error - --> $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL - | -LL | intrinsics::ptr_offset_from(self, origin) - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | | - | ptr_offset_from cannot compute offset of pointers into different allocations. - | inside call to `std::ptr::const_ptr::::offset_from` at $DIR/offset_from_ub.rs:22:27 | ::: $DIR/offset_from_ub.rs:16:1 | @@ -21,13 +14,6 @@ LL | | }; = note: `#[deny(const_err)]` on by default error: any use of this value will cause an error - --> $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL - | -LL | intrinsics::ptr_offset_from(self, origin) - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | | - | a memory access tried to interpret some bytes as a pointer - | inside call to `std::ptr::const_ptr::::offset_from` at $DIR/offset_from_ub.rs:28:14 | ::: $DIR/offset_from_ub.rs:26:1 | @@ -38,13 +24,6 @@ LL | | }; | |__- error: any use of this value will cause an error - --> $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL - | -LL | intrinsics::ptr_offset_from(self, origin) - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | | - | exact_div: 1 cannot be divided by 2 without remainder - | inside call to `std::ptr::const_ptr::::offset_from` at $DIR/offset_from_ub.rs:36:14 | ::: $DIR/offset_from_ub.rs:31:1 | @@ -58,13 +37,6 @@ LL | | }; | |__- error: any use of this value will cause an error - --> $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL - | -LL | intrinsics::ptr_offset_from(self, origin) - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | | - | invalid use of NULL pointer - | inside call to `std::ptr::const_ptr::::offset_from` at $DIR/offset_from_ub.rs:42:14 | ::: $DIR/offset_from_ub.rs:39:1 | @@ -76,13 +48,6 @@ LL | | }; | |__- error: any use of this value will cause an error - --> $SRC_DIR/libcore/ptr/const_ptr.rs:LL:COL - | -LL | intrinsics::ptr_offset_from(self, origin) - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | | - | a memory access tried to interpret some bytes as a pointer - | inside call to `std::ptr::const_ptr::::offset_from` at $DIR/offset_from_ub.rs:49:14 | ::: $DIR/offset_from_ub.rs:45:1 | diff --git a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr index 889c725c84..9d25c43941 100644 --- a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr +++ b/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr @@ -3,11 +3,6 @@ error[E0277]: the trait bound `Error: std::hash::Hash` is not satisfied | LL | x: Error | ^^^^^^^^ the trait `std::hash::Hash` is not implemented for `Error` - | - ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL - | -LL | fn hash(&self, state: &mut H); - | - required by this bound in `std::hash::Hash::hash` | = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/src/test/ui/derives/derives-span-Hash-enum.stderr b/src/test/ui/derives/derives-span-Hash-enum.stderr index 70b8a85d10..c10f51597c 100644 --- a/src/test/ui/derives/derives-span-Hash-enum.stderr +++ b/src/test/ui/derives/derives-span-Hash-enum.stderr @@ -3,11 +3,6 @@ error[E0277]: the trait bound `Error: std::hash::Hash` is not satisfied | LL | Error | ^^^^^ the trait `std::hash::Hash` is not implemented for `Error` - | - ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL - | -LL | fn hash(&self, state: &mut H); - | - required by this bound in `std::hash::Hash::hash` | = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/src/test/ui/derives/derives-span-Hash-struct.stderr b/src/test/ui/derives/derives-span-Hash-struct.stderr index 61897392a7..eb26350c0d 100644 --- a/src/test/ui/derives/derives-span-Hash-struct.stderr +++ b/src/test/ui/derives/derives-span-Hash-struct.stderr @@ -3,11 +3,6 @@ error[E0277]: the trait bound `Error: std::hash::Hash` is not satisfied | LL | x: Error | ^^^^^^^^ the trait `std::hash::Hash` is not implemented for `Error` - | - ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL - | -LL | fn hash(&self, state: &mut H); - | - required by this bound in `std::hash::Hash::hash` | = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr b/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr index fb929ad985..0fe8acb55b 100644 --- a/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr +++ b/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr @@ -3,11 +3,6 @@ error[E0277]: the trait bound `Error: std::hash::Hash` is not satisfied | LL | Error | ^^^^^ the trait `std::hash::Hash` is not implemented for `Error` - | - ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL - | -LL | fn hash(&self, state: &mut H); - | - required by this bound in `std::hash::Hash::hash` | = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/src/test/ui/derives/deriving-meta-unknown-trait.stderr b/src/test/ui/derives/deriving-meta-unknown-trait.stderr index ead1313232..abe382fc42 100644 --- a/src/test/ui/derives/deriving-meta-unknown-trait.stderr +++ b/src/test/ui/derives/deriving-meta-unknown-trait.stderr @@ -1,24 +1,14 @@ error: cannot find derive macro `Eqr` in this scope --> $DIR/deriving-meta-unknown-trait.rs:5:10 | -LL | #[derive(Eqr)] - | ^^^ help: a derive macro with a similar name exists: `Eq` - | - ::: $SRC_DIR/libcore/cmp.rs:LL:COL - | -LL | pub macro Eq($item:item) { - | ------------------------ similarly named derive macro `Eq` defined here +LL | #[derive(Eqr)] + | ^^^ help: a derive macro with a similar name exists: `Eq` error: cannot find derive macro `Eqr` in this scope --> $DIR/deriving-meta-unknown-trait.rs:5:10 | -LL | #[derive(Eqr)] - | ^^^ help: a derive macro with a similar name exists: `Eq` - | - ::: $SRC_DIR/libcore/cmp.rs:LL:COL - | -LL | pub macro Eq($item:item) { - | ------------------------ similarly named derive macro `Eq` defined here +LL | #[derive(Eqr)] + | ^^^ help: a derive macro with a similar name exists: `Eq` error: aborting due to 2 previous errors diff --git a/src/test/ui/impl-trait/impl-generic-mismatch.stderr b/src/test/ui/impl-trait/impl-generic-mismatch.stderr index 0c294d1e48..8b0b463705 100644 --- a/src/test/ui/impl-trait/impl-generic-mismatch.stderr +++ b/src/test/ui/impl-trait/impl-generic-mismatch.stderr @@ -31,11 +31,6 @@ error[E0643]: method `hash` has incompatible signature for trait | LL | fn hash(&self, hasher: &mut impl Hasher) {} | ^^^^^^^^^^^ expected generic parameter, found `impl Trait` - | - ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL - | -LL | fn hash(&self, state: &mut H); - | - declaration in trait here error: aborting due to 3 previous errors diff --git a/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr b/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr index e344d05914..9d2517d2aa 100644 --- a/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr +++ b/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr @@ -24,10 +24,6 @@ LL | extern crate std as Vec; LL | define_vec!(); | -------------- in this macro invocation note: `Vec` could also refer to the struct defined here - --> $SRC_DIR/libstd/prelude/v1.rs:LL:COL - | -LL | pub use crate::vec::Vec; - | ^^^^^^^^^^^^^^^ = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) error: aborting due to 2 previous errors diff --git a/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr b/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr index 374e308a63..5559189642 100644 --- a/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr +++ b/src/test/ui/in-band-lifetimes/mismatched_trait_impl-2.stderr @@ -3,11 +3,6 @@ error: `impl` item signature doesn't match `trait` item signature | LL | fn deref(&self) -> &dyn Trait { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ found fn(&Struct) -> &dyn Trait - | - ::: $SRC_DIR/libcore/ops/deref.rs:LL:COL - | -LL | fn deref(&self) -> &Self::Target; - | --------------------------------- expected fn(&Struct) -> &(dyn Trait + 'static) | = note: expected `fn(&Struct) -> &(dyn Trait + 'static)` found `fn(&Struct) -> &dyn Trait` diff --git a/src/test/ui/interior-mutability/interior-mutability.stderr b/src/test/ui/interior-mutability/interior-mutability.stderr index 2378e41217..941ef20f8a 100644 --- a/src/test/ui/interior-mutability/interior-mutability.stderr +++ b/src/test/ui/interior-mutability/interior-mutability.stderr @@ -3,11 +3,6 @@ error[E0277]: the type `std::cell::UnsafeCell` may contain interior mutabil | LL | catch_unwind(|| { x.set(23); }); | ^^^^^^^^^^^^ `std::cell::UnsafeCell` may contain interior mutability and a reference may not be safely transferrable across a catch_unwind boundary - | - ::: $SRC_DIR/libstd/panic.rs:LL:COL - | -LL | pub fn catch_unwind R + UnwindSafe, R>(f: F) -> Result { - | ---------- required by this bound in `std::panic::catch_unwind` | = help: within `std::cell::Cell`, the trait `std::panic::RefUnwindSafe` is not implemented for `std::cell::UnsafeCell` = note: required because it appears within the type `std::cell::Cell` diff --git a/src/test/ui/issues/issue-17546.stderr b/src/test/ui/issues/issue-17546.stderr index 2d532cdb9d..2998c98e14 100644 --- a/src/test/ui/issues/issue-17546.stderr +++ b/src/test/ui/issues/issue-17546.stderr @@ -1,13 +1,8 @@ error[E0573]: expected type, found variant `NoResult` --> $DIR/issue-17546.rs:16:17 | -LL | fn new() -> NoResult { - | ^^^^^^^^^^^^^^^^^^^^^^^^ - | - ::: $SRC_DIR/libcore/result.rs:LL:COL - | -LL | pub enum Result { - | --------------------- similarly named enum `Result` defined here +LL | fn new() -> NoResult { + | ^^^^^^^^^^^^^^^^^^^^^^^^ | help: try using the variant's enum | @@ -57,13 +52,8 @@ LL | use std::result::Result; error[E0573]: expected type, found variant `NoResult` --> $DIR/issue-17546.rs:37:15 | -LL | fn newer() -> NoResult { - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - ::: $SRC_DIR/libcore/result.rs:LL:COL - | -LL | pub enum Result { - | --------------------- similarly named enum `Result` defined here +LL | fn newer() -> NoResult { + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: try using the variant's enum | diff --git a/src/test/ui/issues/issue-21160.stderr b/src/test/ui/issues/issue-21160.stderr index a24dc8a259..63c7de4e53 100644 --- a/src/test/ui/issues/issue-21160.stderr +++ b/src/test/ui/issues/issue-21160.stderr @@ -3,11 +3,6 @@ error[E0277]: the trait bound `Bar: std::hash::Hash` is not satisfied | LL | struct Foo(Bar); | ^^^ the trait `std::hash::Hash` is not implemented for `Bar` - | - ::: $SRC_DIR/libcore/hash/mod.rs:LL:COL - | -LL | fn hash(&self, state: &mut H); - | - required by this bound in `std::hash::Hash::hash` | = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/src/test/ui/issues/issue-27033.stderr b/src/test/ui/issues/issue-27033.stderr index c0de0f1426..a5a59edc7c 100644 --- a/src/test/ui/issues/issue-27033.stderr +++ b/src/test/ui/issues/issue-27033.stderr @@ -3,11 +3,6 @@ error[E0530]: match bindings cannot shadow unit variants | LL | None @ _ => {} | ^^^^ cannot be named the same as a unit variant - | - ::: $SRC_DIR/libstd/prelude/v1.rs:LL:COL - | -LL | pub use crate::option::Option::{self, None, Some}; - | ---- the unit variant `None` is defined here error[E0530]: match bindings cannot shadow constants --> $DIR/issue-27033.rs:11:9 diff --git a/src/test/ui/issues/issue-31173.stderr b/src/test/ui/issues/issue-31173.stderr index 20bfdeea4b..3e96d52a2d 100644 --- a/src/test/ui/issues/issue-31173.stderr +++ b/src/test/ui/issues/issue-31173.stderr @@ -12,11 +12,6 @@ error[E0599]: no method named `collect` found for struct `std::iter::Cloned, [closure@$DIR/issue-31173.rs:10:39: 13:6 found_e:_]>>` - | - ::: $SRC_DIR/libcore/iter/adapters/mod.rs:LL:COL - | -LL | pub struct Cloned { - | -------------------- doesn't satisfy `_: std::iter::Iterator` ... LL | pub struct TakeWhile { | -------------------------- doesn't satisfy `<_ as std::iter::Iterator>::Item = &_` diff --git a/src/test/ui/issues/issue-38857.stderr b/src/test/ui/issues/issue-38857.stderr index ba0f1336ff..38adfd052e 100644 --- a/src/test/ui/issues/issue-38857.stderr +++ b/src/test/ui/issues/issue-38857.stderr @@ -11,10 +11,6 @@ LL | let a = std::sys::imp::process::process_common::StdioPipes { ..panic!() | ^^^ this module is private | note: the module `sys` is defined here - --> $SRC_DIR/libstd/lib.rs:LL:COL - | -LL | mod sys; - | ^^^^^^^^ error: aborting due to 2 previous errors diff --git a/src/test/ui/issues/issue-7607-1.stderr b/src/test/ui/issues/issue-7607-1.stderr index 94f489e209..6c0b6af673 100644 --- a/src/test/ui/issues/issue-7607-1.stderr +++ b/src/test/ui/issues/issue-7607-1.stderr @@ -1,13 +1,8 @@ error[E0412]: cannot find type `Fo` in this scope --> $DIR/issue-7607-1.rs:9:6 | -LL | impl Fo { - | ^^ help: a trait with a similar name exists: `Fn` - | - ::: $SRC_DIR/libcore/ops/function.rs:LL:COL - | -LL | pub trait Fn: FnMut { - | ------------------------------- similarly named trait `Fn` defined here +LL | impl Fo { + | ^^ help: a trait with a similar name exists: `Fn` error: aborting due to previous error diff --git a/src/test/ui/macros/macro-name-typo.stderr b/src/test/ui/macros/macro-name-typo.stderr index 00afbde893..14fd764780 100644 --- a/src/test/ui/macros/macro-name-typo.stderr +++ b/src/test/ui/macros/macro-name-typo.stderr @@ -1,13 +1,8 @@ error: cannot find macro `printlx` in this scope --> $DIR/macro-name-typo.rs:6:5 | -LL | printlx!("oh noes!"); - | ^^^^^^^ help: a macro with a similar name exists: `println` - | - ::: $SRC_DIR/libstd/macros.rs:LL:COL - | -LL | macro_rules! println { - | -------------------- similarly named macro `println` defined here +LL | printlx!("oh noes!"); + | ^^^^^^^ help: a macro with a similar name exists: `println` error: aborting due to previous error diff --git a/src/test/ui/macros/macro-path-prelude-fail-3.stderr b/src/test/ui/macros/macro-path-prelude-fail-3.stderr index 5364590674..15be755510 100644 --- a/src/test/ui/macros/macro-path-prelude-fail-3.stderr +++ b/src/test/ui/macros/macro-path-prelude-fail-3.stderr @@ -1,13 +1,8 @@ error: cannot find macro `inline` in this scope --> $DIR/macro-path-prelude-fail-3.rs:6:5 | -LL | inline!(); - | ^^^^^^ help: a macro with a similar name exists: `line` - | - ::: $SRC_DIR/libcore/macros/mod.rs:LL:COL - | -LL | macro_rules! line { - | ----------------- similarly named macro `line` defined here +LL | inline!(); + | ^^^^^^ help: a macro with a similar name exists: `line` error: aborting due to previous error diff --git a/src/test/ui/mismatched_types/issue-36053-2.stderr b/src/test/ui/mismatched_types/issue-36053-2.stderr index f8c0470172..150aa14c49 100644 --- a/src/test/ui/mismatched_types/issue-36053-2.stderr +++ b/src/test/ui/mismatched_types/issue-36053-2.stderr @@ -6,11 +6,6 @@ LL | once::<&str>("str").fuse().filter(|a: &str| true).count(); | | | doesn't satisfy `<_ as std::ops::FnOnce<(&&str,)>>::Output = bool` | doesn't satisfy `_: std::ops::FnMut<(&&str,)>` - | - ::: $SRC_DIR/libcore/iter/adapters/mod.rs:LL:COL - | -LL | pub struct Filter { - | ----------------------- doesn't satisfy `_: std::iter::Iterator` | = note: the method `count` exists but the following trait bounds were not satisfied: `<[closure@$DIR/issue-36053-2.rs:11:39: 11:53] as std::ops::FnOnce<(&&str,)>>::Output = bool` diff --git a/src/test/ui/no-send-res-ports.stderr b/src/test/ui/no-send-res-ports.stderr index 65946ee8a2..f40cb05624 100644 --- a/src/test/ui/no-send-res-ports.stderr +++ b/src/test/ui/no-send-res-ports.stderr @@ -10,11 +10,6 @@ LL | | let y = x; LL | | println!("{:?}", y); LL | | }); | |_____- within this `[closure@$DIR/no-send-res-ports.rs:29:19: 33:6 x:main::Foo]` - | - ::: $SRC_DIR/libstd/thread/mod.rs:LL:COL - | -LL | F: Send + 'static, - | ---- required by this bound in `std::thread::spawn` | = help: within `[closure@$DIR/no-send-res-ports.rs:29:19: 33:6 x:main::Foo]`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<()>` = note: required because it appears within the type `Port<()>` diff --git a/src/test/ui/proc-macro/parent-source-spans.stderr b/src/test/ui/proc-macro/parent-source-spans.stderr index 254f87751f..94629ebb8c 100644 --- a/src/test/ui/proc-macro/parent-source-spans.stderr +++ b/src/test/ui/proc-macro/parent-source-spans.stderr @@ -144,11 +144,6 @@ LL | parent_source_spans!($($tokens)*); ... LL | one!("hello", "world"); | ----------------------- in this macro invocation - | - ::: $SRC_DIR/libcore/result.rs:LL:COL - | -LL | Ok(#[stable(feature = "rust1", since = "1.0.0")] T), - | --------------------------------------------------- similarly named tuple variant `Ok` defined here | = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) @@ -160,11 +155,6 @@ LL | parent_source_spans!($($tokens)*); ... LL | two!("yay", "rust"); | -------------------- in this macro invocation - | - ::: $SRC_DIR/libcore/result.rs:LL:COL - | -LL | Ok(#[stable(feature = "rust1", since = "1.0.0")] T), - | --------------------------------------------------- similarly named tuple variant `Ok` defined here | = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) @@ -176,11 +166,6 @@ LL | parent_source_spans!($($tokens)*); ... LL | three!("hip", "hop"); | --------------------- in this macro invocation - | - ::: $SRC_DIR/libcore/result.rs:LL:COL - | -LL | Ok(#[stable(feature = "rust1", since = "1.0.0")] T), - | --------------------------------------------------- similarly named tuple variant `Ok` defined here | = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/src/test/ui/proc-macro/resolve-error.stderr b/src/test/ui/proc-macro/resolve-error.stderr index 73a6ab1cfb..5b13176c58 100644 --- a/src/test/ui/proc-macro/resolve-error.stderr +++ b/src/test/ui/proc-macro/resolve-error.stderr @@ -74,24 +74,14 @@ LL | pub fn derive_clonea(input: TokenStream) -> TokenStream { error: cannot find derive macro `Dlone` in this scope --> $DIR/resolve-error.rs:39:10 | -LL | #[derive(Dlone)] - | ^^^^^ help: a derive macro with a similar name exists: `Clone` - | - ::: $SRC_DIR/libcore/clone.rs:LL:COL - | -LL | pub macro Clone($item:item) { - | --------------------------- similarly named derive macro `Clone` defined here +LL | #[derive(Dlone)] + | ^^^^^ help: a derive macro with a similar name exists: `Clone` error: cannot find derive macro `Dlone` in this scope --> $DIR/resolve-error.rs:39:10 | -LL | #[derive(Dlone)] - | ^^^^^ help: a derive macro with a similar name exists: `Clone` - | - ::: $SRC_DIR/libcore/clone.rs:LL:COL - | -LL | pub macro Clone($item:item) { - | --------------------------- similarly named derive macro `Clone` defined here +LL | #[derive(Dlone)] + | ^^^^^ help: a derive macro with a similar name exists: `Clone` error: cannot find attribute `FooWithLongNan` in this scope --> $DIR/resolve-error.rs:36:3 diff --git a/src/test/ui/resolve/levenshtein.stderr b/src/test/ui/resolve/levenshtein.stderr index a622d6cb34..4be76a51b1 100644 --- a/src/test/ui/resolve/levenshtein.stderr +++ b/src/test/ui/resolve/levenshtein.stderr @@ -18,11 +18,6 @@ error[E0412]: cannot find type `Opiton` in this scope | LL | type B = Opiton; // Misspelled type name from the prelude. | ^^^^^^ help: an enum with a similar name exists: `Option` - | - ::: $SRC_DIR/libcore/option.rs:LL:COL - | -LL | pub enum Option { - | ------------------ similarly named enum `Option` defined here error[E0412]: cannot find type `Baz` in this scope --> $DIR/levenshtein.rs:20:14 diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr b/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr index d4bd760770..21f183fa6c 100644 --- a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr +++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr @@ -5,11 +5,6 @@ LL | / fn can_parse_zero_as_f32() -> Result { LL | | "0".parse() LL | | } | |_^ `main` can only return types that implement `std::process::Termination` - | - ::: $SRC_DIR/libtest/lib.rs:LL:COL - | -LL | pub fn assert_test_result(result: T) { - | ----------- required by this bound in `test::assert_test_result` | = help: the trait `std::process::Termination` is not implemented for `std::result::Result` = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/src/test/ui/stability-in-private-module.stderr b/src/test/ui/stability-in-private-module.stderr index 3a974164f9..f2ee71d37e 100644 --- a/src/test/ui/stability-in-private-module.stderr +++ b/src/test/ui/stability-in-private-module.stderr @@ -5,10 +5,6 @@ LL | let _ = std::thread::thread_info::current_thread(); | ^^^^^^^^^^^ this module is private | note: the module `thread_info` is defined here - --> $SRC_DIR/libstd/thread/mod.rs:LL:COL - | -LL | use crate::sys_common::thread_info; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/suggestions/attribute-typos.stderr b/src/test/ui/suggestions/attribute-typos.stderr index c7c257ba5f..59a4639298 100644 --- a/src/test/ui/suggestions/attribute-typos.stderr +++ b/src/test/ui/suggestions/attribute-typos.stderr @@ -15,13 +15,8 @@ LL | #[rustc_err] error: cannot find attribute `tests` in this scope --> $DIR/attribute-typos.rs:8:3 | -LL | #[tests] - | ^^^^^ help: an attribute macro with a similar name exists: `test` - | - ::: $SRC_DIR/libcore/macros/mod.rs:LL:COL - | -LL | pub macro test($item:item) { - | -------------------------- similarly named attribute macro `test` defined here +LL | #[tests] + | ^^^^^ help: an attribute macro with a similar name exists: `test` error: cannot find attribute `deprcated` in this scope --> $DIR/attribute-typos.rs:5:3 diff --git a/src/test/ui/suggestions/imm-ref-trait-object.stderr b/src/test/ui/suggestions/imm-ref-trait-object.stderr index c5fe6ddb8a..5cd7a36d20 100644 --- a/src/test/ui/suggestions/imm-ref-trait-object.stderr +++ b/src/test/ui/suggestions/imm-ref-trait-object.stderr @@ -3,11 +3,6 @@ error: the `min` method cannot be invoked on a trait object | LL | t.min().unwrap() | ^^^ - | - ::: $SRC_DIR/libcore/iter/traits/iterator.rs:LL:COL - | -LL | Self: Sized, - | ----- this has a `Sized` requirement | = note: you need `&mut dyn std::iter::Iterator` instead of `&dyn std::iter::Iterator` diff --git a/src/test/ui/suggestions/mut-borrow-needed-by-trait.stderr b/src/test/ui/suggestions/mut-borrow-needed-by-trait.stderr index e4234cfcd5..edbd6fef83 100644 --- a/src/test/ui/suggestions/mut-borrow-needed-by-trait.stderr +++ b/src/test/ui/suggestions/mut-borrow-needed-by-trait.stderr @@ -30,11 +30,6 @@ error[E0599]: no method named `write_fmt` found for struct `std::io::BufWriter<& | LL | writeln!(fp, "hello world").unwrap(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ method not found in `std::io::BufWriter<&dyn std::io::Write>` - | - ::: $SRC_DIR/libstd/io/buffered.rs:LL:COL - | -LL | pub struct BufWriter { - | ------------------------------ doesn't satisfy `_: std::io::Write` | = note: the method `write_fmt` exists but the following trait bounds were not satisfied: `&dyn std::io::Write: std::io::Write` diff --git a/src/test/ui/traits/trait-alias/trait-alias-object-fail.stderr b/src/test/ui/traits/trait-alias/trait-alias-object-fail.stderr index 21818097bd..42c5b69fd8 100644 --- a/src/test/ui/traits/trait-alias/trait-alias-object-fail.stderr +++ b/src/test/ui/traits/trait-alias/trait-alias-object-fail.stderr @@ -3,11 +3,6 @@ error[E0038]: the trait `std::cmp::Eq` cannot be made into an object | LL | let _: &dyn EqAlias = &123; | ^^^^^^^^^^^ the trait `std::cmp::Eq` cannot be made into an object - | - ::: $SRC_DIR/libcore/cmp.rs:LL:COL - | -LL | pub trait Eq: PartialEq { - | --------------- the trait cannot be made into an object because it uses `Self` as a type parameter in this error[E0191]: the value of the associated type `Item` (from trait `std::iter::Iterator`) must be specified --> $DIR/trait-alias-object-fail.rs:14:17 diff --git a/src/test/ui/traits/trait-suggest-where-clause.stderr b/src/test/ui/traits/trait-suggest-where-clause.stderr index 9680d58b8c..dc00b0867c 100644 --- a/src/test/ui/traits/trait-suggest-where-clause.stderr +++ b/src/test/ui/traits/trait-suggest-where-clause.stderr @@ -6,11 +6,6 @@ LL | fn check() { LL | // suggest a where-clause, if needed LL | mem::size_of::(); | ^ doesn't have a size known at compile-time - | - ::: $SRC_DIR/libcore/mem/mod.rs:LL:COL - | -LL | pub const fn size_of() -> usize { - | - required by this bound in `std::mem::size_of` | = help: the trait `std::marker::Sized` is not implemented for `U` = note: to learn more, visit @@ -23,11 +18,6 @@ LL | fn check() { ... LL | mem::size_of::>(); | ^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time - | - ::: $SRC_DIR/libcore/mem/mod.rs:LL:COL - | -LL | pub const fn size_of() -> usize { - | - required by this bound in `std::mem::size_of` | = help: within `Misc`, the trait `std::marker::Sized` is not implemented for `U` = note: to learn more, visit @@ -62,11 +52,6 @@ error[E0277]: the size for values of type `[T]` cannot be known at compilation t | LL | mem::size_of::<[T]>(); | ^^^ doesn't have a size known at compile-time - | - ::: $SRC_DIR/libcore/mem/mod.rs:LL:COL - | -LL | pub const fn size_of() -> usize { - | - required by this bound in `std::mem::size_of` | = help: the trait `std::marker::Sized` is not implemented for `[T]` = note: to learn more, visit @@ -76,11 +61,6 @@ error[E0277]: the size for values of type `[&U]` cannot be known at compilation | LL | mem::size_of::<[&U]>(); | ^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time - | - ::: $SRC_DIR/libcore/mem/mod.rs:LL:COL - | -LL | pub const fn size_of() -> usize { - | - required by this bound in `std::mem::size_of` | = help: the trait `std::marker::Sized` is not implemented for `[&U]` = note: to learn more, visit diff --git a/src/test/ui/type_length_limit.stderr b/src/test/ui/type_length_limit.stderr index 8a9ef993bd..83a61ce79f 100644 --- a/src/test/ui/type_length_limit.stderr +++ b/src/test/ui/type_length_limit.stderr @@ -1,8 +1,4 @@ error: reached the type-length limit while instantiating `std::mem::drop::>` - --> $SRC_DIR/libcore/mem/mod.rs:LL:COL - | -LL | pub fn drop(_x: T) {} - | ^^^^^^^^^^^^^^^^^^^^^^^^ | = note: consider adding a `#![type_length_limit="1094"]` attribute to your crate diff --git a/src/test/ui/unique-object-noncopyable.stderr b/src/test/ui/unique-object-noncopyable.stderr index fb78095224..5cc8ec35b6 100644 --- a/src/test/ui/unique-object-noncopyable.stderr +++ b/src/test/ui/unique-object-noncopyable.stderr @@ -9,11 +9,6 @@ LL | trait Foo { ... LL | let _z = y.clone(); | ^^^^^ method not found in `std::boxed::Box` - | - ::: $SRC_DIR/liballoc/boxed.rs:LL:COL - | -LL | pub struct Box(Unique); - | ------------------------------------- doesn't satisfy `std::boxed::Box: std::clone::Clone` | = note: the method `clone` exists but the following trait bounds were not satisfied: `dyn Foo: std::marker::Sized` diff --git a/src/test/ui/unique-pinned-nocopy.stderr b/src/test/ui/unique-pinned-nocopy.stderr index ea6575d1d8..87777495b6 100644 --- a/src/test/ui/unique-pinned-nocopy.stderr +++ b/src/test/ui/unique-pinned-nocopy.stderr @@ -6,11 +6,6 @@ LL | struct R { ... LL | let _j = i.clone(); | ^^^^^ method not found in `std::boxed::Box` - | - ::: $SRC_DIR/liballoc/boxed.rs:LL:COL - | -LL | pub struct Box(Unique); - | ------------------------------------- doesn't satisfy `std::boxed::Box: std::clone::Clone` | = note: the method `clone` exists but the following trait bounds were not satisfied: `R: std::clone::Clone` -- 2.30.2