rust-lang#107307 Adding additional information to "cargo test --list"…

… output

earlier:
  p2dchecks::fibonacci_test::case_1: test

now:
  // test test_type | ignored_or_not | location_info
  p2dchecks::fibonacci_test::case_1: test | false | src\lib.rs:57:8: 57:19

.gitignore

@@ -21,6 +21,7 @@ Session.vim
 .project
 .favorites.json
 .settings/
+.vs/
 
 ## Tool
 .valgrindrc

compiler/rustc_builtin_macros/src/test.rs

@@ -280,6 +280,11 @@ pub fn expand_test_or_bench(
                                             cx.expr_none(sp)
                                         },
                                     ),
+                                    // location_info: <relative_path_of_source>:<start_line>:<start_col>: <end_line>:<end_col>
+                                    field(
+                                        "location_info",
+                                        cx.expr_str(sp, item_location_info(cx, &item)),
+                                    ),
                                     // compile_fail: true | false
                                     field("compile_fail", cx.expr_bool(sp, false)),
                                     // no_run: true | false
@@ -396,6 +401,12 @@ fn should_ignore_message(cx: &ExtCtxt<'_>, i: &ast::Item) -> Option<Symbol> {
     }
 }
 
+fn item_location_info(cx: &ExtCtxt<'_>, item: &ast::Item) -> Symbol {
+    let ident_sp = cx.with_def_site_ctxt(item.ident.span);
+    let li = cx.sess.source_map().span_to_location_info_string(ident_sp);
+    Symbol::intern(&li)
+}
+
 fn should_panic(cx: &ExtCtxt<'_>, i: &ast::Item) -> ShouldPanic {
     match cx.sess.find_by_name(&i.attrs, sym::should_panic) {
         Some(attr) => {

compiler/rustc_span/src/source_map.rs

@@ -467,6 +467,11 @@ impl SourceMap {
         self.span_to_string(sp, FileNameDisplayPreference::Remapped)
     }
 
+    /// Format the span's location information into string
+    pub fn span_to_location_info_string(&self, sp: Span) -> String {
+        self.span_to_string(sp, FileNameDisplayPreference::Local)
+    }
+
     /// Format the span location suitable for pretty printing anotations with relative line numbers
     pub fn span_to_relative_line_string(&self, sp: Span, relative_to: Span) -> String {
         if self.files.borrow().source_files.is_empty() || sp.is_dummy() || relative_to.is_dummy() {

library/test/src/console.rs

@@ -152,7 +152,7 @@ pub fn list_tests_console(opts: &TestOpts, tests: Vec<TestDescAndFn>) -> io::Res
     for test in filter_tests(opts, tests).into_iter() {
         use crate::TestFn::*;
 
-        let TestDescAndFn { desc: TestDesc { name, .. }, testfn } = test;
+        let TestDescAndFn { desc: TestDesc { name, ignore, location_info, .. }, testfn } = test;
 
         let fntype = match testfn {
             StaticTestFn(..) | DynTestFn(..) => {
@@ -165,8 +165,8 @@ pub fn list_tests_console(opts: &TestOpts, tests: Vec<TestDescAndFn>) -> io::Res
             }
         };
 
-        writeln!(output, "{name}: {fntype}")?;
-        st.write_log(|| format!("{fntype} {name}\n"))?;
+        writeln!(output, "{name}: {fntype} | {ignore} | {location_info}")?;
+        st.write_log(|| format!("{fntype} {name} {ignore} {location_info}\n"))?;
     }
 
     fn plural(count: u32, s: &str) -> String {

library/test/src/types.rs

@@ -119,6 +119,7 @@ pub struct TestDesc {
     pub name: TestName,
     pub ignore: bool,
     pub ignore_message: Option<&'static str>,
+    pub location_info: &'static str,
     pub should_panic: options::ShouldPanic,
     pub compile_fail: bool,
     pub no_run: bool,