about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-02-03 15:39:37 +0000
committerbors <bors@rust-lang.org>2021-02-03 15:39:37 +0000
commit876ffa4674c5d304983ff4d9bfeaffadee2cbb37 (patch)
treed65f0cc688494e0d9fa8556329d6a1cf8766b187 /tests
parent3e4179766bcecd712824da04356621b8df012ea4 (diff)
parent6396b8fb7f095919da061ad2bfeb008ee7fb6589 (diff)
downloadrust-876ffa4674c5d304983ff4d9bfeaffadee2cbb37.tar.gz
rust-876ffa4674c5d304983ff4d9bfeaffadee2cbb37.zip
Auto merge of #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: https://github.com/rust-lang/rust-clippy/pull/4231

changelog: none
Diffstat (limited to 'tests')
-rw-r--r--tests/ui/flat_map_identity.fixed (renamed from tests/ui/unnecessary_flat_map.fixed)0
-rw-r--r--tests/ui/flat_map_identity.rs (renamed from tests/ui/unnecessary_flat_map.rs)0
-rw-r--r--tests/ui/flat_map_identity.stderr (renamed from tests/ui/unnecessary_flat_map.stderr)4
3 files changed, 2 insertions, 2 deletions
diff --git a/tests/ui/unnecessary_flat_map.fixed b/tests/ui/flat_map_identity.fixed
index dfe3bd47e13..dfe3bd47e13 100644
--- a/tests/ui/unnecessary_flat_map.fixed
+++ b/tests/ui/flat_map_identity.fixed
diff --git a/tests/ui/unnecessary_flat_map.rs b/tests/ui/flat_map_identity.rs
index 393b9569255..393b9569255 100644
--- a/tests/ui/unnecessary_flat_map.rs
+++ b/tests/ui/flat_map_identity.rs
diff --git a/tests/ui/unnecessary_flat_map.stderr b/tests/ui/flat_map_identity.stderr
index a1cd5745e49..e4686ae5a54 100644
--- a/tests/ui/unnecessary_flat_map.stderr
+++ b/tests/ui/flat_map_identity.stderr
@@ -1,5 +1,5 @@
 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()`
@@ -7,7 +7,7 @@ LL |     let _ = iterator.flat_map(|x| x);
    = 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()`