Auto merge of rust-lang#6669 - magurotuna:fix-test-name, r=flip1995

Fix file names of flat_map_identity test This patch fixes the file names of the `flat_map_identity` test. Previously, their names were started with `unnecessary_flat_map` even though the lint rule name is `flat_map_identity`. This inconsistency happened probably because the rule name was changed during the discussion in the PR where this rule was introduced. ref: rust-lang/rust-clippy#4231 changelog: none
flip1995 · Feb 3, 2021 · 876ffa4 · 876ffa4
2 parents 3e41797 + 6396b8f
commit 876ffa4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/tests/ui/unnecessary_flat_map.fixed → tests/ui/flat_map_identity.fixed b/tests/ui/unnecessary_flat_map.fixed → tests/ui/flat_map_identity.fixed
diff --git a/tests/ui/unnecessary_flat_map.rs → tests/ui/flat_map_identity.rs b/tests/ui/unnecessary_flat_map.rs → tests/ui/flat_map_identity.rs
diff --git a/tests/ui/unnecessary_flat_map.stderr → tests/ui/flat_map_identity.stderr b/tests/ui/unnecessary_flat_map.stderr → tests/ui/flat_map_identity.stderr
@@ -1,13 +1,13 @@
 error: called `flat_map(|x| x)` on an `Iterator`
-  --> $DIR/unnecessary_flat_map.rs:10:22
+  --> $DIR/flat_map_identity.rs:10:22
    |
 LL |     let _ = iterator.flat_map(|x| x);
    |                      ^^^^^^^^^^^^^^^ help: try: `flatten()`
    |
    = note: `-D clippy::flat-map-identity` implied by `-D warnings`
 
 error: called `flat_map(std::convert::identity)` on an `Iterator`
-  --> $DIR/unnecessary_flat_map.rs:13:22
+  --> $DIR/flat_map_identity.rs:13:22
    |
 LL |     let _ = iterator.flat_map(convert::identity);
    |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `flatten()`