diff --git a/src/librustdoc/doctest.rs b/src/librustdoc/doctest.rs
index 9b4d25339541d..d0dccc2d604d0 100644
--- a/src/librustdoc/doctest.rs
+++ b/src/librustdoc/doctest.rs
@@ -853,12 +853,10 @@ impl ScrapedDocTest {
         global_crate_attrs: Vec<String>,
     ) -> Self {
         let mut item_path = logical_path.join("::");
-        item_path.retain(|c| c != ' ');
         if !item_path.is_empty() {
-            item_path.push(' ');
+            item_path.insert_str(0, " - ");
         }
-        let name =
-            format!("{} - {item_path}(line {line})", filename.prefer_remapped_unconditionally());
+        let name = format!("{}:{line}{item_path}", filename.prefer_remapped_unconditionally());
 
         Self { filename, line, langstr, text, name, span, global_crate_attrs }
     }
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 933a32392bddf..7ebfddc5ab756 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2272,23 +2272,15 @@ impl<'test> TestCx<'test> {
 
         let mut tested = 0;
         for _ in res.stdout.split('\n').filter(|s| s.starts_with("test ")).inspect(|s| {
-            if let Some((left, right)) = s.split_once(" - ") {
-                let path = left.rsplit("test ").next().unwrap();
+            if let Some((left, _)) = s.split_once(" - ") {
+                let path_with_line = left.rsplit("test ").next().unwrap();
+                let (path, line_number) =
+                    path_with_line.rsplit_once(":").expect("line number not found");
                 let path = fs::canonicalize(&path).expect("failed to canonicalize");
                 let path = path.to_str().unwrap().replace('\\', "/");
                 if let Some(ref mut v) = files.get_mut(&path) {
                     tested += 1;
-                    let mut iter = right.split("(line ");
-                    iter.next();
-                    let line = iter
-                        .next()
-                        .unwrap_or(")")
-                        .split(')')
-                        .next()
-                        .unwrap_or("0")
-                        .parse()
-                        .unwrap_or(0);
-                    if let Ok(pos) = v.binary_search(&line) {
+                    if let Ok(pos) = v.binary_search(&line_number.parse::<usize>().unwrap_or(0)) {
                         v.remove(pos);
                     } else {
                         self.fatal_proc_rec(
diff --git a/tests/run-make/doctests-merge/doctest-2021.stdout b/tests/run-make/doctests-merge/doctest-2021.stdout
index 7da08d68faae3..a6612766d0fa5 100644
--- a/tests/run-make/doctests-merge/doctest-2021.stdout
+++ b/tests/run-make/doctests-merge/doctest-2021.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test doctest.rs - (line 4) ... ok
-test doctest.rs - init (line 8) ... ok
+test doctest.rs:4 ... ok
+test doctest.rs:8 - init ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/run-make/doctests-merge/doctest-2024.stdout b/tests/run-make/doctests-merge/doctest-2024.stdout
index 7da08d68faae3..a6612766d0fa5 100644
--- a/tests/run-make/doctests-merge/doctest-2024.stdout
+++ b/tests/run-make/doctests-merge/doctest-2024.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test doctest.rs - (line 4) ... ok
-test doctest.rs - init (line 8) ... ok
+test doctest.rs:4 ... ok
+test doctest.rs:8 - init ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/run-make/doctests-merge/doctest-standalone.stdout b/tests/run-make/doctests-merge/doctest-standalone.stdout
index ee9f62326ab02..842f6cde22736 100644
--- a/tests/run-make/doctests-merge/doctest-standalone.stdout
+++ b/tests/run-make/doctests-merge/doctest-standalone.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test doctest-standalone.rs - (line 4) ... ok
-test doctest-standalone.rs - init (line 8) ... ok
+test doctest-standalone.rs:4 ... ok
+test doctest-standalone.rs:8 - init ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/run-make/rustdoc-cfgspec-parsing/rmake.rs b/tests/run-make/rustdoc-cfgspec-parsing/rmake.rs
index 9c8c71b19a620..703a977ab90ab 100644
--- a/tests/run-make/rustdoc-cfgspec-parsing/rmake.rs
+++ b/tests/run-make/rustdoc-cfgspec-parsing/rmake.rs
@@ -17,5 +17,5 @@ fn main() {
         .library_search_path(cwd())
         .input("foo.rs")
         .run()
-        .assert_stdout_contains("foo.rs - foo (line 1) ... ok");
+        .assert_stdout_contains("foo.rs:1 - foo ... ok");
 }
diff --git a/tests/run-make/rustdoc-error-lines/rmake.rs b/tests/run-make/rustdoc-error-lines/rmake.rs
index e15d91e9387af..5ac37cb0d8bcb 100644
--- a/tests/run-make/rustdoc-error-lines/rmake.rs
+++ b/tests/run-make/rustdoc-error-lines/rmake.rs
@@ -9,11 +9,11 @@ fn main() {
     let output = rustdoc().input("input.rs").arg("--test").run_fail().stdout_utf8();
 
     let should_contain = &[
-        "input.rs - foo (line 5)",
+        "input.rs:5 - foo",
         "input.rs:8:15",
-        "input.rs - bar (line 13)",
+        "input.rs:13 - bar",
         "input.rs:16:15",
-        "input.rs - bar (line 22)",
+        "input.rs:22 - bar",
         "input.rs:25:15",
     ];
     for text in should_contain {
diff --git a/tests/rustdoc-ui/2024-doctests-checks.stdout b/tests/rustdoc-ui/2024-doctests-checks.stdout
index 534fe466fe701..62363f5d5e9de 100644
--- a/tests/rustdoc-ui/2024-doctests-checks.stdout
+++ b/tests/rustdoc-ui/2024-doctests-checks.stdout
@@ -1,12 +1,12 @@
 
 running 1 test
-test $DIR/2024-doctests-checks.rs - Foo (line 8) ... ok
+test $DIR/2024-doctests-checks.rs:8 - Foo ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
 
 running 1 test
-test $DIR/2024-doctests-checks.rs - Foo (line 15) ... ok
+test $DIR/2024-doctests-checks.rs:15 - Foo ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/2024-doctests-crate-attribute.stdout b/tests/rustdoc-ui/2024-doctests-crate-attribute.stdout
index c084ac4522e8a..a938dcd542907 100644
--- a/tests/rustdoc-ui/2024-doctests-crate-attribute.stdout
+++ b/tests/rustdoc-ui/2024-doctests-crate-attribute.stdout
@@ -1,12 +1,12 @@
 
 running 1 test
-test $DIR/2024-doctests-crate-attribute.rs - Foo (line 20) ... ok
+test $DIR/2024-doctests-crate-attribute.rs:20 - Foo ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
 
 running 1 test
-test $DIR/2024-doctests-crate-attribute.rs - Foo (line 11) ... ok
+test $DIR/2024-doctests-crate-attribute.rs:11 - Foo ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/cfg-test.stdout b/tests/rustdoc-ui/doctest/cfg-test.stdout
index 2960ff8d3b473..5766d3f161523 100644
--- a/tests/rustdoc-ui/doctest/cfg-test.stdout
+++ b/tests/rustdoc-ui/doctest/cfg-test.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test $DIR/cfg-test.rs - Bar (line 27) ... ok
-test $DIR/cfg-test.rs - Foo (line 19) ... ok
+test $DIR/cfg-test.rs:19 - Foo ... ok
+test $DIR/cfg-test.rs:27 - Bar ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/check-cfg-test.stdout b/tests/rustdoc-ui/doctest/check-cfg-test.stdout
index b7db49bcfa87a..b73cbd81978a1 100644
--- a/tests/rustdoc-ui/doctest/check-cfg-test.stdout
+++ b/tests/rustdoc-ui/doctest/check-cfg-test.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/check-cfg-test.rs - Foo (line 8) ... ok
+test $DIR/check-cfg-test.rs:8 - Foo ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/comment-in-attr-134221-2.stdout b/tests/rustdoc-ui/doctest/comment-in-attr-134221-2.stdout
index 0baff3df14431..8ab1a268d7ee5 100644
--- a/tests/rustdoc-ui/doctest/comment-in-attr-134221-2.stdout
+++ b/tests/rustdoc-ui/doctest/comment-in-attr-134221-2.stdout
@@ -1,11 +1,11 @@
 
 running 2 tests
-test $DIR/comment-in-attr-134221-2.rs - (line 11) ... FAILED
-test $DIR/comment-in-attr-134221-2.rs - (line 7) ... ok
+test $DIR/comment-in-attr-134221-2.rs:11 ... FAILED
+test $DIR/comment-in-attr-134221-2.rs:7 ... ok
 
 failures:
 
----- $DIR/comment-in-attr-134221-2.rs - (line 11) stdout ----
+---- $DIR/comment-in-attr-134221-2.rs:11 stdout ----
 error: unknown start of token: \
   --> $DIR/comment-in-attr-134221-2.rs:$LINE:$COL
    |
@@ -25,7 +25,7 @@ error: aborting due to 2 previous errors
 Couldn't compile the test.
 
 failures:
-    $DIR/comment-in-attr-134221-2.rs - (line 11)
+    $DIR/comment-in-attr-134221-2.rs:11
 
 test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/comment-in-attr-134221.stdout b/tests/rustdoc-ui/doctest/comment-in-attr-134221.stdout
index aa1b27d1f0bd9..db0b2c6b73234 100644
--- a/tests/rustdoc-ui/doctest/comment-in-attr-134221.stdout
+++ b/tests/rustdoc-ui/doctest/comment-in-attr-134221.stdout
@@ -1,12 +1,12 @@
 
 running 3 tests
-test $DIR/comment-in-attr-134221.rs - (line 11) ... FAILED
-test $DIR/comment-in-attr-134221.rs - (line 17) ... FAILED
-test $DIR/comment-in-attr-134221.rs - (line 23) ... FAILED
+test $DIR/comment-in-attr-134221.rs:11 ... FAILED
+test $DIR/comment-in-attr-134221.rs:17 ... FAILED
+test $DIR/comment-in-attr-134221.rs:23 ... FAILED
 
 failures:
 
----- $DIR/comment-in-attr-134221.rs - (line 11) stdout ----
+---- $DIR/comment-in-attr-134221.rs:11 stdout ----
 error[E0635]: unknown feature `foo`
   --> $DIR/comment-in-attr-134221.rs:$LINE:$COL
    |
@@ -17,7 +17,7 @@ error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0635`.
 Couldn't compile the test.
----- $DIR/comment-in-attr-134221.rs - (line 17) stdout ----
+---- $DIR/comment-in-attr-134221.rs:17 stdout ----
 error[E0635]: unknown feature `foo`
   --> $DIR/comment-in-attr-134221.rs:$LINE:$COL
    |
@@ -28,7 +28,7 @@ error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0635`.
 Couldn't compile the test.
----- $DIR/comment-in-attr-134221.rs - (line 23) stdout ----
+---- $DIR/comment-in-attr-134221.rs:23 stdout ----
 error: this file contains an unclosed delimiter
   --> $DIR/comment-in-attr-134221.rs:$LINE:$COL
    |
@@ -42,9 +42,9 @@ error: aborting due to 1 previous error
 Couldn't compile the test.
 
 failures:
-    $DIR/comment-in-attr-134221.rs - (line 11)
-    $DIR/comment-in-attr-134221.rs - (line 17)
-    $DIR/comment-in-attr-134221.rs - (line 23)
+    $DIR/comment-in-attr-134221.rs:11
+    $DIR/comment-in-attr-134221.rs:17
+    $DIR/comment-in-attr-134221.rs:23
 
 test result: FAILED. 0 passed; 3 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/dead-code-2024.stdout b/tests/rustdoc-ui/doctest/dead-code-2024.stdout
index a943a177e10b6..698b5bfd005af 100644
--- a/tests/rustdoc-ui/doctest/dead-code-2024.stdout
+++ b/tests/rustdoc-ui/doctest/dead-code-2024.stdout
@@ -1,10 +1,10 @@
 
 running 1 test
-test $DIR/dead-code-2024.rs - f (line 13) - compile ... FAILED
+test $DIR/dead-code-2024.rs:13 - f - compile ... FAILED
 
 failures:
 
----- $DIR/dead-code-2024.rs - f (line 13) stdout ----
+---- $DIR/dead-code-2024.rs:13 - f stdout ----
 error: trait `T` is never used
   --> $DIR/dead-code-2024.rs:14:7
    |
@@ -23,7 +23,7 @@ error: aborting due to 1 previous error
 Couldn't compile the test.
 
 failures:
-    $DIR/dead-code-2024.rs - f (line 13)
+    $DIR/dead-code-2024.rs:13 - f
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/dead-code-items.stdout b/tests/rustdoc-ui/doctest/dead-code-items.stdout
index 4b9d8be94dd3c..c01b963fe1a0c 100644
--- a/tests/rustdoc-ui/doctest/dead-code-items.stdout
+++ b/tests/rustdoc-ui/doctest/dead-code-items.stdout
@@ -1,30 +1,30 @@
 
 running 13 tests
-test $DIR/dead-code-items.rs - A (line 32) - compile ... ok
-test $DIR/dead-code-items.rs - A (line 88) - compile ... ok
-test $DIR/dead-code-items.rs - A::field (line 39) - compile ... FAILED
-test $DIR/dead-code-items.rs - A::method (line 94) - compile ... ok
-test $DIR/dead-code-items.rs - C (line 22) - compile ... FAILED
-test $DIR/dead-code-items.rs - Enum (line 70) - compile ... FAILED
-test $DIR/dead-code-items.rs - Enum::Variant1 (line 77) - compile ... FAILED
-test $DIR/dead-code-items.rs - MyTrait (line 103) - compile ... FAILED
-test $DIR/dead-code-items.rs - MyTrait::my_trait_fn (line 110) - compile ... FAILED
-test $DIR/dead-code-items.rs - S (line 14) - compile ... ok
-test $DIR/dead-code-items.rs - U (line 48) - compile ... ok
-test $DIR/dead-code-items.rs - U::field (line 55) - compile ... FAILED
-test $DIR/dead-code-items.rs - U::field2 (line 61) - compile ... ok
+test $DIR/dead-code-items.rs:103 - MyTrait - compile ... FAILED
+test $DIR/dead-code-items.rs:110 - MyTrait::my_trait_fn - compile ... FAILED
+test $DIR/dead-code-items.rs:14 - S - compile ... ok
+test $DIR/dead-code-items.rs:22 - C - compile ... FAILED
+test $DIR/dead-code-items.rs:32 - A - compile ... ok
+test $DIR/dead-code-items.rs:39 - A::field - compile ... FAILED
+test $DIR/dead-code-items.rs:48 - U - compile ... ok
+test $DIR/dead-code-items.rs:55 - U::field - compile ... FAILED
+test $DIR/dead-code-items.rs:61 - U::field2 - compile ... ok
+test $DIR/dead-code-items.rs:70 - Enum - compile ... FAILED
+test $DIR/dead-code-items.rs:77 - Enum::Variant1 - compile ... FAILED
+test $DIR/dead-code-items.rs:88 - A - compile ... ok
+test $DIR/dead-code-items.rs:94 - A::method - compile ... ok
 
 failures:
 
----- $DIR/dead-code-items.rs - A::field (line 39) stdout ----
-error: trait `DeadCodeInField` is never used
-  --> $DIR/dead-code-items.rs:40:7
+---- $DIR/dead-code-items.rs:103 - MyTrait stdout ----
+error: trait `StillDeadCodeAtMyTrait` is never used
+  --> $DIR/dead-code-items.rs:104:7
    |
-LL | trait DeadCodeInField {}
-   |       ^^^^^^^^^^^^^^^
+LL | trait StillDeadCodeAtMyTrait { }
+   |       ^^^^^^^^^^^^^^^^^^^^^^
    |
 note: the lint level is defined here
-  --> $DIR/dead-code-items.rs:38:9
+  --> $DIR/dead-code-items.rs:102:9
    |
 LL | #![deny(dead_code)]
    |         ^^^^^^^^^
@@ -32,15 +32,15 @@ LL | #![deny(dead_code)]
 error: aborting due to 1 previous error
 
 Couldn't compile the test.
----- $DIR/dead-code-items.rs - C (line 22) stdout ----
-error: unused variable: `unused_error`
-  --> $DIR/dead-code-items.rs:23:5
+---- $DIR/dead-code-items.rs:110 - MyTrait::my_trait_fn stdout ----
+error: unused variable: `unused_in_impl`
+  --> $DIR/dead-code-items.rs:113:17
    |
-LL | let unused_error = 5;
-   |     ^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_unused_error`
+LL | fn main() { let unused_in_impl = 5; }
+   |                 ^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_unused_in_impl`
    |
 note: the lint level is defined here
-  --> $DIR/dead-code-items.rs:20:9
+  --> $DIR/dead-code-items.rs:108:9
    |
 LL | #![deny(warnings)]
    |         ^^^^^^^^
@@ -49,15 +49,15 @@ LL | #![deny(warnings)]
 error: aborting due to 1 previous error
 
 Couldn't compile the test.
----- $DIR/dead-code-items.rs - Enum (line 70) stdout ----
-error: unused variable: `not_dead_code_but_unused`
-  --> $DIR/dead-code-items.rs:71:5
+---- $DIR/dead-code-items.rs:22 - C stdout ----
+error: unused variable: `unused_error`
+  --> $DIR/dead-code-items.rs:23:5
    |
-LL | let not_dead_code_but_unused = 5;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_not_dead_code_but_unused`
+LL | let unused_error = 5;
+   |     ^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_unused_error`
    |
 note: the lint level is defined here
-  --> $DIR/dead-code-items.rs:68:9
+  --> $DIR/dead-code-items.rs:20:9
    |
 LL | #![deny(warnings)]
    |         ^^^^^^^^
@@ -66,32 +66,31 @@ LL | #![deny(warnings)]
 error: aborting due to 1 previous error
 
 Couldn't compile the test.
----- $DIR/dead-code-items.rs - Enum::Variant1 (line 77) stdout ----
-error: unused variable: `unused_in_variant`
-  --> $DIR/dead-code-items.rs:80:17
+---- $DIR/dead-code-items.rs:39 - A::field stdout ----
+error: trait `DeadCodeInField` is never used
+  --> $DIR/dead-code-items.rs:40:7
    |
-LL | fn main() { let unused_in_variant = 5; }
-   |                 ^^^^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_unused_in_variant`
+LL | trait DeadCodeInField {}
+   |       ^^^^^^^^^^^^^^^
    |
 note: the lint level is defined here
-  --> $DIR/dead-code-items.rs:75:9
+  --> $DIR/dead-code-items.rs:38:9
    |
-LL | #![deny(warnings)]
-   |         ^^^^^^^^
-   = note: `#[deny(unused_variables)]` implied by `#[deny(warnings)]`
+LL | #![deny(dead_code)]
+   |         ^^^^^^^^^
 
 error: aborting due to 1 previous error
 
 Couldn't compile the test.
----- $DIR/dead-code-items.rs - MyTrait (line 103) stdout ----
-error: trait `StillDeadCodeAtMyTrait` is never used
-  --> $DIR/dead-code-items.rs:104:7
+---- $DIR/dead-code-items.rs:55 - U::field stdout ----
+error: trait `DeadCodeInUnionField` is never used
+  --> $DIR/dead-code-items.rs:56:7
    |
-LL | trait StillDeadCodeAtMyTrait { }
-   |       ^^^^^^^^^^^^^^^^^^^^^^
+LL | trait DeadCodeInUnionField {}
+   |       ^^^^^^^^^^^^^^^^^^^^
    |
 note: the lint level is defined here
-  --> $DIR/dead-code-items.rs:102:9
+  --> $DIR/dead-code-items.rs:54:9
    |
 LL | #![deny(dead_code)]
    |         ^^^^^^^^^
@@ -99,15 +98,15 @@ LL | #![deny(dead_code)]
 error: aborting due to 1 previous error
 
 Couldn't compile the test.
----- $DIR/dead-code-items.rs - MyTrait::my_trait_fn (line 110) stdout ----
-error: unused variable: `unused_in_impl`
-  --> $DIR/dead-code-items.rs:113:17
+---- $DIR/dead-code-items.rs:70 - Enum stdout ----
+error: unused variable: `not_dead_code_but_unused`
+  --> $DIR/dead-code-items.rs:71:5
    |
-LL | fn main() { let unused_in_impl = 5; }
-   |                 ^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_unused_in_impl`
+LL | let not_dead_code_but_unused = 5;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_not_dead_code_but_unused`
    |
 note: the lint level is defined here
-  --> $DIR/dead-code-items.rs:108:9
+  --> $DIR/dead-code-items.rs:68:9
    |
 LL | #![deny(warnings)]
    |         ^^^^^^^^
@@ -116,31 +115,32 @@ LL | #![deny(warnings)]
 error: aborting due to 1 previous error
 
 Couldn't compile the test.
----- $DIR/dead-code-items.rs - U::field (line 55) stdout ----
-error: trait `DeadCodeInUnionField` is never used
-  --> $DIR/dead-code-items.rs:56:7
+---- $DIR/dead-code-items.rs:77 - Enum::Variant1 stdout ----
+error: unused variable: `unused_in_variant`
+  --> $DIR/dead-code-items.rs:80:17
    |
-LL | trait DeadCodeInUnionField {}
-   |       ^^^^^^^^^^^^^^^^^^^^
+LL | fn main() { let unused_in_variant = 5; }
+   |                 ^^^^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_unused_in_variant`
    |
 note: the lint level is defined here
-  --> $DIR/dead-code-items.rs:54:9
+  --> $DIR/dead-code-items.rs:75:9
    |
-LL | #![deny(dead_code)]
-   |         ^^^^^^^^^
+LL | #![deny(warnings)]
+   |         ^^^^^^^^
+   = note: `#[deny(unused_variables)]` implied by `#[deny(warnings)]`
 
 error: aborting due to 1 previous error
 
 Couldn't compile the test.
 
 failures:
-    $DIR/dead-code-items.rs - A::field (line 39)
-    $DIR/dead-code-items.rs - C (line 22)
-    $DIR/dead-code-items.rs - Enum (line 70)
-    $DIR/dead-code-items.rs - Enum::Variant1 (line 77)
-    $DIR/dead-code-items.rs - MyTrait (line 103)
-    $DIR/dead-code-items.rs - MyTrait::my_trait_fn (line 110)
-    $DIR/dead-code-items.rs - U::field (line 55)
+    $DIR/dead-code-items.rs:103 - MyTrait
+    $DIR/dead-code-items.rs:110 - MyTrait::my_trait_fn
+    $DIR/dead-code-items.rs:22 - C
+    $DIR/dead-code-items.rs:39 - A::field
+    $DIR/dead-code-items.rs:55 - U::field
+    $DIR/dead-code-items.rs:70 - Enum
+    $DIR/dead-code-items.rs:77 - Enum::Variant1
 
 test result: FAILED. 6 passed; 7 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/dead-code-module-2.stdout b/tests/rustdoc-ui/doctest/dead-code-module-2.stdout
index d44068dcbf5d7..29db916680f09 100644
--- a/tests/rustdoc-ui/doctest/dead-code-module-2.stdout
+++ b/tests/rustdoc-ui/doctest/dead-code-module-2.stdout
@@ -1,16 +1,16 @@
 
 running 1 test
-test $DIR/dead-code-module-2.rs - g (line 24) - compile ... ok
+test $DIR/dead-code-module-2.rs:24 - g - compile ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
 
 running 1 test
-test $DIR/dead-code-module-2.rs - my_mod::f (line 16) - compile ... FAILED
+test $DIR/dead-code-module-2.rs:16 - my_mod::f - compile ... FAILED
 
 failures:
 
----- $DIR/dead-code-module-2.rs - my_mod::f (line 16) stdout ----
+---- $DIR/dead-code-module-2.rs:16 - my_mod::f stdout ----
 error: trait `T` is never used
   --> $DIR/dead-code-module-2.rs:17:7
    |
@@ -29,7 +29,7 @@ error: aborting due to 1 previous error
 Couldn't compile the test.
 
 failures:
-    $DIR/dead-code-module-2.rs - my_mod::f (line 16)
+    $DIR/dead-code-module-2.rs:16 - my_mod::f
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/dead-code-module.stdout b/tests/rustdoc-ui/doctest/dead-code-module.stdout
index b5ccf225d25c7..74004313044fd 100644
--- a/tests/rustdoc-ui/doctest/dead-code-module.stdout
+++ b/tests/rustdoc-ui/doctest/dead-code-module.stdout
@@ -1,10 +1,10 @@
 
 running 1 test
-test $DIR/dead-code-module.rs - my_mod::f (line 14) - compile ... FAILED
+test $DIR/dead-code-module.rs:14 - my_mod::f - compile ... FAILED
 
 failures:
 
----- $DIR/dead-code-module.rs - my_mod::f (line 14) stdout ----
+---- $DIR/dead-code-module.rs:14 - my_mod::f stdout ----
 error: trait `T` is never used
   --> $DIR/dead-code-module.rs:15:7
    |
@@ -23,7 +23,7 @@ error: aborting due to 1 previous error
 Couldn't compile the test.
 
 failures:
-    $DIR/dead-code-module.rs - my_mod::f (line 14)
+    $DIR/dead-code-module.rs:14 - my_mod::f
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/dead-code.stdout b/tests/rustdoc-ui/doctest/dead-code.stdout
index 38d15d5c1bc6f..beaefe6101d67 100644
--- a/tests/rustdoc-ui/doctest/dead-code.stdout
+++ b/tests/rustdoc-ui/doctest/dead-code.stdout
@@ -1,10 +1,10 @@
 
 running 1 test
-test $DIR/dead-code.rs - f (line 12) - compile ... FAILED
+test $DIR/dead-code.rs:12 - f - compile ... FAILED
 
 failures:
 
----- $DIR/dead-code.rs - f (line 12) stdout ----
+---- $DIR/dead-code.rs:12 - f stdout ----
 error: trait `T` is never used
   --> $DIR/dead-code.rs:13:7
    |
@@ -23,7 +23,7 @@ error: aborting due to 1 previous error
 Couldn't compile the test.
 
 failures:
-    $DIR/dead-code.rs - f (line 12)
+    $DIR/dead-code.rs:12 - f
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/display-output.stdout b/tests/rustdoc-ui/doctest/display-output.stdout
index 45e107b2c70f9..3dd621cd7ac6c 100644
--- a/tests/rustdoc-ui/doctest/display-output.stdout
+++ b/tests/rustdoc-ui/doctest/display-output.stdout
@@ -1,10 +1,10 @@
 
 running 1 test
-test $DIR/display-output.rs - foo (line 9) ... ok
+test $DIR/display-output.rs:9 - foo ... ok
 
 successes:
 
----- $DIR/display-output.rs - foo (line 9) stdout ----
+---- $DIR/display-output.rs:9 - foo stdout ----
 warning: unused variable: `x`
   --> $DIR/display-output.rs:12:5
    |
@@ -37,7 +37,7 @@ warning: 3 warnings emitted
 
 
 successes:
-    $DIR/display-output.rs - foo (line 9)
+    $DIR/display-output.rs:9 - foo
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/doc-comment-multi-line-attr.stdout b/tests/rustdoc-ui/doctest/doc-comment-multi-line-attr.stdout
index e47edbd2a81a0..249ad8aad38a7 100644
--- a/tests/rustdoc-ui/doctest/doc-comment-multi-line-attr.stdout
+++ b/tests/rustdoc-ui/doctest/doc-comment-multi-line-attr.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/doc-comment-multi-line-attr.rs - (line 7) ... ok
+test $DIR/doc-comment-multi-line-attr.rs:7 ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/doc-comment-multi-line-cfg-attr.stdout b/tests/rustdoc-ui/doctest/doc-comment-multi-line-cfg-attr.stdout
index bf3521e4f9177..cec3d8ad14a69 100644
--- a/tests/rustdoc-ui/doctest/doc-comment-multi-line-cfg-attr.stdout
+++ b/tests/rustdoc-ui/doctest/doc-comment-multi-line-cfg-attr.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/doc-comment-multi-line-cfg-attr.rs - Bar (line 6) ... ok
+test $DIR/doc-comment-multi-line-cfg-attr.rs:6 - Bar ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/doc-test-doctest-feature.stdout b/tests/rustdoc-ui/doctest/doc-test-doctest-feature.stdout
index d7de1f105228f..d0ecb46d75b24 100644
--- a/tests/rustdoc-ui/doctest/doc-test-doctest-feature.stdout
+++ b/tests/rustdoc-ui/doctest/doc-test-doctest-feature.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/doc-test-doctest-feature.rs - Foo (line 9) ... ok
+test $DIR/doc-test-doctest-feature.rs:9 - Foo ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/doc-test-rustdoc-feature.stdout b/tests/rustdoc-ui/doctest/doc-test-rustdoc-feature.stdout
index 5b07fc4c87af5..f5caafb1ac74b 100644
--- a/tests/rustdoc-ui/doctest/doc-test-rustdoc-feature.stdout
+++ b/tests/rustdoc-ui/doctest/doc-test-rustdoc-feature.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/doc-test-rustdoc-feature.rs - Foo (line 10) ... ok
+test $DIR/doc-test-rustdoc-feature.rs:10 - Foo ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/doctest-multiline-crate-attribute.stdout b/tests/rustdoc-ui/doctest/doctest-multiline-crate-attribute.stdout
index 07a4f657dea6a..e74a916851c58 100644
--- a/tests/rustdoc-ui/doctest/doctest-multiline-crate-attribute.stdout
+++ b/tests/rustdoc-ui/doctest/doctest-multiline-crate-attribute.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/doctest-multiline-crate-attribute.rs - f (line 6) ... ok
+test $DIR/doctest-multiline-crate-attribute.rs:6 - f ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/doctest-output-include-fail.stdout b/tests/rustdoc-ui/doctest/doctest-output-include-fail.stdout
index 22d15f8743c68..983e7f95184bd 100644
--- a/tests/rustdoc-ui/doctest/doctest-output-include-fail.stdout
+++ b/tests/rustdoc-ui/doctest/doctest-output-include-fail.stdout
@@ -1,10 +1,10 @@
 
 running 1 test
-test $DIR/doctest-output-include-fail.md - (line 3) ... FAILED
+test $DIR/doctest-output-include-fail.md:3 ... FAILED
 
 failures:
 
----- $DIR/doctest-output-include-fail.md - (line 3) stdout ----
+---- $DIR/doctest-output-include-fail.md:3 stdout ----
 error: expected `;`, found `}`
   --> $DIR/doctest-output-include-fail.md:5:16
    |
@@ -18,7 +18,7 @@ error: aborting due to 1 previous error
 Couldn't compile the test.
 
 failures:
-    $DIR/doctest-output-include-fail.md - (line 3)
+    $DIR/doctest-output-include-fail.md:3
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/doctest-output.edition2015.stdout b/tests/rustdoc-ui/doctest/doctest-output.edition2015.stdout
index 0e2e30390ad93..a8406191721f5 100644
--- a/tests/rustdoc-ui/doctest/doctest-output.edition2015.stdout
+++ b/tests/rustdoc-ui/doctest/doctest-output.edition2015.stdout
@@ -1,8 +1,8 @@
 
 running 3 tests
-test $DIR/doctest-output.rs - (line 12) ... ok
-test $DIR/doctest-output.rs - ExpandedStruct (line 28) ... ok
-test $DIR/doctest-output.rs - foo::bar (line 22) ... ok
+test $DIR/doctest-output.rs:12 ... ok
+test $DIR/doctest-output.rs:22 - foo::bar ... ok
+test $DIR/doctest-output.rs:28 - ExpandedStruct ... ok
 
 test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/doctest-output.edition2024.stdout b/tests/rustdoc-ui/doctest/doctest-output.edition2024.stdout
index 0e2e30390ad93..a8406191721f5 100644
--- a/tests/rustdoc-ui/doctest/doctest-output.edition2024.stdout
+++ b/tests/rustdoc-ui/doctest/doctest-output.edition2024.stdout
@@ -1,8 +1,8 @@
 
 running 3 tests
-test $DIR/doctest-output.rs - (line 12) ... ok
-test $DIR/doctest-output.rs - ExpandedStruct (line 28) ... ok
-test $DIR/doctest-output.rs - foo::bar (line 22) ... ok
+test $DIR/doctest-output.rs:12 ... ok
+test $DIR/doctest-output.rs:22 - foo::bar ... ok
+test $DIR/doctest-output.rs:28 - ExpandedStruct ... ok
 
 test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/edition-2024-error-output.stdout b/tests/rustdoc-ui/doctest/edition-2024-error-output.stdout
index 273d707123734..9afb644d1c694 100644
--- a/tests/rustdoc-ui/doctest/edition-2024-error-output.stdout
+++ b/tests/rustdoc-ui/doctest/edition-2024-error-output.stdout
@@ -1,10 +1,10 @@
 
 running 1 test
-test $DIR/edition-2024-error-output.rs - (line 12) ... FAILED
+test $DIR/edition-2024-error-output.rs:12 ... FAILED
 
 failures:
 
----- $DIR/edition-2024-error-output.rs - (line 12) stdout ----
+---- $DIR/edition-2024-error-output.rs:12 stdout ----
 Test executable failed (exit status: 101).
 
 stderr:
@@ -18,7 +18,7 @@ note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 
 
 failures:
-    $DIR/edition-2024-error-output.rs - (line 12)
+    $DIR/edition-2024-error-output.rs:12
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/extern-crate.stdout b/tests/rustdoc-ui/doctest/extern-crate.stdout
index b103343afdd57..fb5b13de880f8 100644
--- a/tests/rustdoc-ui/doctest/extern-crate.stdout
+++ b/tests/rustdoc-ui/doctest/extern-crate.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/extern-crate.rs - foo (line 9) ... ok
+test $DIR/extern-crate.rs:9 - foo ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/failed-doctest-compile-fail.stdout b/tests/rustdoc-ui/doctest/failed-doctest-compile-fail.stdout
index af3a90a74100f..fbe3643db9352 100644
--- a/tests/rustdoc-ui/doctest/failed-doctest-compile-fail.stdout
+++ b/tests/rustdoc-ui/doctest/failed-doctest-compile-fail.stdout
@@ -1,14 +1,14 @@
 
 running 1 test
-test $DIR/failed-doctest-compile-fail.rs - Foo (line 9) - compile fail ... FAILED
+test $DIR/failed-doctest-compile-fail.rs:9 - Foo - compile fail ... FAILED
 
 failures:
 
----- $DIR/failed-doctest-compile-fail.rs - Foo (line 9) stdout ----
+---- $DIR/failed-doctest-compile-fail.rs:9 - Foo stdout ----
 Test compiled successfully, but it's marked `compile_fail`.
 
 failures:
-    $DIR/failed-doctest-compile-fail.rs - Foo (line 9)
+    $DIR/failed-doctest-compile-fail.rs:9 - Foo
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/failed-doctest-extra-semicolon-on-item.stdout b/tests/rustdoc-ui/doctest/failed-doctest-extra-semicolon-on-item.stdout
index 1068b98cb0fbb..6d4133add9aaf 100644
--- a/tests/rustdoc-ui/doctest/failed-doctest-extra-semicolon-on-item.stdout
+++ b/tests/rustdoc-ui/doctest/failed-doctest-extra-semicolon-on-item.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/failed-doctest-extra-semicolon-on-item.rs - m (line 11) ... ok
+test $DIR/failed-doctest-extra-semicolon-on-item.rs:11 - m ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/failed-doctest-missing-codes.stdout b/tests/rustdoc-ui/doctest/failed-doctest-missing-codes.stdout
index 11355c232fe10..85978c5ceece7 100644
--- a/tests/rustdoc-ui/doctest/failed-doctest-missing-codes.stdout
+++ b/tests/rustdoc-ui/doctest/failed-doctest-missing-codes.stdout
@@ -1,10 +1,10 @@
 
 running 1 test
-test $DIR/failed-doctest-missing-codes.rs - Foo (line 9) - compile fail ... FAILED
+test $DIR/failed-doctest-missing-codes.rs:9 - Foo - compile fail ... FAILED
 
 failures:
 
----- $DIR/failed-doctest-missing-codes.rs - Foo (line 9) stdout ----
+---- $DIR/failed-doctest-missing-codes.rs:9 - Foo stdout ----
 error[E0308]: mismatched types
   --> $DIR/failed-doctest-missing-codes.rs:10:13
    |
@@ -19,7 +19,7 @@ For more information about this error, try `rustc --explain E0308`.
 Some expected error codes were not found: ["E0004"]
 
 failures:
-    $DIR/failed-doctest-missing-codes.rs - Foo (line 9)
+    $DIR/failed-doctest-missing-codes.rs:9 - Foo
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/failed-doctest-output-windows.stdout b/tests/rustdoc-ui/doctest/failed-doctest-output-windows.stdout
index 7aa965d543b12..0dfe6436d4b2b 100644
--- a/tests/rustdoc-ui/doctest/failed-doctest-output-windows.stdout
+++ b/tests/rustdoc-ui/doctest/failed-doctest-output-windows.stdout
@@ -1,11 +1,11 @@
 
 running 2 tests
-test $DIR/failed-doctest-output-windows.rs - OtherStruct (line 25) ... FAILED
-test $DIR/failed-doctest-output-windows.rs - SomeStruct (line 15) ... FAILED
+test $DIR/failed-doctest-output-windows.rs:25 - OtherStruct ... FAILED
+test $DIR/failed-doctest-output-windows.rs:15 - SomeStruct ... FAILED
 
 failures:
 
----- $DIR/failed-doctest-output-windows.rs - OtherStruct (line 25) stdout ----
+---- $DIR/failed-doctest-output-windows.rs:25 - OtherStruct stdout ----
 error[E0425]: cannot find value `no` in this scope
   --> $DIR/failed-doctest-output-windows.rs:26:1
    |
@@ -16,7 +16,7 @@ error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0425`.
 Couldn't compile the test.
----- $DIR/failed-doctest-output-windows.rs - SomeStruct (line 15) stdout ----
+---- $DIR/failed-doctest-output-windows.rs:15 - SomeStruct stdout ----
 Test executable failed (exit code: 101).
 
 stdout:
@@ -34,8 +34,8 @@ note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 
 
 failures:
-    $DIR/failed-doctest-output-windows.rs - OtherStruct (line 25)
-    $DIR/failed-doctest-output-windows.rs - SomeStruct (line 15)
+    $DIR/failed-doctest-output-windows.rs:25 - OtherStruct
+    $DIR/failed-doctest-output-windows.rs:15 - SomeStruct
 
 test result: FAILED. 0 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/failed-doctest-output.stdout b/tests/rustdoc-ui/doctest/failed-doctest-output.stdout
index a333f341ce539..529c9a0d72a24 100644
--- a/tests/rustdoc-ui/doctest/failed-doctest-output.stdout
+++ b/tests/rustdoc-ui/doctest/failed-doctest-output.stdout
@@ -1,22 +1,11 @@
 
 running 2 tests
-test $DIR/failed-doctest-output.rs - OtherStruct (line 25) ... FAILED
-test $DIR/failed-doctest-output.rs - SomeStruct (line 15) ... FAILED
+test $DIR/failed-doctest-output.rs:15 - SomeStruct ... FAILED
+test $DIR/failed-doctest-output.rs:25 - OtherStruct ... FAILED
 
 failures:
 
----- $DIR/failed-doctest-output.rs - OtherStruct (line 25) stdout ----
-error[E0425]: cannot find value `no` in this scope
-  --> $DIR/failed-doctest-output.rs:26:1
-   |
-LL | no
-   | ^^ not found in this scope
-
-error: aborting due to 1 previous error
-
-For more information about this error, try `rustc --explain E0425`.
-Couldn't compile the test.
----- $DIR/failed-doctest-output.rs - SomeStruct (line 15) stdout ----
+---- $DIR/failed-doctest-output.rs:15 - SomeStruct stdout ----
 Test executable failed (exit status: 101).
 
 stdout:
@@ -32,10 +21,21 @@ oh no
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 
 
+---- $DIR/failed-doctest-output.rs:25 - OtherStruct stdout ----
+error[E0425]: cannot find value `no` in this scope
+  --> $DIR/failed-doctest-output.rs:26:1
+   |
+LL | no
+   | ^^ not found in this scope
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0425`.
+Couldn't compile the test.
 
 failures:
-    $DIR/failed-doctest-output.rs - OtherStruct (line 25)
-    $DIR/failed-doctest-output.rs - SomeStruct (line 15)
+    $DIR/failed-doctest-output.rs:15 - SomeStruct
+    $DIR/failed-doctest-output.rs:25 - OtherStruct
 
 test result: FAILED. 0 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/failed-doctest-should-panic-2021.stdout b/tests/rustdoc-ui/doctest/failed-doctest-should-panic-2021.stdout
index 9f4d60e6f4de5..0006b53f8bd37 100644
--- a/tests/rustdoc-ui/doctest/failed-doctest-should-panic-2021.stdout
+++ b/tests/rustdoc-ui/doctest/failed-doctest-should-panic-2021.stdout
@@ -1,14 +1,14 @@
 
 running 1 test
-test $DIR/failed-doctest-should-panic-2021.rs - Foo (line 10) ... FAILED
+test $DIR/failed-doctest-should-panic-2021.rs:10 - Foo ... FAILED
 
 failures:
 
----- $DIR/failed-doctest-should-panic-2021.rs - Foo (line 10) stdout ----
+---- $DIR/failed-doctest-should-panic-2021.rs:10 - Foo stdout ----
 Test executable succeeded, but it's marked `should_panic`.
 
 failures:
-    $DIR/failed-doctest-should-panic-2021.rs - Foo (line 10)
+    $DIR/failed-doctest-should-panic-2021.rs:10 - Foo
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/failed-doctest-should-panic.stdout b/tests/rustdoc-ui/doctest/failed-doctest-should-panic.stdout
index 2b04b77c9dc5c..65cdcb0541e79 100644
--- a/tests/rustdoc-ui/doctest/failed-doctest-should-panic.stdout
+++ b/tests/rustdoc-ui/doctest/failed-doctest-should-panic.stdout
@@ -1,14 +1,14 @@
 
 running 1 test
-test $DIR/failed-doctest-should-panic.rs - Foo (line 10) - should panic ... FAILED
+test $DIR/failed-doctest-should-panic.rs:10 - Foo - should panic ... FAILED
 
 failures:
 
----- $DIR/failed-doctest-should-panic.rs - Foo (line 10) stdout ----
+---- $DIR/failed-doctest-should-panic.rs:10 - Foo stdout ----
 note: test did not panic as expected at $DIR/failed-doctest-should-panic.rs:10:0
 
 failures:
-    $DIR/failed-doctest-should-panic.rs - Foo (line 10)
+    $DIR/failed-doctest-should-panic.rs:10 - Foo
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/failed-doctest-test-crate.edition2015.stdout b/tests/rustdoc-ui/doctest/failed-doctest-test-crate.edition2015.stdout
index ce767fb8443d8..ea964a1ef8051 100644
--- a/tests/rustdoc-ui/doctest/failed-doctest-test-crate.edition2015.stdout
+++ b/tests/rustdoc-ui/doctest/failed-doctest-test-crate.edition2015.stdout
@@ -1,10 +1,10 @@
 
 running 1 test
-test $DIR/failed-doctest-test-crate.rs - m (line 14) ... FAILED
+test $DIR/failed-doctest-test-crate.rs:14 - m ... FAILED
 
 failures:
 
----- $DIR/failed-doctest-test-crate.rs - m (line 14) stdout ----
+---- $DIR/failed-doctest-test-crate.rs:14 - m stdout ----
 error[E0432]: unresolved import `test`
   --> $DIR/failed-doctest-test-crate.rs:15:5
    |
@@ -22,7 +22,7 @@ For more information about this error, try `rustc --explain E0432`.
 Couldn't compile the test.
 
 failures:
-    $DIR/failed-doctest-test-crate.rs - m (line 14)
+    $DIR/failed-doctest-test-crate.rs:14 - m
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/failed-doctest-test-crate.edition2024.stdout b/tests/rustdoc-ui/doctest/failed-doctest-test-crate.edition2024.stdout
index 80642e93bbde7..c48bed24a2f23 100644
--- a/tests/rustdoc-ui/doctest/failed-doctest-test-crate.edition2024.stdout
+++ b/tests/rustdoc-ui/doctest/failed-doctest-test-crate.edition2024.stdout
@@ -1,10 +1,10 @@
 
 running 1 test
-test $DIR/failed-doctest-test-crate.rs - m (line 14) ... FAILED
+test $DIR/failed-doctest-test-crate.rs:14 - m ... FAILED
 
 failures:
 
----- $DIR/failed-doctest-test-crate.rs - m (line 14) stdout ----
+---- $DIR/failed-doctest-test-crate.rs:14 - m stdout ----
 error[E0432]: unresolved import `test`
   --> $DIR/failed-doctest-test-crate.rs:15:5
    |
@@ -19,7 +19,7 @@ For more information about this error, try `rustc --explain E0432`.
 Couldn't compile the test.
 
 failures:
-    $DIR/failed-doctest-test-crate.rs - m (line 14)
+    $DIR/failed-doctest-test-crate.rs:14 - m
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/main-alongside-macro-calls.fail.stdout b/tests/rustdoc-ui/doctest/main-alongside-macro-calls.fail.stdout
index 65989a8ef47c7..e9a8b2105c21d 100644
--- a/tests/rustdoc-ui/doctest/main-alongside-macro-calls.fail.stdout
+++ b/tests/rustdoc-ui/doctest/main-alongside-macro-calls.fail.stdout
@@ -1,13 +1,13 @@
 
 running 4 tests
-test $DIR/main-alongside-macro-calls.rs - (line 19) ... ok
-test $DIR/main-alongside-macro-calls.rs - (line 24) ... ok
-test $DIR/main-alongside-macro-calls.rs - (line 28) ... FAILED
-test $DIR/main-alongside-macro-calls.rs - (line 33) ... FAILED
+test $DIR/main-alongside-macro-calls.rs:19 ... ok
+test $DIR/main-alongside-macro-calls.rs:24 ... ok
+test $DIR/main-alongside-macro-calls.rs:28 ... FAILED
+test $DIR/main-alongside-macro-calls.rs:33 ... FAILED
 
 failures:
 
----- $DIR/main-alongside-macro-calls.rs - (line 28) stdout ----
+---- $DIR/main-alongside-macro-calls.rs:28 stdout ----
 error: macros that expand to items must be delimited with braces or followed by a semicolon
   --> $DIR/main-alongside-macro-calls.rs:30:1
    |
@@ -29,7 +29,7 @@ LL | println!();
 error: aborting due to 2 previous errors
 
 Couldn't compile the test.
----- $DIR/main-alongside-macro-calls.rs - (line 33) stdout ----
+---- $DIR/main-alongside-macro-calls.rs:33 stdout ----
 error: macros that expand to items must be delimited with braces or followed by a semicolon
   --> $DIR/main-alongside-macro-calls.rs:34:1
    |
@@ -53,8 +53,8 @@ error: aborting due to 2 previous errors
 Couldn't compile the test.
 
 failures:
-    $DIR/main-alongside-macro-calls.rs - (line 28)
-    $DIR/main-alongside-macro-calls.rs - (line 33)
+    $DIR/main-alongside-macro-calls.rs:28
+    $DIR/main-alongside-macro-calls.rs:33
 
 test result: FAILED. 2 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/main-alongside-macro-calls.pass.stdout b/tests/rustdoc-ui/doctest/main-alongside-macro-calls.pass.stdout
index 93a4bbd87368d..29f635b810a47 100644
--- a/tests/rustdoc-ui/doctest/main-alongside-macro-calls.pass.stdout
+++ b/tests/rustdoc-ui/doctest/main-alongside-macro-calls.pass.stdout
@@ -1,9 +1,9 @@
 
 running 4 tests
-test $DIR/main-alongside-macro-calls.rs - (line 19) ... ok
-test $DIR/main-alongside-macro-calls.rs - (line 24) ... ok
-test $DIR/main-alongside-macro-calls.rs - (line 28) - compile fail ... ok
-test $DIR/main-alongside-macro-calls.rs - (line 33) - compile fail ... ok
+test $DIR/main-alongside-macro-calls.rs:19 ... ok
+test $DIR/main-alongside-macro-calls.rs:24 ... ok
+test $DIR/main-alongside-macro-calls.rs:28 - compile fail ... ok
+test $DIR/main-alongside-macro-calls.rs:33 - compile fail ... ok
 
 test result: ok. 4 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/main-alongside-stmts.stdout b/tests/rustdoc-ui/doctest/main-alongside-stmts.stdout
index 9b9a3fe8a68f7..0d95e7e70dbbe 100644
--- a/tests/rustdoc-ui/doctest/main-alongside-stmts.stdout
+++ b/tests/rustdoc-ui/doctest/main-alongside-stmts.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test $DIR/main-alongside-stmts.rs - (line 17) ... ok
-test $DIR/main-alongside-stmts.rs - (line 26) ... ok
+test $DIR/main-alongside-stmts.rs:17 ... ok
+test $DIR/main-alongside-stmts.rs:26 ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/merged-ignore-no_run.stdout b/tests/rustdoc-ui/doctest/merged-ignore-no_run.stdout
index a32da0aeb9649..afa4466258dd8 100644
--- a/tests/rustdoc-ui/doctest/merged-ignore-no_run.stdout
+++ b/tests/rustdoc-ui/doctest/merged-ignore-no_run.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test $DIR/merged-ignore-no_run.rs - ignored (line 7) ... ignored
-test $DIR/merged-ignore-no_run.rs - no_run (line 12) - compile ... ok
+test $DIR/merged-ignore-no_run.rs:12 - no_run - compile ... ok
+test $DIR/merged-ignore-no_run.rs:7 - ignored ... ignored
 
 test result: ok. 1 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/nested-main.stdout b/tests/rustdoc-ui/doctest/nested-main.stdout
index af9a8f5e1d76e..703c61c400c67 100644
--- a/tests/rustdoc-ui/doctest/nested-main.stdout
+++ b/tests/rustdoc-ui/doctest/nested-main.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test $DIR/nested-main.rs - foo (line 10) ... ok
-test $DIR/nested-main.rs - foo2 (line 19) ... ok
+test $DIR/nested-main.rs:10 - foo ... ok
+test $DIR/nested-main.rs:19 - foo2 ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/no-run-flag.stdout b/tests/rustdoc-ui/doctest/no-run-flag.stdout
index 02f28aaf60da0..a6763634db5de 100644
--- a/tests/rustdoc-ui/doctest/no-run-flag.stdout
+++ b/tests/rustdoc-ui/doctest/no-run-flag.stdout
@@ -1,12 +1,12 @@
 
 running 7 tests
-test $DIR/no-run-flag.rs - f (line 11) - compile ... ok
-test $DIR/no-run-flag.rs - f (line 14) ... ignored
-test $DIR/no-run-flag.rs - f (line 17) - compile ... ok
-test $DIR/no-run-flag.rs - f (line 23) - compile fail ... ok
-test $DIR/no-run-flag.rs - f (line 28) - compile ... ok
-test $DIR/no-run-flag.rs - f (line 32) - compile ... ok
-test $DIR/no-run-flag.rs - f (line 8) - compile ... ok
+test $DIR/no-run-flag.rs:11 - f - compile ... ok
+test $DIR/no-run-flag.rs:14 - f ... ignored
+test $DIR/no-run-flag.rs:17 - f - compile ... ok
+test $DIR/no-run-flag.rs:23 - f - compile fail ... ok
+test $DIR/no-run-flag.rs:28 - f - compile ... ok
+test $DIR/no-run-flag.rs:32 - f - compile ... ok
+test $DIR/no-run-flag.rs:8 - f - compile ... ok
 
 test result: ok. 6 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/nocapture-fail.stdout b/tests/rustdoc-ui/doctest/nocapture-fail.stdout
index 754f77db53ca3..f895e6605cc29 100644
--- a/tests/rustdoc-ui/doctest/nocapture-fail.stdout
+++ b/tests/rustdoc-ui/doctest/nocapture-fail.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/nocapture-fail.rs - Foo (line 7) - compile fail ... ok
+test $DIR/nocapture-fail.rs:7 - Foo - compile fail ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/nocapture.stdout b/tests/rustdoc-ui/doctest/nocapture.stdout
index 4880e75da7062..1c20af91a6703 100644
--- a/tests/rustdoc-ui/doctest/nocapture.stdout
+++ b/tests/rustdoc-ui/doctest/nocapture.stdout
@@ -1,7 +1,7 @@
 
 running 1 test
 hello!
-test $DIR/nocapture.rs - Foo (line 6) ... ok
+test $DIR/nocapture.rs:6 - Foo ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/non-local-defs-impl.stdout b/tests/rustdoc-ui/doctest/non-local-defs-impl.stdout
index c1f750017e703..6549168860250 100644
--- a/tests/rustdoc-ui/doctest/non-local-defs-impl.stdout
+++ b/tests/rustdoc-ui/doctest/non-local-defs-impl.stdout
@@ -1,11 +1,11 @@
 
 running 2 tests
-test $DIR/non-local-defs-impl.rs - doctest (line 13) - compile ... FAILED
-test $DIR/non-local-defs-impl.rs - doctest (line 25) - compile ... ok
+test $DIR/non-local-defs-impl.rs:13 - doctest - compile ... FAILED
+test $DIR/non-local-defs-impl.rs:25 - doctest - compile ... ok
 
 failures:
 
----- $DIR/non-local-defs-impl.rs - doctest (line 13) stdout ----
+---- $DIR/non-local-defs-impl.rs:13 - doctest stdout ----
 error: non-local `impl` definition, `impl` blocks should be written at the same level as their item
   --> $DIR/non-local-defs-impl.rs:20:5
    |
@@ -29,7 +29,7 @@ error: aborting due to 1 previous error
 Couldn't compile the test.
 
 failures:
-    $DIR/non-local-defs-impl.rs - doctest (line 13)
+    $DIR/non-local-defs-impl.rs:13 - doctest
 
 test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/non_local_defs.stdout b/tests/rustdoc-ui/doctest/non_local_defs.stdout
index bee195fcdd772..9fea99f143114 100644
--- a/tests/rustdoc-ui/doctest/non_local_defs.stdout
+++ b/tests/rustdoc-ui/doctest/non_local_defs.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/non_local_defs.rs - (line 7) ... ok
+test $DIR/non_local_defs.rs:7 ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/per-target-ignores.stdout b/tests/rustdoc-ui/doctest/per-target-ignores.stdout
index fe7282144dd8b..97948acd2501e 100644
--- a/tests/rustdoc-ui/doctest/per-target-ignores.stdout
+++ b/tests/rustdoc-ui/doctest/per-target-ignores.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/per-target-ignores.rs - foo (line 7) ... ok
+test $DIR/per-target-ignores.rs:7 - foo ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.edition2015.stdout b/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.edition2015.stdout
index ff26e7e323186..4ee4b947a2ef4 100644
--- a/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.edition2015.stdout
+++ b/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.edition2015.stdout
@@ -1,10 +1,10 @@
 
 running 1 test
-test $DIR/relative-path-include-bytes-132203.rs - (line 18) ... FAILED
+test $DIR/relative-path-include-bytes-132203.rs:18 ... FAILED
 
 failures:
 
----- $DIR/relative-path-include-bytes-132203.rs - (line 18) stdout ----
+---- $DIR/relative-path-include-bytes-132203.rs:18 stdout ----
 error: couldn't read `$DIR/relative-dir-empty-file`: $FILE_NOT_FOUND_MSG (os error 2)
   --> $DIR/relative-path-include-bytes-132203.rs:19:9
    |
@@ -16,7 +16,7 @@ error: aborting due to 1 previous error
 Couldn't compile the test.
 
 failures:
-    $DIR/relative-path-include-bytes-132203.rs - (line 18)
+    $DIR/relative-path-include-bytes-132203.rs:18
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.edition2024.stdout b/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.edition2024.stdout
index e4c657030819f..4bd6f131b3e65 100644
--- a/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.edition2024.stdout
+++ b/tests/rustdoc-ui/doctest/relative-path-include-bytes-132203.edition2024.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/auxiliary/relative-dir.md - (line 1) ... ok
+test $DIR/auxiliary/relative-dir.md:1 ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/run-directory.correct.stdout b/tests/rustdoc-ui/doctest/run-directory.correct.stdout
index e9b2754794a78..a4dd44c159c47 100644
--- a/tests/rustdoc-ui/doctest/run-directory.correct.stdout
+++ b/tests/rustdoc-ui/doctest/run-directory.correct.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/run-directory.rs - foo (line 10) ... ok
+test $DIR/run-directory.rs:10 - foo ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/run-directory.incorrect.stdout b/tests/rustdoc-ui/doctest/run-directory.incorrect.stdout
index 97a5dbc5c0cd1..505e59d3a7d90 100644
--- a/tests/rustdoc-ui/doctest/run-directory.incorrect.stdout
+++ b/tests/rustdoc-ui/doctest/run-directory.incorrect.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/run-directory.rs - foo (line 19) ... ok
+test $DIR/run-directory.rs:19 - foo ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/rustflags-multiple-args.stdout b/tests/rustdoc-ui/doctest/rustflags-multiple-args.stdout
index f6b8ad6afabba..97dec5df2f994 100644
--- a/tests/rustdoc-ui/doctest/rustflags-multiple-args.stdout
+++ b/tests/rustdoc-ui/doctest/rustflags-multiple-args.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/rustflags-multiple-args.rs - Bar (line 9) ... ok
+test $DIR/rustflags-multiple-args.rs:9 - Bar ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/rustflags.stdout b/tests/rustdoc-ui/doctest/rustflags.stdout
index b9da6637745bc..ca3df48dd8c5d 100644
--- a/tests/rustdoc-ui/doctest/rustflags.stdout
+++ b/tests/rustdoc-ui/doctest/rustflags.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/rustflags.rs - Bar (line 6) ... ok
+test $DIR/rustflags.rs:6 - Bar ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/stdout-and-stderr.stdout b/tests/rustdoc-ui/doctest/stdout-and-stderr.stdout
index b2febe1344f6d..0b20613cfe219 100644
--- a/tests/rustdoc-ui/doctest/stdout-and-stderr.stdout
+++ b/tests/rustdoc-ui/doctest/stdout-and-stderr.stdout
@@ -1,12 +1,12 @@
 
 running 3 tests
-test $DIR/stdout-and-stderr.rs - (line 15) ... FAILED
-test $DIR/stdout-and-stderr.rs - (line 20) ... FAILED
-test $DIR/stdout-and-stderr.rs - (line 24) ... FAILED
+test $DIR/stdout-and-stderr.rs:15 ... FAILED
+test $DIR/stdout-and-stderr.rs:20 ... FAILED
+test $DIR/stdout-and-stderr.rs:24 ... FAILED
 
 failures:
 
----- $DIR/stdout-and-stderr.rs - (line 15) stdout ----
+---- $DIR/stdout-and-stderr.rs:15 stdout ----
 Test executable failed (exit status: 101).
 
 stdout:
@@ -21,7 +21,7 @@ assertion `left == right` failed
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 
 
----- $DIR/stdout-and-stderr.rs - (line 20) stdout ----
+---- $DIR/stdout-and-stderr.rs:20 stdout ----
 Test executable failed (exit status: 101).
 
 stderr:
@@ -33,14 +33,14 @@ assertion `left == right` failed
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 
 
----- $DIR/stdout-and-stderr.rs - (line 24) stdout ----
+---- $DIR/stdout-and-stderr.rs:24 stdout ----
 Test executable failed (exit status: 1).
 
 
 failures:
-    $DIR/stdout-and-stderr.rs - (line 15)
-    $DIR/stdout-and-stderr.rs - (line 20)
-    $DIR/stdout-and-stderr.rs - (line 24)
+    $DIR/stdout-and-stderr.rs:15
+    $DIR/stdout-and-stderr.rs:20
+    $DIR/stdout-and-stderr.rs:24
 
 test result: FAILED. 0 passed; 3 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/test-no_std.stdout b/tests/rustdoc-ui/doctest/test-no_std.stdout
index 8d5a30804c1e2..17fb4e001e996 100644
--- a/tests/rustdoc-ui/doctest/test-no_std.stdout
+++ b/tests/rustdoc-ui/doctest/test-no_std.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/test-no_std.rs - f (line 10) ... ok
+test $DIR/test-no_std.rs:10 - f ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/test-type.stdout b/tests/rustdoc-ui/doctest/test-type.stdout
index a66fd240d34c4..f3a9afce7a447 100644
--- a/tests/rustdoc-ui/doctest/test-type.stdout
+++ b/tests/rustdoc-ui/doctest/test-type.stdout
@@ -1,10 +1,10 @@
 
 running 5 tests
-test $DIR/test-type.rs - f (line 12) ... ignored
-test $DIR/test-type.rs - f (line 15) - compile ... ok
-test $DIR/test-type.rs - f (line 21) - compile fail ... ok
-test $DIR/test-type.rs - f (line 6) ... ok
-test $DIR/test-type.rs - f (line 9) ... ok
+test $DIR/test-type.rs:12 - f ... ignored
+test $DIR/test-type.rs:15 - f - compile ... ok
+test $DIR/test-type.rs:21 - f - compile fail ... ok
+test $DIR/test-type.rs:6 - f ... ok
+test $DIR/test-type.rs:9 - f ... ok
 
 test result: ok. 4 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/unparseable-doc-test.stdout b/tests/rustdoc-ui/doctest/unparseable-doc-test.stdout
index 0574dc8b28207..b08b633df15e1 100644
--- a/tests/rustdoc-ui/doctest/unparseable-doc-test.stdout
+++ b/tests/rustdoc-ui/doctest/unparseable-doc-test.stdout
@@ -1,10 +1,10 @@
 
 running 1 test
-test $DIR/unparseable-doc-test.rs - foo (line 7) ... FAILED
+test $DIR/unparseable-doc-test.rs:7 - foo ... FAILED
 
 failures:
 
----- $DIR/unparseable-doc-test.rs - foo (line 7) stdout ----
+---- $DIR/unparseable-doc-test.rs:7 - foo stdout ----
 error[E0765]: unterminated double quote string
   --> $DIR/unparseable-doc-test.rs:9:1
    |
@@ -17,7 +17,7 @@ For more information about this error, try `rustc --explain E0765`.
 Couldn't compile the test.
 
 failures:
-    $DIR/unparseable-doc-test.rs - foo (line 7)
+    $DIR/unparseable-doc-test.rs:7 - foo
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/warn-main-not-called.stdout b/tests/rustdoc-ui/doctest/warn-main-not-called.stdout
index 07cdddc7b9459..21a28069cb1f0 100644
--- a/tests/rustdoc-ui/doctest/warn-main-not-called.stdout
+++ b/tests/rustdoc-ui/doctest/warn-main-not-called.stdout
@@ -1,7 +1,7 @@
 
 running 2 tests
-test $DIR/warn-main-not-called.rs - (line 10) ... ok
-test $DIR/warn-main-not-called.rs - (line 19) ... ok
+test $DIR/warn-main-not-called.rs:10 ... ok
+test $DIR/warn-main-not-called.rs:19 ... ok
 
 test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/wrong-ast-2024.stdout b/tests/rustdoc-ui/doctest/wrong-ast-2024.stdout
index 62e1fb10b9f4a..b2afb0f7b3ed9 100644
--- a/tests/rustdoc-ui/doctest/wrong-ast-2024.stdout
+++ b/tests/rustdoc-ui/doctest/wrong-ast-2024.stdout
@@ -1,41 +1,41 @@
 
 running 1 test
-test $DIR/wrong-ast-2024.rs - three (line 18) - should panic ... ok
+test $DIR/wrong-ast-2024.rs:18 - three - should panic ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
 
 running 2 tests
-test $DIR/wrong-ast-2024.rs - one (line 8) ... FAILED
-test $DIR/wrong-ast-2024.rs - two (line 13) ... FAILED
+test $DIR/wrong-ast-2024.rs:13 - two ... FAILED
+test $DIR/wrong-ast-2024.rs:8 - one ... FAILED
 
 failures:
 
----- $DIR/wrong-ast-2024.rs - one (line 8) stdout ----
-error[E0758]: unterminated block comment
+---- $DIR/wrong-ast-2024.rs:13 - two stdout ----
+error: unexpected closing delimiter: `}`
   --> $DIR/wrong-ast-2024.rs:$LINE:$COL
    |
-LL | /* plop
-   | ^^^^^^^
+LL | } mod __doctest_1 { fn main() {
+   | ^ unexpected closing delimiter
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0758`.
 Couldn't compile the test.
----- $DIR/wrong-ast-2024.rs - two (line 13) stdout ----
-error: unexpected closing delimiter: `}`
+---- $DIR/wrong-ast-2024.rs:8 - one stdout ----
+error[E0758]: unterminated block comment
   --> $DIR/wrong-ast-2024.rs:$LINE:$COL
    |
-LL | } mod __doctest_1 { fn main() {
-   | ^ unexpected closing delimiter
+LL | /* plop
+   | ^^^^^^^
 
 error: aborting due to 1 previous error
 
+For more information about this error, try `rustc --explain E0758`.
 Couldn't compile the test.
 
 failures:
-    $DIR/wrong-ast-2024.rs - one (line 8)
-    $DIR/wrong-ast-2024.rs - two (line 13)
+    $DIR/wrong-ast-2024.rs:13 - two
+    $DIR/wrong-ast-2024.rs:8 - one
 
 test result: FAILED. 0 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/doctest/wrong-ast.stdout b/tests/rustdoc-ui/doctest/wrong-ast.stdout
index 15494706c1643..119af68c576fc 100644
--- a/tests/rustdoc-ui/doctest/wrong-ast.stdout
+++ b/tests/rustdoc-ui/doctest/wrong-ast.stdout
@@ -1,36 +1,36 @@
 
 running 3 tests
-test $DIR/wrong-ast.rs - one (line 6) ... FAILED
-test $DIR/wrong-ast.rs - three (line 16) ... ok
-test $DIR/wrong-ast.rs - two (line 11) ... FAILED
+test $DIR/wrong-ast.rs:11 - two ... FAILED
+test $DIR/wrong-ast.rs:16 - three ... ok
+test $DIR/wrong-ast.rs:6 - one ... FAILED
 
 failures:
 
----- $DIR/wrong-ast.rs - one (line 6) stdout ----
-error[E0758]: unterminated block comment
-  --> $DIR/wrong-ast.rs:7:1
+---- $DIR/wrong-ast.rs:11 - two stdout ----
+error: unexpected closing delimiter: `}`
+  --> $DIR/wrong-ast.rs:12:1
    |
-LL | /* plop
-   | ^^^^^^^
+LL | } mod __doctest_1 { fn main() {
+   | ^ unexpected closing delimiter
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0758`.
 Couldn't compile the test.
----- $DIR/wrong-ast.rs - two (line 11) stdout ----
-error: unexpected closing delimiter: `}`
-  --> $DIR/wrong-ast.rs:12:1
+---- $DIR/wrong-ast.rs:6 - one stdout ----
+error[E0758]: unterminated block comment
+  --> $DIR/wrong-ast.rs:7:1
    |
-LL | } mod __doctest_1 { fn main() {
-   | ^ unexpected closing delimiter
+LL | /* plop
+   | ^^^^^^^
 
 error: aborting due to 1 previous error
 
+For more information about this error, try `rustc --explain E0758`.
 Couldn't compile the test.
 
 failures:
-    $DIR/wrong-ast.rs - one (line 6)
-    $DIR/wrong-ast.rs - two (line 11)
+    $DIR/wrong-ast.rs:11 - two
+    $DIR/wrong-ast.rs:6 - one
 
 test result: FAILED. 1 passed; 2 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/extract-doctests-result.stdout b/tests/rustdoc-ui/extract-doctests-result.stdout
index 44e6d33c66268..ef6a93722459d 100644
--- a/tests/rustdoc-ui/extract-doctests-result.stdout
+++ b/tests/rustdoc-ui/extract-doctests-result.stdout
@@ -1 +1 @@
-{"format_version":2,"doctests":[{"file":"$DIR/extract-doctests-result.rs","line":8,"doctest_attributes":{"original":"","should_panic":false,"no_run":false,"ignore":"None","rust":true,"test_harness":false,"compile_fail":false,"standalone_crate":false,"error_codes":[],"edition":null,"added_css_classes":[],"unknown":[]},"original_code":"let x = 12;\nOk(())","doctest_code":{"crate_level":"#![allow(unused)]\n","code":"let x = 12;\nOk(())","wrapper":{"before":"fn main() { fn _inner() -> core::result::Result<(), impl core::fmt::Debug> {\n","after":"\n} _inner().unwrap() }","returns_result":true}},"name":"$DIR/extract-doctests-result.rs - (line 8)"}]}
\ No newline at end of file
+{"format_version":2,"doctests":[{"file":"$DIR/extract-doctests-result.rs","line":8,"doctest_attributes":{"original":"","should_panic":false,"no_run":false,"ignore":"None","rust":true,"test_harness":false,"compile_fail":false,"standalone_crate":false,"error_codes":[],"edition":null,"added_css_classes":[],"unknown":[]},"original_code":"let x = 12;\nOk(())","doctest_code":{"crate_level":"#![allow(unused)]\n","code":"let x = 12;\nOk(())","wrapper":{"before":"fn main() { fn _inner() -> core::result::Result<(), impl core::fmt::Debug> {\n","after":"\n} _inner().unwrap() }","returns_result":true}},"name":"$DIR/extract-doctests-result.rs:8"}]}
\ No newline at end of file
diff --git a/tests/rustdoc-ui/extract-doctests.stdout b/tests/rustdoc-ui/extract-doctests.stdout
index 796ecd82f1c93..191677ec27bd7 100644
--- a/tests/rustdoc-ui/extract-doctests.stdout
+++ b/tests/rustdoc-ui/extract-doctests.stdout
@@ -1 +1 @@
-{"format_version":2,"doctests":[{"file":"$DIR/extract-doctests.rs","line":8,"doctest_attributes":{"original":"ignore (checking attributes)","should_panic":false,"no_run":false,"ignore":"All","rust":true,"test_harness":false,"compile_fail":false,"standalone_crate":false,"error_codes":[],"edition":null,"added_css_classes":[],"unknown":[]},"original_code":"let x = 12;\nlet y = 14;","doctest_code":{"crate_level":"#![allow(unused)]\n","code":"let x = 12;\nlet y = 14;","wrapper":{"before":"fn main() {\n","after":"\n}","returns_result":false}},"name":"$DIR/extract-doctests.rs - (line 8)"},{"file":"$DIR/extract-doctests.rs","line":13,"doctest_attributes":{"original":"edition2018,compile_fail","should_panic":false,"no_run":true,"ignore":"None","rust":true,"test_harness":false,"compile_fail":true,"standalone_crate":false,"error_codes":[],"edition":"2018","added_css_classes":[],"unknown":[]},"original_code":"let","doctest_code":null,"name":"$DIR/extract-doctests.rs - (line 13)"}]}
\ No newline at end of file
+{"format_version":2,"doctests":[{"file":"$DIR/extract-doctests.rs","line":8,"doctest_attributes":{"original":"ignore (checking attributes)","should_panic":false,"no_run":false,"ignore":"All","rust":true,"test_harness":false,"compile_fail":false,"standalone_crate":false,"error_codes":[],"edition":null,"added_css_classes":[],"unknown":[]},"original_code":"let x = 12;\nlet y = 14;","doctest_code":{"crate_level":"#![allow(unused)]\n","code":"let x = 12;\nlet y = 14;","wrapper":{"before":"fn main() {\n","after":"\n}","returns_result":false}},"name":"$DIR/extract-doctests.rs:8"},{"file":"$DIR/extract-doctests.rs","line":13,"doctest_attributes":{"original":"edition2018,compile_fail","should_panic":false,"no_run":true,"ignore":"None","rust":true,"test_harness":false,"compile_fail":true,"standalone_crate":false,"error_codes":[],"edition":"2018","added_css_classes":[],"unknown":[]},"original_code":"let","doctest_code":null,"name":"$DIR/extract-doctests.rs:13"}]}
\ No newline at end of file
diff --git a/tests/rustdoc-ui/issues/issue-80992.stdout b/tests/rustdoc-ui/issues/issue-80992.stdout
index d2b1cd1d550cf..9cd32cc56870d 100644
--- a/tests/rustdoc-ui/issues/issue-80992.stdout
+++ b/tests/rustdoc-ui/issues/issue-80992.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/issue-80992.rs - test (line 7) - compile fail ... ok
+test $DIR/issue-80992.rs:7 - test - compile fail ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/issues/issue-81662-shortness.stdout b/tests/rustdoc-ui/issues/issue-81662-shortness.stdout
index 94a82cf0afc4e..a73dc0cd65632 100644
--- a/tests/rustdoc-ui/issues/issue-81662-shortness.stdout
+++ b/tests/rustdoc-ui/issues/issue-81662-shortness.stdout
@@ -1,16 +1,16 @@
 
 running 1 test
-test $DIR/issue-81662-shortness.rs - foo (line 7) ... FAILED
+test $DIR/issue-81662-shortness.rs:7 - foo ... FAILED
 
 failures:
 
----- $DIR/issue-81662-shortness.rs - foo (line 7) stdout ----
+---- $DIR/issue-81662-shortness.rs:7 - foo stdout ----
 $DIR/issue-81662-shortness.rs:8:1: error[E0425]: cannot find function `foo` in this scope: not found in this scope
 error: aborting due to 1 previous error
 Couldn't compile the test.
 
 failures:
-    $DIR/issue-81662-shortness.rs - foo (line 7)
+    $DIR/issue-81662-shortness.rs:7 - foo
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/issues/issue-91134.stdout b/tests/rustdoc-ui/issues/issue-91134.stdout
index 084062743daea..249409cc0e175 100644
--- a/tests/rustdoc-ui/issues/issue-91134.stdout
+++ b/tests/rustdoc-ui/issues/issue-91134.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test $DIR/issue-91134.rs - Something (line 10) ... ok
+test $DIR/issue-91134.rs:10 - Something ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/remap-path-prefix-failed-doctest-output.stdout b/tests/rustdoc-ui/remap-path-prefix-failed-doctest-output.stdout
index 87d1e772b808a..bd963331beb76 100644
--- a/tests/rustdoc-ui/remap-path-prefix-failed-doctest-output.stdout
+++ b/tests/rustdoc-ui/remap-path-prefix-failed-doctest-output.stdout
@@ -1,10 +1,10 @@
 
 running 1 test
-test remapped_path/remap-path-prefix-failed-doctest-output.rs - SomeStruct (line 11) ... FAILED
+test remapped_path/remap-path-prefix-failed-doctest-output.rs:11 - SomeStruct ... FAILED
 
 failures:
 
----- remapped_path/remap-path-prefix-failed-doctest-output.rs - SomeStruct (line 11) stdout ----
+---- remapped_path/remap-path-prefix-failed-doctest-output.rs:11 - SomeStruct stdout ----
 Test executable failed (exit status: 101).
 
 stderr:
@@ -16,7 +16,7 @@ note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 
 
 failures:
-    remapped_path/remap-path-prefix-failed-doctest-output.rs - SomeStruct (line 11)
+    remapped_path/remap-path-prefix-failed-doctest-output.rs:11 - SomeStruct
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/remap-path-prefix-invalid-doctest.stdout b/tests/rustdoc-ui/remap-path-prefix-invalid-doctest.stdout
index c0d2515998f23..c93946960f337 100644
--- a/tests/rustdoc-ui/remap-path-prefix-invalid-doctest.stdout
+++ b/tests/rustdoc-ui/remap-path-prefix-invalid-doctest.stdout
@@ -1,10 +1,10 @@
 
 running 1 test
-test remapped_path/remap-path-prefix-invalid-doctest.rs - SomeStruct (line 10) ... FAILED
+test remapped_path/remap-path-prefix-invalid-doctest.rs:10 - SomeStruct ... FAILED
 
 failures:
 
----- remapped_path/remap-path-prefix-invalid-doctest.rs - SomeStruct (line 10) stdout ----
+---- remapped_path/remap-path-prefix-invalid-doctest.rs:10 - SomeStruct stdout ----
 error: expected one of `!` or `::`, found `is`
   --> remapped_path/remap-path-prefix-invalid-doctest.rs:11:6
    |
@@ -16,7 +16,7 @@ error: aborting due to 1 previous error
 Couldn't compile the test.
 
 failures:
-    remapped_path/remap-path-prefix-invalid-doctest.rs - SomeStruct (line 10)
+    remapped_path/remap-path-prefix-invalid-doctest.rs:10 - SomeStruct
 
 test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
 
diff --git a/tests/rustdoc-ui/remap-path-prefix-passed-doctest-output.stdout b/tests/rustdoc-ui/remap-path-prefix-passed-doctest-output.stdout
index 8ffb569488563..147deb97fefc5 100644
--- a/tests/rustdoc-ui/remap-path-prefix-passed-doctest-output.stdout
+++ b/tests/rustdoc-ui/remap-path-prefix-passed-doctest-output.stdout
@@ -1,6 +1,6 @@
 
 running 1 test
-test remapped_path/remap-path-prefix-passed-doctest-output.rs - SomeStruct (line 11) ... ok
+test remapped_path/remap-path-prefix-passed-doctest-output.rs:11 - SomeStruct ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME