Skip to content

Commit

Permalink
Rollup merge of rust-lang#97883 - JohnTitor:no-more-compare-mode-nll,…
Browse files Browse the repository at this point in the history
… r=jackh726

Remove `ignore-compare-mode-nll` annotations from tests

Since rust-lang#95565 these do nothing as compare-mode-nll has been removed.
r? ``@jackh726``
  • Loading branch information
matthiaskrgr authored Jun 8, 2022
2 parents c84db32 + 93c210a commit 3221156
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 4 deletions.
1 change: 0 additions & 1 deletion src/test/ui/json-multiple.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// build-pass
// ignore-pass (different metadata emitted in different modes)
// compile-flags: --json=diagnostic-short --json artifacts --error-format=json
// ignore-compare-mode-nll

#![crate_type = "lib"]
1 change: 0 additions & 1 deletion src/test/ui/json-options.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// build-pass
// ignore-pass (different metadata emitted in different modes)
// compile-flags: --json=diagnostic-short,artifacts --error-format=json
// ignore-compare-mode-nll

#![crate_type = "lib"]
1 change: 0 additions & 1 deletion src/test/ui/rmeta/emit-artifact-notifications.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// build-pass
// ignore-pass
// ^-- needed because `--pass check` does not emit the output needed.
// ignore-compare-mode-nll

// A very basic test for the emission of artifact notifications in JSON output.

Expand Down
1 change: 0 additions & 1 deletion src/test/ui/save-analysis/emit-notifications.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
// compile-flags: --crate-type rlib --error-format=json
// ignore-pass
// ^-- needed because otherwise, the .stderr file changes with --pass check
// ignore-compare-mode-nll

pub fn foo() {}

0 comments on commit 3221156

Please sign in to comment.