about summary refs log tree commit diff
path: root/tests/ui/track-diagnostics
diff options
context:
space:
mode:
authorjyn <github@jyn.dev>2023-05-25 20:42:13 -0500
committerjyn <github@jyn.dev>2023-05-26 12:16:30 -0500
commit157d936c31e4f5ff51cc6f20c748e16537f33b9c (patch)
tree1ce181b08b9fee921b6452a27c8be26b5bf66fd7 /tests/ui/track-diagnostics
parenteb9da7bfa375ad58bcb946115f3191a2756785e5 (diff)
downloadrust-157d936c31e4f5ff51cc6f20c748e16537f33b9c.tar.gz
rust-157d936c31e4f5ff51cc6f20c748e16537f33b9c.zip
Stop normalizing so many different prefixes
Previously, we would normalize *all* of
- the absolute path to the repository checkout
- the /rustc/$sha for stage1 (if `remap-debuginfo` was enabled)
- the /rustc/$sha for download-rustc
- the sysroot for download-rustc

Now, we consistently only normalize /rustc/FAKE_PREFIX. Not only is this
much simpler, but it also avoids ongoing maintenance for download-rustc
and makes it much less likely that tests break by accident.

- Change `tests/ui/track-diagnostics/track6.rs` to use a relative path
  instead of an absolute one. I am not actually sure why `track_caller`
works here, but it does seem to work :shrug:

- Pass `-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX` to all
  suites, not just UI. In particular, mir-opt tests emit /rustc/ paths
  in their output.
Diffstat (limited to 'tests/ui/track-diagnostics')
-rw-r--r--tests/ui/track-diagnostics/track6.stderr2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ui/track-diagnostics/track6.stderr b/tests/ui/track-diagnostics/track6.stderr
index 89438aea9ad..583b02555b4 100644
--- a/tests/ui/track-diagnostics/track6.stderr
+++ b/tests/ui/track-diagnostics/track6.stderr
@@ -3,7 +3,7 @@ error[E0658]: specialization is unstable
    |
 LL |     default fn bar() {}
    |     ^^^^^^^^^^^^^^^^^^^
--Ztrack-diagnostics: created at $COMPILER_DIR/rustc_session/src/parse.rs:LL:CC
+-Ztrack-diagnostics: created at compiler/rustc_ast_passes/src/feature_gate.rs:LL:CC
    |
    = note: see issue #31844 <https://github.com/rust-lang/rust/issues/31844> for more information
    = help: add `#![feature(specialization)]` to the crate attributes to enable