Skip to content

Commit

Permalink
Rollup merge of rust-lang#83807 - sjakobi:77548-remove-ignore-annotat…
Browse files Browse the repository at this point in the history
…ions, r=Mark-Simulacrum

Tests: Remove redundant `ignore-tidy-linelength` annotations

This is step 2 towards fixing rust-lang#77548.

In the codegen and codegen-units test suites, the `//` comment markers
were kept in order not to affect any source locations. This is because
these tests cannot be automatically `--bless`ed.
  • Loading branch information
Dylan-DPC committed Apr 4, 2021
2 parents 03bd4d2 + 3ea62cb commit ad776fd
Show file tree
Hide file tree
Showing 271 changed files with 1,596 additions and 1,848 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// compile-flags:-Zprint-mono-items=eager
// compile-flags:-Zinline-in-all-cgus

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// compile-flags:-Zprint-mono-items=eager

#![deny(dead_code)]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// compile-flags:-Zprint-mono-items=eager
// compile-flags:-Zinline-in-all-cgus

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// compile-flags:-Zprint-mono-items=eager -Zinline-in-all-cgus -Zmir-opt-level=0

#![deny(dead_code)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// ignoring this test until MIR codegen has taken over completely
// ignore-test

// ignore-tidy-linelength
//
// compile-flags:-Zprint-mono-items=eager

#![deny(dead_code)]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// compile-flags:-Zprint-mono-items=eager
// compile-flags:-Zinline-in-all-cgus

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// compile-flags:-Zprint-mono-items=eager

#![deny(dead_code)]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// compile-flags:-Zprint-mono-items=eager
// compile-flags:-Zinline-in-all-cgus

Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen-units/item-collection/tuple-drop-glue.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// compile-flags:-Zprint-mono-items=eager
// compile-flags:-Zinline-in-all-cgus

Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen-units/partitioning/extern-drop-glue.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//

// We specify -C incremental here because we want to test the partitioning for
// incremental compilation
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen-units/partitioning/extern-generic.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// We specify -C incremental here because we want to test the partitioning for
// incremental compilation
// compile-flags:-Zprint-mono-items=eager -Cincremental=tmp/partitioning-tests/extern-generic -Zshare-generics=y
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// We specify -C incremental here because we want to test the partitioning for
// incremental compilation
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/inlining-from-extern-crate
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen-units/partitioning/local-drop-glue.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// We specify -C incremental here because we want to test the partitioning for
// incremental compilation
// We specify opt-level=0 because `drop_in_place` is `Internal` when optimizing
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// We specify -C incremental here because we want to test the partitioning for
// incremental compilation
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/local-inlining-but-not-all
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen-units/partitioning/local-inlining.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// We specify -C incremental here because we want to test the partitioning for
// incremental compilation
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/local-inlining
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// We specify -C incremental here because we want to test the partitioning for
// incremental compilation
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/local-transitive-inlining
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// much sense at the moment.
// ignore-test

// ignore-tidy-linelength
//
// We specify -C incremental here because we want to test the partitioning for
// incremental compilation
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/methods-are-with-self-type
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen-units/partitioning/shared-generics.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// no-prefer-dynamic
// NOTE: We always compile this test with -Copt-level=0 because higher opt-levels
// prevent drop-glue from participating in share-generics.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//

// We specify -C incremental here because we want to test the partitioning for
// incremental compilation
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/align-enum.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -C no-prepopulate-passes -Z mir-opt-level=0
// ignore-tidy-linelength
//

#![crate_type = "lib"]

Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/align-struct.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -C no-prepopulate-passes -Z mir-opt-level=0
// ignore-tidy-linelength
//

#![crate_type = "lib"]

Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/async-fn-debug-msvc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// - The generator types and variants are marked artificial
// - Captured vars from the source are not marked artificial
//
// ignore-tidy-linelength
//
// compile-flags: -C debuginfo=2 --edition=2018
// only-msvc

Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/async-fn-debug.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// - The generator types and variants are marked artificial
// - Captured vars from the source are not marked artificial
//
// ignore-tidy-linelength
//
// compile-flags: -C debuginfo=2 --edition=2018
// ignore-msvc

Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/c-variadic.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// ignore-wasm32-bare compiled with panic=abort by default
// compile-flags: -C no-prepopulate-passes
// ignore-tidy-linelength
//

#![crate_type = "lib"]
#![feature(c_variadic)]
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/consts.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -C no-prepopulate-passes
// ignore-tidy-linelength
//

#![crate_type = "lib"]

Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/debug-compile-unit-path.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -g --remap-path-prefix={{cwd}}=/cwd/ --remap-path-prefix={{src-base}}=/base/
// ignore-tidy-linelength
//
//
// Ensure that we remap the compile unit directory and that we set it to the compilers current
// working directory and not something else.
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/enum-debug-clike.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This tests that debug info for "c-like" enums is properly emitted.
// This is ignored for the fallback mode on MSVC due to problems with PDB.

// ignore-tidy-linelength
//
// ignore-msvc

// compile-flags: -g -C no-prepopulate-passes
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/enum-debug-niche-2.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// This tests that optimized enum debug info accurately reflects the enum layout.
// This is ignored for the fallback mode on MSVC due to problems with PDB.

// ignore-tidy-linelength
//
// ignore-msvc

// compile-flags: -g -C no-prepopulate-passes
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/function-arguments.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -O -C no-prepopulate-passes
// ignore-tidy-linelength
//
// min-system-llvm-version: 12.0

#![crate_type = "lib"]
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/gdb_debug_script_load.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// ignore-windows
// ignore-macos
// ignore-wasm
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/generator-debug-msvc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// - The generator types and variants are marked artificial
// - Captured vars from the source are not marked artificial
//
// ignore-tidy-linelength
//
// compile-flags: -C debuginfo=2
// only-msvc

Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/generator-debug.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// - The generator types and variants are marked artificial
// - Captured vars from the source are not marked artificial
//
// ignore-tidy-linelength
//
// compile-flags: -C debuginfo=2 --edition=2018
// ignore-msvc

Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/inline-debuginfo.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![crate_type="rlib"]
// compile-flags: -Copt-level=3 -g
// ignore-tidy-linelength
//

#[no_mangle]
#[inline(always)]
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/instrument-mcount.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// compile-flags: -Z instrument-mcount

#![crate_type = "lib"]
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/issue-44056-macos-tls-align.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// only-macos
// no-system-llvm
// compile-flags: -O
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/packed.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// compile-flags: -O -C no-prepopulate-passes

#![crate_type = "lib"]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//

// compile-flags: -g --remap-path-prefix={{cwd}}=/the/aux-cwd --remap-path-prefix={{src-base}}/remap_path_prefix/auxiliary=/the/aux-src

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// compile-flags: -g --remap-path-prefix={{cwd}}=/the/aux-cwd --remap-path-prefix={{src-base}}/remap_path_prefix/auxiliary=/the/aux-src

#![crate_type = "lib"]
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/remap_path_prefix/main.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ignore-windows
// ignore-tidy-linelength
//

// compile-flags: -g -C no-prepopulate-passes --remap-path-prefix={{cwd}}=/the/cwd --remap-path-prefix={{src-base}}=/the/src
// aux-build:remap_path_prefix_aux.rs
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/repeat-trusted-len.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -O
// ignore-tidy-linelength
//

#![crate_type = "lib"]

Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/repr-transparent-aggregates-1.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -C no-prepopulate-passes
// ignore-tidy-linelength
//

// min-system-llvm-version: 12.0
// ignore-arm
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/repr-transparent-aggregates-2.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -C no-prepopulate-passes
// ignore-tidy-linelength
//

// min-system-llvm-version: 12.0
// ignore-aarch64
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/repr-transparent-aggregates-3.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -C no-prepopulate-passes
// ignore-tidy-linelength
//

// min-system-llvm-version: 12.0
// only-mips64
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/riscv-abi/riscv64-lp64-lp64f-lp64d-abi.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// compile-flags: -C no-prepopulate-passes
// only-riscv64
// only-linux
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/riscv-abi/riscv64-lp64d-abi.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// compile-flags: -C no-prepopulate-passes
// only-riscv64
// only-linux
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/riscv-abi/riscv64-lp64f-lp64d-abi.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// compile-flags: -C no-prepopulate-passes
// only-riscv64
// only-linux
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -C no-prepopulate-passes
// ignore-tidy-linelength
//

#![crate_type = "lib"]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -C no-prepopulate-passes
// ignore-tidy-linelength
//

#![crate_type = "lib"]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//

// compile-flags: -C no-prepopulate-passes

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//

// compile-flags: -C no-prepopulate-passes

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// ignore-tidy-linelength
//
// compile-flags: -C no-prepopulate-passes

#![crate_type = "lib"]
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/stores.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// compile-flags: -C no-prepopulate-passes
// ignore-tidy-linelength
//

#![crate_type = "lib"]

Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/target-cpu-on-functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// "target-cpu" attribute in LLVM.

// no-prefer-dynamic
// ignore-tidy-linelength
//
// compile-flags: -C no-prepopulate-passes -C panic=abort -C linker-plugin-lto -Cpasses=name-anon-globals

#![crate_type = "staticlib"]
Expand Down
2 changes: 1 addition & 1 deletion src/test/codegen/tune-cpu-on-functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// "tune-cpu" attribute in LLVM.

// no-prefer-dynamic
// ignore-tidy-linelength
//
// compile-flags: -C no-prepopulate-passes -C panic=abort -C linker-plugin-lto -Cpasses=name-anon-globals -Z tune-cpu=generic

#![crate_type = "staticlib"]
Expand Down
2 changes: 0 additions & 2 deletions src/test/debuginfo/borrowed-enum.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// ignore-tidy-linelength

// Require a gdb or lldb that can read DW_TAG_variant_part.
// min-gdb-version: 8.2
// rust-lldb
Expand Down
2 changes: 0 additions & 2 deletions src/test/debuginfo/boxed-struct.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// ignore-tidy-linelength

// min-lldb-version: 310

// compile-flags:-g
Expand Down
1 change: 0 additions & 1 deletion src/test/debuginfo/by-value-non-immediate-argument.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-tidy-linelength
// ignore-test // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
// min-lldb-version: 310

Expand Down
1 change: 0 additions & 1 deletion src/test/debuginfo/c-style-enum-in-composite.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-tidy-linelength
// min-lldb-version: 310

// compile-flags:-g
Expand Down
2 changes: 0 additions & 2 deletions src/test/debuginfo/c-style-enum.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// ignore-tidy-linelength

// ignore-aarch64
// ignore-gdb // Test temporarily ignored due to debuginfo tests being disabled, see PR 47155
// min-lldb-version: 310
Expand Down
Loading

0 comments on commit ad776fd

Please sign in to comment.