-
Notifications
You must be signed in to change notification settings - Fork 13.3k
Introduce and use specialized //@ ignore-auxiliary
for test support files instead of using //@ ignore-test
#139967
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 1 commit
d20f848
d1178fa
6bbee33
89cac55
6c5a481
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
//@ ignore-test (auxiliary, used by other tests) | ||
//@ ignore-auxiliary (used by `./two_files.rs`) | ||
|
||
trait Foo { } | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
//@ ignore-test (auxiliary, used by other tests) | ||
//@ ignore-auxiliary (used by `./inner-cfg-non-inline-mod.rs`) | ||
|
||
#![cfg_attr(all(), cfg(FALSE))] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
//@ ignore-test not a test, auxiliary | ||
//@ ignore-auxiliary (used by `../../macro-expanded-mod.rs`) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
//@ ignore-test not a test, auxiliary | ||
//@ ignore-auxiliary (used by `../../macro-expanded-mod.rs`) | ||
|
||
mod_decl!(bar); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
//@ ignore-test auxiliary file for expansion-time.rs | ||
//@ ignore-auxiliary (used by `./expansion-time.rs`) | ||
|
||
1 | ||
2 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
//@ ignore-test: not a test | ||
//@ ignore-auxiliary (used by `./root.rs`) | ||
|
||
#[allow(tool::lint)] | ||
pub fn foo() {} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
//@ ignore-test: not a test | ||
//@ ignore-auxiliary (used by `./lint-pre-expansion-extern-module.rs`) | ||
|
||
pub fn try() {} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1 @@ | ||
// ignore-test: this is not a test | ||
|
||
1 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1 @@ | ||
// ignore-test: this is not a test | ||
|
||
fn foo() { bar() } |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
//@ ignore-test -- this is an auxiliary file as part of another test. | ||
//@ ignore-auxiliary (used by `../issue-69838-mods-relative-to-included-path.rs`) | ||
|
||
pub fn i_am_in_bar() {} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
//@ ignore-test -- this is an auxiliary file as part of another test. | ||
//@ ignore-auxiliary (used by `../issue-69838-mods-relative-to-included-path.rs`) | ||
|
||
pub mod bar; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
// | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remark: removing this extra |
||
//@ ignore-test this is just a helper for the real test in this dir | ||
//@ ignore-auxiliary (used by `./missing_non_modrs_mod.rs`) | ||
|
||
mod missing; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
//@ run-pass | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remark: useless/misleading |
||
//@ ignore-test Not a test. Used by other tests | ||
//@ ignore-auxiliary (used by `./mod_file_with_path_attr.rs` and `mod_file.rs`) | ||
|
||
pub fn foo() -> isize { 10 } |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
//@ ignore-test Not a test. Used by other tests | ||
//@ ignore-auxiliary (used by `./mod_file_correct_spans.rs`) | ||
|
||
pub fn foo() -> isize { 10 } |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
//@ ignore-test not a test. aux file | ||
//@ ignore-auxiliary (used by `./mod_file_disambig.rs`) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
//@ ignore-test not a test. aux file | ||
//@ ignore-auxiliary (used by `../mod_file_disambig.rs`) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
//@ ignore-test: not a test | ||
//@ ignore-auxiliary (used by `../../../non_modrs_mods_and_inline_mods.rs`) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
//@ ignore-test (auxiliary, used by other tests) | ||
//@ ignore-auxiliary (used by `./attributes-on-modules-fail.rs`) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
//@ ignore-test (auxiliary, used by other tests) | ||
//@ ignore-auxiliary (used by `../inner-attr-non-inline-mod.rs`) | ||
|
||
#![rustfmt::skip] | ||
#![print_attr] |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
//@ ignore-test (auxiliary, used by other tests) | ||
//@ ignore-auxiliary (used by `../attributes-on-modules-fail.rs`) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remark: This directory already has
compiletest-ignore-dir
, so this aux file andtests/ui/macros/auxiliary/macro-include-items-item.rs
has// ignore-test
(note the lack of@
) which are redundant and never ported during the//
->//@
migration.