Skip to content

Commit 3679077

Browse files
committed
Fix $SRC_DIR_REAL definition in remap-path-prefix sysroot test
1 parent b0c7f41 commit 3679077

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/tools/compiletest/src/runtest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2369,7 +2369,7 @@ impl<'test> TestCx<'test> {
23692369
let rust_src_dir = &self.config.sysroot_base.join("lib/rustlib/src/rust");
23702370
rust_src_dir.try_exists().expect(&*format!("{} should exists", rust_src_dir));
23712371
let rust_src_dir = rust_src_dir.read_link_utf8().unwrap_or(rust_src_dir.to_path_buf());
2372-
normalize_path(&rust_src_dir.join("library"), "$SRC_DIR_REAL");
2372+
normalize_path(&rust_src_dir, "$SRC_DIR_REAL");
23732373

23742374
// eg.
23752375
// /home/user/rust/build/x86_64-unknown-linux-gnu/test/ui/<test_dir>/$name.$revision.$mode/

tests/ui/errors/remap-path-prefix-sysroot.without-remap.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LL | self.thread.join().unwrap();
77
| move occurs because `self.thread` has type `JoinHandle<()>`, which does not implement the `Copy` trait
88
|
99
note: `JoinHandle::<T>::join` takes ownership of the receiver `self`, which moves `self.thread`
10-
--> $SRC_DIR_REAL/std/src/thread/mod.rs:LL:COL
10+
--> $SRC_DIR_REAL/library/std/src/thread/mod.rs:LL:COL
1111
|
1212
LL | pub fn join(self) -> Result<T> {
1313
| ^^^^

0 commit comments

Comments
 (0)