11 files changed, 12 insertions, 12 deletions
diff --git a/src/test/ui/issues/issue-17546.stderr b/src/test/ui/issues/issue-17546.stderr
index 95939cf6b38..6269ccb73e0 100644
--- a/src/test/ui/issues/issue-17546.stderr
+++ b/src/test/ui/issues/issue-17546.stderr
@@ -4,7 +4,7 @@ error[E0573]: expected type, found variant `NoResult`
 LL |     fn new() -> NoResult<MyEnum, String> {
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^
    | 
-  ::: $SRC_DIR/libcore/result.rs:LL:COL
+  ::: $SRC_DIR/core/src/result.rs:LL:COL
    |
 LL | pub enum Result<T, E> {
    | --------------------- similarly named enum `Result` defined here
@@ -58,7 +58,7 @@ error[E0573]: expected type, found variant `NoResult`
 LL | fn newer() -> NoResult<foo::MyEnum, String> {
    |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    | 
-  ::: $SRC_DIR/libcore/result.rs:LL:COL
+  ::: $SRC_DIR/core/src/result.rs:LL:COL
    |
 LL | pub enum Result<T, E> {
    | --------------------- similarly named enum `Result` defined here
diff --git a/src/test/ui/issues/issue-20433.stderr b/src/test/ui/issues/issue-20433.stderr
index 0e96b120669..fda3f2f5db7 100644
--- a/src/test/ui/issues/issue-20433.stderr
+++ b/src/test/ui/issues/issue-20433.stderr
@@ -4,7 +4,7 @@ error[E0277]: the size for values of type `[i32]` cannot be known at compilation
 LL |     fn iceman(c: Vec<[i32]>) {}
    |                  ^^^^^^^^^^ doesn't have a size known at compile-time
    | 
-  ::: $SRC_DIR/liballoc/vec.rs:LL:COL
+  ::: $SRC_DIR/alloc/src/vec.rs:LL:COL
    |
 LL | pub struct Vec<T> {
    |                - required by this bound in `std::vec::Vec`
diff --git a/src/test/ui/issues/issue-21160.stderr b/src/test/ui/issues/issue-21160.stderr
index 0c3d75c08ff..aaba014fcbe 100644
--- a/src/test/ui/issues/issue-21160.stderr
+++ b/src/test/ui/issues/issue-21160.stderr
@@ -4,7 +4,7 @@ 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
+  ::: $SRC_DIR/core/src/hash/mod.rs:LL:COL
    |
 LL |     fn hash<H: Hasher>(&self, state: &mut H);
    |             - required by this bound in `std::hash::Hash::hash`
diff --git a/src/test/ui/issues/issue-27033.stderr b/src/test/ui/issues/issue-27033.stderr
index 3bd7469afff..ad48fc23a38 100644
--- a/src/test/ui/issues/issue-27033.stderr
+++ b/src/test/ui/issues/issue-27033.stderr
@@ -4,7 +4,7 @@ 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
+  ::: $SRC_DIR/std/src/prelude/v1.rs:LL:COL
    |
 LL | pub use crate::option::Option::{self, None, Some};
    |                                       ---- the unit variant `None` is defined here
diff --git a/src/test/ui/issues/issue-2823.stderr b/src/test/ui/issues/issue-2823.stderr
index 0cdc501d568..fc38f4b61f3 100644
--- a/src/test/ui/issues/issue-2823.stderr
+++ b/src/test/ui/issues/issue-2823.stderr
@@ -7,7 +7,7 @@ LL | struct C {
 LL |     let _d = c.clone();
    |                ^^^^^ method not found in `C`
    | 
-  ::: $SRC_DIR/libcore/clone.rs:LL:COL
+  ::: $SRC_DIR/core/src/clone.rs:LL:COL
    |
 LL |     fn clone(&self) -> Self;
    |        -----
diff --git a/src/test/ui/issues/issue-31173.stderr b/src/test/ui/issues/issue-31173.stderr
index 62c9e566d86..23a1a27675c 100644
--- a/src/test/ui/issues/issue-31173.stderr
+++ b/src/test/ui/issues/issue-31173.stderr
@@ -13,7 +13,7 @@ error[E0599]: no method named `collect` found for struct `std::iter::Cloned<std:
 LL |         .collect();
    |          ^^^^^^^ method not found in `std::iter::Cloned<std::iter::TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:6:39: 9:6 found_e:_]>>`
    | 
-  ::: $SRC_DIR/libcore/iter/adapters/mod.rs:LL:COL
+  ::: $SRC_DIR/core/src/iter/adapters/mod.rs:LL:COL
    |
 LL | pub struct Cloned<I> {
    | -------------------- doesn't satisfy `_: std::iter::Iterator`
diff --git a/src/test/ui/issues/issue-38857.stderr b/src/test/ui/issues/issue-38857.stderr
index ed700ff95e5..e9d229f74e8 100644
--- a/src/test/ui/issues/issue-38857.stderr
+++ b/src/test/ui/issues/issue-38857.stderr
@@ -11,7 +11,7 @@ LL |     let a = std::sys::imp::process::process_common::StdioPipes { ..panic!()
    |                  ^^^ private module
    |
 note: the module `sys` is defined here
-  --> $SRC_DIR/libstd/lib.rs:LL:COL
+  --> $SRC_DIR/std/src/lib.rs:LL:COL
    |
 LL | mod sys;
    | ^^^^^^^^
diff --git a/src/test/ui/issues/issue-61108.stderr b/src/test/ui/issues/issue-61108.stderr
index ba43f2d33ee..d7c2bbf9175 100644
--- a/src/test/ui/issues/issue-61108.stderr
+++ b/src/test/ui/issues/issue-61108.stderr
@@ -13,7 +13,7 @@ LL |     bad_letters.push('s');
    |     ^^^^^^^^^^^ value borrowed here after move
    |
 note: this function consumes the receiver `self` by taking ownership of it, which moves `bad_letters`
-  --> $SRC_DIR/libcore/iter/traits/collect.rs:LL:COL
+  --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
    |
 LL |     fn into_iter(self) -> Self::IntoIter;
    |                  ^^^^
diff --git a/src/test/ui/issues/issue-64559.stderr b/src/test/ui/issues/issue-64559.stderr
index 2c337bae130..e942a1aeba3 100644
--- a/src/test/ui/issues/issue-64559.stderr
+++ b/src/test/ui/issues/issue-64559.stderr
@@ -14,7 +14,7 @@ LL |     let _closure = || orig;
    |                    value used here after move
    |
 note: this function consumes the receiver `self` by taking ownership of it, which moves `orig`
-  --> $SRC_DIR/libcore/iter/traits/collect.rs:LL:COL
+  --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
    |
 LL |     fn into_iter(self) -> Self::IntoIter;
    |                  ^^^^
diff --git a/src/test/ui/issues/issue-69725.stderr b/src/test/ui/issues/issue-69725.stderr
index d9d61fe66f7..20420d37b3e 100644
--- a/src/test/ui/issues/issue-69725.stderr
+++ b/src/test/ui/issues/issue-69725.stderr
@@ -9,7 +9,7 @@ LL |     let _ = Struct::<A>::new().clone();
 LL | pub struct Struct<A>(A);
    | ------------------------ doesn't satisfy `issue_69725::Struct<A>: std::clone::Clone`
    | 
-  ::: $SRC_DIR/libcore/clone.rs:LL:COL
+  ::: $SRC_DIR/core/src/clone.rs:LL:COL
    |
 LL |     fn clone(&self) -> Self;
    |        -----
diff --git a/src/test/ui/issues/issue-7607-1.stderr b/src/test/ui/issues/issue-7607-1.stderr
index e86896a5681..0520eada499 100644
--- a/src/test/ui/issues/issue-7607-1.stderr
+++ b/src/test/ui/issues/issue-7607-1.stderr
@@ -4,7 +4,7 @@ error[E0412]: cannot find type `Fo` in this scope
 LL | impl Fo {
    |      ^^ help: a trait with a similar name exists: `Fn`
    | 
-  ::: $SRC_DIR/libcore/ops/function.rs:LL:COL
+  ::: $SRC_DIR/core/src/ops/function.rs:LL:COL
    |
 LL | pub trait Fn<Args>: FnMut<Args> {
    | ------------------------------- similarly named trait `Fn` defined here