about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel E. Moelius III <sam@moeli.us>2022-05-27 16:38:28 -0400
committerSamuel E. Moelius III <sam@moeli.us>2022-05-27 16:44:02 -0400
commit6027255eb20872b2fada8a8e6c0c9ec5c640e6f4 (patch)
treee69543a1e51fc2be8e0dd1a604ec16cb07c21efd
parent8f49e4127fbc64c0275b77f5c24a3da574c14a27 (diff)
downloadrust-6027255eb20872b2fada8a8e6c0c9ec5c640e6f4.tar.gz
rust-6027255eb20872b2fada8a8e6c0c9ec5c640e6f4.zip
Ignore `crashes` dir
-rw-r--r--tests/compile-test.rs5
-rw-r--r--tests/ui/crashes/ice-7169.fixed12
-rw-r--r--tests/ui/crashes/ice-7169.rs3
-rw-r--r--tests/ui/crashes/ice-7169.stderr2
-rw-r--r--tests/ui/crashes/ice-8250.fixed7
-rw-r--r--tests/ui/crashes/ice-8250.rs1
-rw-r--r--tests/ui/crashes/ice-8250.stderr2
-rw-r--r--tests/ui/crashes/ice-8821.fixed9
-rw-r--r--tests/ui/crashes/ice-8821.rs1
-rw-r--r--tests/ui/crashes/ice-8821.stderr2
10 files changed, 6 insertions, 38 deletions
diff --git a/tests/compile-test.rs b/tests/compile-test.rs
index 4f17e7ffbc2..583be5a8d47 100644
--- a/tests/compile-test.rs
+++ b/tests/compile-test.rs
@@ -345,8 +345,6 @@ const RUSTFIX_COVERAGE_KNOWN_EXCEPTIONS: &[&str] = &[
     "cast_size_32bit.rs",
     "char_lit_as_u8.rs",
     "cmp_owned/without_suggestion.rs",
-    "crashes/ice-6250.rs",
-    "crashes/ice-6251.rs",
     "dbg_macro.rs",
     "deref_addrof_double_trigger.rs",
     "doc/unbalanced_ticks.rs",
@@ -388,6 +386,9 @@ fn check_rustfix_coverage() {
         assert!(RUSTFIX_COVERAGE_KNOWN_EXCEPTIONS.iter().is_sorted_by_key(Path::new));
 
         for rs_path in missing_coverage_contents.lines() {
+            if Path::new(rs_path).starts_with("tests/ui/crashes") {
+                continue;
+            }
             let filename = Path::new(rs_path).strip_prefix("tests/ui/").unwrap();
             assert!(
                 RUSTFIX_COVERAGE_KNOWN_EXCEPTIONS
diff --git a/tests/ui/crashes/ice-7169.fixed b/tests/ui/crashes/ice-7169.fixed
deleted file mode 100644
index b36fb49ee74..00000000000
--- a/tests/ui/crashes/ice-7169.fixed
+++ /dev/null
@@ -1,12 +0,0 @@
-// run-rustfix
-#![allow(dead_code)]
-
-#[derive(Default)]
-struct A<T> {
-    a: Vec<A<T>>,
-    b: T,
-}
-
-fn main() {
-    if Ok::<_, ()>(A::<String>::default()).is_ok() {}
-}
diff --git a/tests/ui/crashes/ice-7169.rs b/tests/ui/crashes/ice-7169.rs
index 1769a96bd2f..82095febc19 100644
--- a/tests/ui/crashes/ice-7169.rs
+++ b/tests/ui/crashes/ice-7169.rs
@@ -1,6 +1,3 @@
-// run-rustfix
-#![allow(dead_code)]
-
 #[derive(Default)]
 struct A<T> {
     a: Vec<A<T>>,
diff --git a/tests/ui/crashes/ice-7169.stderr b/tests/ui/crashes/ice-7169.stderr
index e7d0671386b..5a9cd32380a 100644
--- a/tests/ui/crashes/ice-7169.stderr
+++ b/tests/ui/crashes/ice-7169.stderr
@@ -1,5 +1,5 @@
 error: redundant pattern matching, consider using `is_ok()`
-  --> $DIR/ice-7169.rs:11:12
+  --> $DIR/ice-7169.rs:8:12
    |
 LL |     if let Ok(_) = Ok::<_, ()>(A::<String>::default()) {}
    |     -------^^^^^-------------------------------------- help: try this: `if Ok::<_, ()>(A::<String>::default()).is_ok()`
diff --git a/tests/ui/crashes/ice-8250.fixed b/tests/ui/crashes/ice-8250.fixed
deleted file mode 100644
index 950dc0b4d57..00000000000
--- a/tests/ui/crashes/ice-8250.fixed
+++ /dev/null
@@ -1,7 +0,0 @@
-// run-rustfix
-fn _f(s: &str) -> Option<()> {
-    let _ = s[1..].split('.').next()?;
-    Some(())
-}
-
-fn main() {}
diff --git a/tests/ui/crashes/ice-8250.rs b/tests/ui/crashes/ice-8250.rs
index d3183d88fae..d9a5ee1162a 100644
--- a/tests/ui/crashes/ice-8250.rs
+++ b/tests/ui/crashes/ice-8250.rs
@@ -1,4 +1,3 @@
-// run-rustfix
 fn _f(s: &str) -> Option<()> {
     let _ = s[1..].splitn(2, '.').next()?;
     Some(())
diff --git a/tests/ui/crashes/ice-8250.stderr b/tests/ui/crashes/ice-8250.stderr
index 46d5aa7a2fc..8ed8f3b3a06 100644
--- a/tests/ui/crashes/ice-8250.stderr
+++ b/tests/ui/crashes/ice-8250.stderr
@@ -1,5 +1,5 @@
 error: unnecessary use of `splitn`
-  --> $DIR/ice-8250.rs:3:13
+  --> $DIR/ice-8250.rs:2:13
    |
 LL |     let _ = s[1..].splitn(2, '.').next()?;
    |             ^^^^^^^^^^^^^^^^^^^^^ help: try this: `s[1..].split('.')`
diff --git a/tests/ui/crashes/ice-8821.fixed b/tests/ui/crashes/ice-8821.fixed
deleted file mode 100644
index 046b4522ec1..00000000000
--- a/tests/ui/crashes/ice-8821.fixed
+++ /dev/null
@@ -1,9 +0,0 @@
-// run-rustfix
-#![warn(clippy::let_unit_value)]
-
-fn f() {}
-static FN: fn() = f;
-
-fn main() {
-    FN();
-}
diff --git a/tests/ui/crashes/ice-8821.rs b/tests/ui/crashes/ice-8821.rs
index 941225e9d1e..fb87b79aeed 100644
--- a/tests/ui/crashes/ice-8821.rs
+++ b/tests/ui/crashes/ice-8821.rs
@@ -1,4 +1,3 @@
-// run-rustfix
 #![warn(clippy::let_unit_value)]
 
 fn f() {}
diff --git a/tests/ui/crashes/ice-8821.stderr b/tests/ui/crashes/ice-8821.stderr
index aee13f00ca0..486096e0a06 100644
--- a/tests/ui/crashes/ice-8821.stderr
+++ b/tests/ui/crashes/ice-8821.stderr
@@ -1,5 +1,5 @@
 error: this let-binding has unit value
-  --> $DIR/ice-8821.rs:8:5
+  --> $DIR/ice-8821.rs:7:5
    |
 LL |     let _: () = FN();
    |     ^^^^^^^^^^^^^^^^^ help: omit the `let` binding: `FN();`