Skip to content

Commit 57ff18a

Browse files
committed
Move ignore/only flags to ui_test
1 parent 33d00c7 commit 57ff18a

21 files changed

+70
-22
lines changed

tests/compile-test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ fn run_ui_cargo() {
122122
config.stdout_filter("in ([0-9]m )?[0-9\\.]+s", "");
123123
config.stderr_filter("( +Running [^(]+).*", "$1");
124124
config.stderr_filter(" *Blocking waiting for.*\n", "");
125-
config.stderr_filter(" *(Compiling|Downloaded|Downloading) .*\n", "");
125+
config.stderr_filter(" *(Compiling|Downloaded|Downloading|Checking) .*\n", "");
126126
config.stderr_filter(r#""--out-dir"(,)? "[^"]+""#, r#""--out-dir"$1 "$$TMP"#);
127127
config.stderr_filter("( *process didn't exit successfully: `[^-]+)-[0-9a-f]+", "$1-HASH");
128128
// The order of the `/deps` directory flag is flaky

tests/ui/asm_syntax.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// only-x86_64
2-
// ignore-aarch64
1+
//@only-target-x86_64
2+
//@ignore-target-aarch64
33

44
#[warn(clippy::inline_asm_x86_intel_syntax)]
55
mod warn_intel {

tests/ui/cast_size.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore-32bit
1+
//@ignore-32bit
22
#[warn(
33
clippy::cast_precision_loss,
44
clippy::cast_possible_truncation,

tests/ui/cast_size_32bit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore-64bit
1+
//@ignore-64bit
22
#[warn(
33
clippy::cast_precision_loss,
44
clippy::cast_possible_truncation,

tests/ui/crashes/ice-7410.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@compile-flags: -Clink-arg=-nostartfiles
2-
// ignore-macos
3-
// ignore-windows
2+
//@ignore-target-apple
3+
//@ignore-target-windows
44

55
#![feature(lang_items, start, libc)]
66
#![no_std]

tests/ui/crate_level_checks/entrypoint_recursion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore-macos
1+
//@ignore-target-apple
22

33
#![feature(rustc_attrs)]
44

tests/ui/crate_level_checks/no_std_main_recursion.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//@compile-flags: -Clink-arg=-nostartfiles
2-
// ignore-macos
2+
//@ignore-target-apple
33

44
#![feature(lang_items, start, libc)]
55
#![no_std]

tests/ui/def_id_nocore.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore-macos
1+
//@ignore-target-apple
22

33
#![feature(no_core, lang_items, start)]
44
#![no_core]

tests/ui/empty_loop_no_std.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//@compile-flags: -Clink-arg=-nostartfiles
2-
// ignore-macos
2+
//@ignore-target-apple
33

44
#![warn(clippy::empty_loop)]
55
#![feature(lang_items, start, libc)]

tests/ui/enum_clike_unportable_variant.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore-x86
1+
//@ignore-target-x86
22

33
#![warn(clippy::enum_clike_unportable_variant)]
44
#![allow(unused, non_upper_case_globals)]

tests/ui/fn_to_numeric_cast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore-32bit
1+
//@ignore-32bit
22

33
#![warn(clippy::fn_to_numeric_cast, clippy::fn_to_numeric_cast_with_truncation)]
44

tests/ui/fn_to_numeric_cast_32bit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore-64bit
1+
//@ignore-64bit
22

33
#![warn(clippy::fn_to_numeric_cast, clippy::fn_to_numeric_cast_with_truncation)]
44

tests/ui/macro_use_imports.fixed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//@aux-build:macro_use_helper.rs
33
//@aux-build:proc_macro_derive.rs:proc-macro
44
//@run-rustfix
5-
// ignore-32bit
5+
//@ignore-32bit
66

77
#![feature(lint_reasons)]
88
#![allow(unused_imports, unreachable_code, unused_variables, dead_code, unused_attributes)]

tests/ui/macro_use_imports.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//@aux-build:macro_use_helper.rs
33
//@aux-build:proc_macro_derive.rs:proc-macro
44
//@run-rustfix
5-
// ignore-32bit
5+
//@ignore-32bit
66

77
#![feature(lint_reasons)]
88
#![allow(unused_imports, unreachable_code, unused_variables, dead_code, unused_attributes)]

tests/ui/macro_use_imports_expect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@aux-build:macro_rules.rs
22
//@aux-build:macro_use_helper.rs
33
//@aux-build:proc_macro_derive.rs:proc-macro
4-
// ignore-32bit
4+
//@ignore-32bit
55

66
#![feature(lint_reasons)]
77
#![allow(unused_imports, unreachable_code, unused_variables, dead_code, unused_attributes)]
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
//@run-rustfix
2+
3+
#![allow(unused)]
4+
#![warn(clippy::no_mangle_with_rust_abi)]
5+
6+
#[no_mangle]
7+
extern "C" fn rust_abi_fn_one(arg_one: u32, arg_two: usize) {}
8+
9+
#[no_mangle]
10+
pub extern "C" fn rust_abi_fn_two(arg_one: u32, arg_two: usize) {}
11+
12+
/// # Safety
13+
/// This function shouldn't be called unless the horsemen are ready
14+
#[no_mangle]
15+
pub unsafe extern "C" fn rust_abi_fn_three(arg_one: u32, arg_two: usize) {}
16+
17+
/// # Safety
18+
/// This function shouldn't be called unless the horsemen are ready
19+
#[no_mangle]
20+
unsafe extern "C" fn rust_abi_fn_four(arg_one: u32, arg_two: usize) {}
21+
22+
#[no_mangle]
23+
extern "C" fn rust_abi_multiline_function_really_long_name_to_overflow_args_to_multiple_lines(
24+
arg_one: u32,
25+
arg_two: usize,
26+
) -> u32 {
27+
0
28+
}
29+
30+
// Must not run on functions that explicitly opt in to Rust ABI with `extern "Rust"`
31+
#[no_mangle]
32+
#[rustfmt::skip]
33+
extern "Rust" fn rust_abi_fn_explicit_opt_in(arg_one: u32, arg_two: usize) {}
34+
35+
fn rust_abi_fn_again(arg_one: u32, arg_two: usize) {}
36+
37+
#[no_mangle]
38+
extern "C" fn c_abi_fn(arg_one: u32, arg_two: usize) {}
39+
40+
extern "C" fn c_abi_fn_again(arg_one: u32, arg_two: usize) {}
41+
42+
extern "C" {
43+
fn c_abi_in_block(arg_one: u32, arg_two: usize);
44+
}
45+
46+
fn main() {
47+
// test code goes here
48+
}

tests/ui/no_mangle_with_rust_abi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// run-rustfix
1+
//@run-rustfix
22

33
#![allow(unused)]
44
#![warn(clippy::no_mangle_with_rust_abi)]

tests/ui/non_octal_unix_permissions.fixed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore-windows
1+
//@ignore-target-windows
22
//@run-rustfix
33
#![warn(clippy::non_octal_unix_permissions)]
44
use std::fs::{DirBuilder, File, OpenOptions, Permissions};

tests/ui/non_octal_unix_permissions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore-windows
1+
//@ignore-target-windows
22
//@run-rustfix
33
#![warn(clippy::non_octal_unix_permissions)]
44
use std::fs::{DirBuilder, File, OpenOptions, Permissions};

tests/ui/transmute_32bit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore-64bit
1+
//@ignore-64bit
22

33
#[warn(clippy::wrong_transmute)]
44
fn main() {

tests/ui/transmute_64bit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore-32bit
1+
//@ignore-32bit
22

33
#[warn(clippy::wrong_transmute)]
44
fn main() {

0 commit comments

Comments
 (0)