-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix:
map_entry suggest wrongly when key is not Copy
- Loading branch information
Showing
3 changed files
with
167 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| #![allow(unused, clippy::needless_pass_by_value, clippy::collapsible_if)] | ||
| #![warn(clippy::map_entry)] | ||
| //@no-rustfix | ||
|
|
||
| use std::collections::HashMap; | ||
| use std::hash::Hash; | ||
|
|
||
| macro_rules! m { | ||
| ($e:expr) => {{ $e }}; | ||
| } | ||
|
|
||
| macro_rules! insert { | ||
| ($map:expr, $key:expr, $val:expr) => { | ||
| $map.insert($key, $val) | ||
| }; | ||
| } | ||
|
|
||
| mod issue13306 { | ||
| use std::collections::HashMap; | ||
|
|
||
| struct Env { | ||
| enclosing: Option<Box<Env>>, | ||
| values: HashMap<String, usize>, | ||
| } | ||
|
|
||
| impl Env { | ||
| fn assign(&mut self, name: String, value: usize) -> bool { | ||
| if !self.values.contains_key(&name) { | ||
| //~^ map_entry | ||
| self.values.insert(name, value); | ||
| true | ||
| } else if let Some(enclosing) = &mut self.enclosing { | ||
| enclosing.assign(name, value) | ||
| } else { | ||
| false | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn issue9925(mut hm: HashMap<String, bool>) { | ||
| let key = "hello".to_string(); | ||
| if hm.contains_key(&key) { | ||
| //~^ map_entry | ||
| let bval = hm.get_mut(&key).unwrap(); | ||
| *bval = false; | ||
| } else { | ||
| hm.insert(key, true); | ||
| } | ||
| } | ||
|
|
||
| mod issue9470 { | ||
| use std::collections::HashMap; | ||
| use std::sync::Mutex; | ||
|
|
||
| struct Interner(i32); | ||
|
|
||
| impl Interner { | ||
| const fn new() -> Self { | ||
| Interner(0) | ||
| } | ||
|
|
||
| fn resolve(&self, name: String) -> Option<String> { | ||
| todo!() | ||
| } | ||
| } | ||
|
|
||
| static INTERNER: Mutex<Interner> = Mutex::new(Interner::new()); | ||
|
|
||
| struct VM { | ||
| stack: Vec<i32>, | ||
| globals: HashMap<String, i32>, | ||
| } | ||
|
|
||
| impl VM { | ||
| fn stack_top(&self) -> &i32 { | ||
| self.stack.last().unwrap() | ||
| } | ||
|
|
||
| fn resolve(&mut self, name: String, value: i32) -> Result<(), String> { | ||
| if self.globals.contains_key(&name) { | ||
| //~^ map_entry | ||
| self.globals.insert(name, value); | ||
| } else { | ||
| let interner = INTERNER.lock().unwrap(); | ||
| return Err(interner.resolve(name).unwrap().to_owned()); | ||
| } | ||
|
|
||
| Ok(()) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| error: usage of `contains_key` followed by `insert` on a `HashMap` | ||
| --> tests/ui/entry_unfixable.rs:28:13 | ||
| | | ||
| LL | / if !self.values.contains_key(&name) { | ||
| LL | | | ||
| LL | | self.values.insert(name, value); | ||
| LL | | true | ||
| ... | | ||
| LL | | false | ||
| LL | | } | ||
| | |_____________^ | ||
| | | ||
| = note: `-D clippy::map-entry` implied by `-D warnings` | ||
| = help: to override `-D warnings` add `#[allow(clippy::map_entry)]` | ||
|
|
||
| error: usage of `contains_key` followed by `insert` on a `HashMap` | ||
| --> tests/ui/entry_unfixable.rs:43:5 | ||
| | | ||
| LL | / if hm.contains_key(&key) { | ||
| LL | | | ||
| LL | | let bval = hm.get_mut(&key).unwrap(); | ||
| LL | | *bval = false; | ||
| LL | | } else { | ||
| LL | | hm.insert(key, true); | ||
| LL | | } | ||
| | |_____^ | ||
|
|
||
| error: usage of `contains_key` followed by `insert` on a `HashMap` | ||
| --> tests/ui/entry_unfixable.rs:81:13 | ||
| | | ||
| LL | / if self.globals.contains_key(&name) { | ||
| LL | | | ||
| LL | | self.globals.insert(name, value); | ||
| LL | | } else { | ||
| LL | | let interner = INTERNER.lock().unwrap(); | ||
| LL | | return Err(interner.resolve(name).unwrap().to_owned()); | ||
| LL | | } | ||
| | |_____________^ | ||
|
|
||
| error: aborting due to 3 previous errors | ||
|
|