Fix error tests

Author: Voultapher

src/doc/rustc-dev-guide/src/attributes.md

@@ -33,9 +33,9 @@ Definitions of non-builtin attributes take two forms:
 1. Proc-macro attributes, defined via a function annotated with `#[proc_macro_attribute]` in a
    proc-macro crate.
 2. AST-based attributes, defined in the standard library. These attributes have special 'stub'
-   macros defined in places like [`library/core/src/macros/mod.rs`][core_macros].
+   macros defined in places like [`library/core/src/core_macros/mod.rs`][core_macros].
 
-[core_macros]:  https://github.com/rust-lang/rust/blob/master/library/core/src/macros/mod.rs
+[core_macros]:  https://github.com/rust-lang/rust/blob/master/library/core/src/core_macros/mod.rs
 
 These definitions exist to allow the macros to participate in typical path-based resolution - they
 can be imported, re-exported, and renamed just like any other item definition. However, the body of

src/tools/miri/tests/fail-dep/concurrency/windows_join_main.stderr

@@ -5,7 +5,7 @@ LL |             assert_eq!(WaitForSingleObject(MAIN_THREAD, INFINITE), WAIT_OBJ
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the evaluated program deadlocked
    |
    = note: BACKTRACE on thread `unnamed-ID`:
-   = note: inside closure at RUSTLIB/core/src/macros/mod.rs:LL:CC
+   = note: inside closure at RUSTLIB/core/src/core_macros/mod.rs:LL:CC
    = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: deadlock: the evaluated program deadlocked

src/tools/miri/tests/fail/rc_as_ptr.stderr

@@ -17,7 +17,7 @@ help: ALLOC was deallocated here:
 LL |     drop(strong);
    |     ^^^^^^^^^^^^
    = note: BACKTRACE (of the first span):
-   = note: inside `main` at RUSTLIB/core/src/macros/mod.rs:LL:CC
+   = note: inside `main` at RUSTLIB/core/src/core_macros/mod.rs:LL:CC
    = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

src/tools/miri/tests/fail/stacked_borrows/zst_slice.stderr

@@ -15,7 +15,7 @@ help: <TAG> would have been created here, but this is a zero-size retag ([0x0..0
 LL |         assert_eq!(*s.as_ptr().add(1), 2);
    |                     ^^^^^^^^^^
    = note: BACKTRACE (of the first span):
-   = note: inside `main` at RUSTLIB/core/src/macros/mod.rs:LL:CC
+   = note: inside `main` at RUSTLIB/core/src/core_macros/mod.rs:LL:CC
    = note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace

src/tools/miri/tests/pass/alloc-access-tracking.stderr

@@ -23,7 +23,7 @@ LL |         assert_eq!(*ptr, 42);
    |         ^^^^^^^^^^^^^^^^^^^^ read access to allocation with id $ALLOC
    |
    = note: BACKTRACE:
-   = note: inside `miri_start` at RUSTLIB/core/src/macros/mod.rs:LL:CC
+   = note: inside `miri_start` at RUSTLIB/core/src/core_macros/mod.rs:LL:CC
    = note: this note originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: tracking was triggered

tests/ui/did_you_mean/println-typo.stderr

@@ -3,7 +3,7 @@ error: cannot find macro `prinltn` in this scope
    |
 LL |     prinltn!();
    |     ^^^^^^^ help: a macro with a similar name exists: `println`
-  --> $SRC_DIR/std/src/macros.rs:LL:COL
+  --> $SRC_DIR/std/src/std_macros.rs:LL:COL
    |
    = note: similarly named macro `println` defined here
 

tests/ui/issues/issue-32655.stderr

@@ -6,7 +6,7 @@ LL |         #[derive_Clone]
 ...
 LL | foo!();
    | ------ in this macro invocation
-  --> $SRC_DIR/core/src/macros/mod.rs:LL:COL
+  --> $SRC_DIR/core/src/core_macros/mod.rs:LL:COL
    |
    = note: similarly named attribute macro `derive_const` defined here
    |
@@ -17,7 +17,7 @@ error: cannot find attribute `derive_Clone` in this scope
    |
 LL |     #[derive_Clone]
    |       ^^^^^^^^^^^^ help: an attribute macro with a similar name exists: `derive_const`
-  --> $SRC_DIR/core/src/macros/mod.rs:LL:COL
+  --> $SRC_DIR/core/src/core_macros/mod.rs:LL:COL
    |
    = note: similarly named attribute macro `derive_const` defined here
 

tests/ui/macros/macro-name-typo.stderr

@@ -3,7 +3,7 @@ error: cannot find macro `printlx` in this scope
    |
 LL |     printlx!("oh noes!");
    |     ^^^^^^^ help: a macro with a similar name exists: `println`
-  --> $SRC_DIR/std/src/macros.rs:LL:COL
+  --> $SRC_DIR/std/src/std_macros.rs:LL:COL
    |
    = note: similarly named macro `println` defined here
 

tests/ui/macros/macro-path-prelude-fail-3.stderr

@@ -3,7 +3,7 @@ error: cannot find macro `inline` in this scope
    |
 LL |     inline!();
    |     ^^^^^^ help: a macro with a similar name exists: `line`
-  --> $SRC_DIR/core/src/macros/mod.rs:LL:COL
+  --> $SRC_DIR/core/src/core_macros/mod.rs:LL:COL
    |
    = note: similarly named macro `line` defined here
    |

tests/ui/macros/unknown-builtin.stderr

@@ -5,7 +5,7 @@ LL | macro_rules! unknown { () => () }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0773]: attempted to define built-in macro more than once
-  --> $SRC_DIR/core/src/macros/mod.rs:LL:COL
+  --> $SRC_DIR/core/src/core_macros/mod.rs:LL:COL
    |
 note: previously defined here
   --> $DIR/unknown-builtin.rs:9:1