diff options
| author | Piti the little Light <djhlinacz@gmail.com> | 2020-10-01 18:34:36 +0200 |
|---|---|---|
| committer | flip1995 <philipp.krones@embecosm.com> | 2020-11-03 16:44:23 +0100 |
| commit | e320dd30428aeb85577b36afa594429a41bc07f6 (patch) | |
| tree | 81fcca564cfd331011634c5d709139763f9d90ff | |
| parent | 0ab96ba2c0196558dc49624f59e6fd9c717a02f6 (diff) | |
| download | rust-e320dd30428aeb85577b36afa594429a41bc07f6.tar.gz rust-e320dd30428aeb85577b36afa594429a41bc07f6.zip | |
Improve: error message
| -rw-r--r-- | clippy_lints/src/utils/paths.rs | 2 | ||||
| -rw-r--r-- | tests/ui/from_iter_instead_of_collect.rs | 2 | ||||
| -rw-r--r-- | tests/ui/from_iter_instead_of_collect.stderr | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/clippy_lints/src/utils/paths.rs b/clippy_lints/src/utils/paths.rs index 8afbd8930b6..95fe8733421 100644 --- a/clippy_lints/src/utils/paths.rs +++ b/clippy_lints/src/utils/paths.rs @@ -44,7 +44,7 @@ pub const FN: [&str; 3] = ["core", "ops", "Fn"]; pub const FN_MUT: [&str; 3] = ["core", "ops", "FnMut"]; pub const FN_ONCE: [&str; 3] = ["core", "ops", "FnOnce"]; pub const FROM_FROM: [&str; 4] = ["core", "convert", "From", "from"]; -pub const FROM_ITERATOR: [&str; 3] = ["std", "iter", "FromIterator"]; +pub const FROM_ITERATOR: [&str; 5] = ["core", "iter", "traits", "collect", "FromIterator"]; pub const FROM_TRAIT: [&str; 3] = ["core", "convert", "From"]; pub const FUTURE_FROM_GENERATOR: [&str; 3] = ["core", "future", "from_generator"]; pub const HASH: [&str; 3] = ["core", "hash", "Hash"]; diff --git a/tests/ui/from_iter_instead_of_collect.rs b/tests/ui/from_iter_instead_of_collect.rs index 9071be33c64..25b87a0a903 100644 --- a/tests/ui/from_iter_instead_of_collect.rs +++ b/tests/ui/from_iter_instead_of_collect.rs @@ -5,7 +5,7 @@ use std::iter::FromIterator; fn main() { let iter_expr = std::iter::repeat(5).take(5); - Vec::from_iter(iter_expr); + HashMap::<usize, &i8>::from_iter(vec![5, 5, 5, 5].iter().enumerate()); } diff --git a/tests/ui/from_iter_instead_of_collect.stderr b/tests/ui/from_iter_instead_of_collect.stderr index 1bc787aa795..3263005d7ec 100644 --- a/tests/ui/from_iter_instead_of_collect.stderr +++ b/tests/ui/from_iter_instead_of_collect.stderr @@ -1,5 +1,5 @@ error: use `.collect()` instead of `::from_iter()` - --> $DIR/from_iter_instead_of_collect.rs:9:5 + --> $DIR/from_iter_instead_of_collect.rs:8:5 | LL | Vec::from_iter(iter_expr); | ^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using: ``iter_expr.collect()`` |