Skip to content

Commit 89cac55

Browse files
committed
tests: use //@ ignore-auxiliary with backlinked primary test file
1 parent 6bbee33 commit 89cac55

File tree

39 files changed

+37
-49
lines changed

39 files changed

+37
-49
lines changed

Diff for: tests/codegen/remap_path_prefix/aux_mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test: this is not a test
1+
//@ ignore-auxiliary (used by `./main.rs`)
22

33
#[inline]
44
pub fn some_aux_mod_function() -> i32 {

Diff for: tests/ui/borrowck/move-error-snippets-ext.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test (auxiliary, used by other tests)
1+
//@ ignore-auxiliary (used by `./move-error-snippets.rs`)
22

33
macro_rules! aaa {
44
($c:ident) => {{

Diff for: tests/ui/codemap_tests/two_files_data.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test (auxiliary, used by other tests)
1+
//@ ignore-auxiliary (used by `./two_files.rs`)
22

33
trait Foo { }
44

Diff for: tests/ui/conditional-compilation/module_with_cfg.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
//@ ignore-test (auxiliary, used by other tests)
1+
//@ ignore-auxiliary (used by `./inner-cfg-non-inline-mod.rs`)
22

33
#![cfg_attr(all(), cfg(FALSE))]

Diff for: tests/ui/cross/cross-file-errors/underscore.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test (auxiliary, used by other tests)
1+
//@ ignore-auxiliary (used by `./main.rs`)
22
#![crate_type = "lib"]
33

44
macro_rules! underscore {
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
//@ ignore-test not a test, auxiliary
1+
//@ ignore-auxiliary (used by `../../macro-expanded-mod.rs`)
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
//@ ignore-test not a test, auxiliary
1+
//@ ignore-auxiliary (used by `../../macro-expanded-mod.rs`)
22

33
mod_decl!(bar);

Diff for: tests/ui/lint/expansion-time-include.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test auxiliary file for expansion-time.rs
1+
//@ ignore-auxiliary (used by `./expansion-time.rs`)
22

33
1
44
2

Diff for: tests/ui/lint/known-tool-in-submodule/submodule.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test: not a test
1+
//@ ignore-auxiliary (used by `./root.rs`)
22

33
#[allow(tool::lint)]
44
pub fn foo() {}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
//@ ignore-test: not a test
1+
//@ ignore-auxiliary (used by `./lint-pre-expansion-extern-module.rs`)
22

33
pub fn try() {}

Diff for: tests/ui/lint/unknown-lints/other.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
//@ ignore-test (auxiliary)
2-
3-
// Companion to allow-in-other-module.rs
1+
//@ ignore-auxiliary (used by `./allow-in-other-module.rs`)
42

53
// This should not warn.
64
#![allow(not_a_real_lint)]
-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
// ignore-test: this is not a test
2-
31
1
-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
// ignore-test: this is not a test
2-
31
fn foo() { bar() }

Diff for: tests/ui/macros/include-single-expr-helper-1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test auxiliary file for include-single-expr.rs
1+
//@ ignore-auxiliary (used by `./include-single-expr.rs`)
22

33
0
44

Diff for: tests/ui/macros/include-single-expr-helper.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test auxiliary file for include-single-expr.rs
1+
//@ ignore-auxiliary (used by `./include-single-expr.rs`)
22

33
0
44
10

Diff for: tests/ui/macros/issue-69838-dir/bar.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
//@ ignore-test -- this is an auxiliary file as part of another test.
1+
//@ ignore-auxiliary (used by `../issue-69838-mods-relative-to-included-path.rs`)
22

33
pub fn i_am_in_bar() {}

Diff for: tests/ui/macros/issue-69838-dir/included.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
//@ ignore-test -- this is an auxiliary file as part of another test.
1+
//@ ignore-auxiliary (used by `../issue-69838-mods-relative-to-included-path.rs`)
22

33
pub mod bar;

Diff for: tests/ui/macros/macro-expanded-include/foo/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test (auxiliary, used by other tests)
1+
//@ ignore-auxiliary (used by `../test.rs`)
22

33
macro_rules! m {
44
() => { include!("file.txt"); }

Diff for: tests/ui/missing_non_modrs_mod/foo.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//
2-
//@ ignore-test this is just a helper for the real test in this dir
1+
//@ ignore-auxiliary (used by `./missing_non_modrs_mod.rs`)
32

43
mod missing;

Diff for: tests/ui/missing_non_modrs_mod/foo_inline.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test this is just a helper for the real test in this dir
1+
//@ ignore-auxiliary (used by `./missing_non_modrs_mod_inline.rs`)
22

33
mod inline {
44
mod missing;

Diff for: tests/ui/missing_non_modrs_mod/missing_non_modrs_mod.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0583]: file not found for module `missing`
2-
--> $DIR/foo.rs:4:1
2+
--> $DIR/foo.rs:3:1
33
|
44
LL | mod missing;
55
| ^^^^^^^^^^^^

Diff for: tests/ui/modules/mod_file_aux.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
//@ run-pass
2-
//@ ignore-test Not a test. Used by other tests
1+
//@ ignore-auxiliary (used by `./mod_file_with_path_attr.rs` and `mod_file.rs`)
32

43
pub fn foo() -> isize { 10 }
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
//@ ignore-test Not a test. Used by other tests
1+
//@ ignore-auxiliary (used by `./mod_file_correct_spans.rs`)
22

33
pub fn foo() -> isize { 10 }
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
//@ ignore-test not a test. aux file
1+
//@ ignore-auxiliary (used by `./mod_file_disambig.rs`)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
//@ ignore-test not a test. aux file
1+
//@ ignore-auxiliary (used by `../mod_file_disambig.rs`)

Diff for: tests/ui/non_modrs_mods/foors_mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
//@ run-pass
2-
//
3-
//@ ignore-test: not a test, used by non_modrs_mods.rs
1+
//@ ignore-auxiliary (used by `./non_modrs_mods.rs`)
42

53
pub mod inner_modrs_mod;
64
pub mod inner_foors_mod;

Diff for: tests/ui/non_modrs_mods_and_inline_mods/x.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test: not a test
1+
//@ ignore-auxiliary (used by `./non_modrs_mods_and_inline_mods.rs`)
22

33
pub mod y {
44
pub mod z;

Diff for: tests/ui/non_modrs_mods_and_inline_mods/x/y/z/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
//@ ignore-test: not a test
1+
//@ ignore-auxiliary (used by `../../../non_modrs_mods_and_inline_mods.rs`)

Diff for: tests/ui/numbers-arithmetic/saturating-float-casts-impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test (auxiliary, used by other tests)
1+
//@ ignore-auxiliary (used by `./saturating-float-casts.rs` and `./saturating-float-casts-wasm.rs`)
22

33
// Tests saturating float->int casts. See u128-as-f32.rs for the opposite direction.
44
//

Diff for: tests/ui/parser/circular_modules_hello.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test: this is an auxiliary file for circular-modules-main.rs
1+
//@ ignore-auxiliary (used by `./circular-modules-main.rs`)
22

33
#[path = "circular_modules_main.rs"]
44
mod circular_modules_main;

Diff for: tests/ui/parser/issues/circular-module-with-doc-comment-issue-97589/recursive.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test: this is an auxiliary file for circular-module-with-doc-comment-issue-97589.rs
1+
//@ ignore-auxiliary (used by `./circular-module-with-doc-comment-issue-97589.rs`)
22

33
//! this comment caused the circular dependency checker to break
44

Diff for: tests/ui/parser/issues/issue-48508-aux.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
//@ run-pass
2-
//@ ignore-test Not a test. Used by issue-48508.rs
1+
//@ ignore-auxiliary (used by `./issue-48508.rs`)
32

43
pub fn other() -> f64 {
54
let µ = 1.0;

Diff for: tests/ui/proc-macro/module.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
//@ ignore-test (auxiliary, used by other tests)
1+
//@ ignore-auxiliary (used by `./attributes-on-modules-fail.rs`)

Diff for: tests/ui/proc-macro/module_with_attrs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test (auxiliary, used by other tests)
1+
//@ ignore-auxiliary (used by `../inner-attr-non-inline-mod.rs`)
22

33
#![rustfmt::skip]
44
#![print_attr]

Diff for: tests/ui/proc-macro/outer/inner.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
//@ ignore-test (auxiliary, used by other tests)
1+
//@ ignore-auxiliary (used by `../attributes-on-modules-fail.rs`)

Diff for: tests/ui/proc-macro/pretty-print-hack/allsorts-rental-0.5.6/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test (auxiliary, used by other tests)
1+
//@ ignore-auxiliary (used by `../../../pretty-print-hack-show.rs`)
22

33
#[derive(Print)]
44
enum ProceduralMasqueradeDummyType {

Diff for: tests/ui/proc-macro/pretty-print-hack/rental-0.5.5/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test (auxiliary, used by other tests)
1+
//@ ignore-auxiliary (used by `../../../pretty-print-hack-show.rs`)
22

33
#[derive(Print)]
44
enum ProceduralMasqueradeDummyType {

Diff for: tests/ui/proc-macro/pretty-print-hack/rental-0.5.6/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ ignore-test (auxiliary, used by other tests)
1+
//@ ignore-auxiliary (used by `../../../pretty-print-hack/hide.rs`)
22

33
#[derive(Print)]
44
enum ProceduralMasqueradeDummyType {

Diff for: tests/ui/runtime/backtrace-debuginfo-aux.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
//@ run-pass
2-
//@ ignore-test: not a test, used by backtrace-debuginfo.rs to test file!()
1+
//@ ignore-auxiliary (used by `./backtrace-debuginfo.rs` to test `file!()`)
32

43
#[inline(never)]
54
pub fn callback<F>(f: F) where F: FnOnce((&'static str, u32)) {

0 commit comments

Comments
 (0)