about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2022-06-08 13:32:24 -0700
committerGitHub <noreply@github.com>2022-06-08 13:32:24 -0700
commitcf3dd7b5e8f9a262f86a4369c4a61d49327098a7 (patch)
tree9204a8d5ccaef639608ceefb26a924d47dde5bcd
parenta36671a24efbb5809e541fc7521acb8b30809061 (diff)
parent93c210abaa34d50a13a9b6d70cb79c95f90f8e70 (diff)
downloadrust-cf3dd7b5e8f9a262f86a4369c4a61d49327098a7.tar.gz
rust-cf3dd7b5e8f9a262f86a4369c4a61d49327098a7.zip
Rollup merge of #97883 - JohnTitor:no-more-compare-mode-nll, r=jackh726
Remove `ignore-compare-mode-nll` annotations from tests

Since #95565 these do nothing as compare-mode-nll has been removed.
r? `@jackh726`
-rw-r--r--src/test/ui/json-multiple.rs1
-rw-r--r--src/test/ui/json-options.rs1
-rw-r--r--src/test/ui/rmeta/emit-artifact-notifications.rs1
-rw-r--r--src/test/ui/save-analysis/emit-notifications.rs1
4 files changed, 0 insertions, 4 deletions
diff --git a/src/test/ui/json-multiple.rs b/src/test/ui/json-multiple.rs
index 4c37e20d94d..fb126339dc2 100644
--- a/src/test/ui/json-multiple.rs
+++ b/src/test/ui/json-multiple.rs
@@ -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"]
diff --git a/src/test/ui/json-options.rs b/src/test/ui/json-options.rs
index fea07cc9e3e..8b6ba131eb0 100644
--- a/src/test/ui/json-options.rs
+++ b/src/test/ui/json-options.rs
@@ -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"]
diff --git a/src/test/ui/rmeta/emit-artifact-notifications.rs b/src/test/ui/rmeta/emit-artifact-notifications.rs
index be38fb4c3a6..984a7fabb66 100644
--- a/src/test/ui/rmeta/emit-artifact-notifications.rs
+++ b/src/test/ui/rmeta/emit-artifact-notifications.rs
@@ -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.
 
diff --git a/src/test/ui/save-analysis/emit-notifications.rs b/src/test/ui/save-analysis/emit-notifications.rs
index 8a696695ec0..9179944a620 100644
--- a/src/test/ui/save-analysis/emit-notifications.rs
+++ b/src/test/ui/save-analysis/emit-notifications.rs
@@ -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() {}