Move MSRV tests into the lint specific test files

[rust.git] / tests / ui / entry.fixed

diff --git a/tests/ui/entry.fixed b/tests/ui/entry.fixed
index cfad3090ba38d2bc7a0a5482c0c97084757f4fee..e43635abcd112fcebf173130d56aaab75e474876 100644 (file)
--- a/tests/ui/entry.fixed
+++ b/tests/ui/entry.fixed
@@ -2,9 +2,9 @@
 
 #![allow(unused, clippy::needless_pass_by_value, clippy::collapsible_if)]
 #![warn(clippy::map_entry)]
-#![feature(asm)]
 
-use std::collections::{BTreeMap, HashMap};
+use std::arch::asm;
+use std::collections::HashMap;
 use std::hash::Hash;
 
 macro_rules! m {
@@ -142,14 +142,13 @@ fn hash_map<K: Eq + Hash + Copy, V: Copy>(m: &mut HashMap<K, V>, m2: &mut HashMa
     if !m.contains_key(&k) {
         insert!(m, k, v);
     }
-}
 
-fn btree_map<K: Eq + Ord + Copy, V: Copy>(m: &mut BTreeMap<K, V>, k: K, v: V, v2: V) {
-    // insert then do something, use if let
-    if let std::collections::btree_map::Entry::Vacant(e) = m.entry(k) {
-        e.insert(v);
-        foo();
-    }
+    // or_insert_with. Partial move of a local declared in the closure is ok.
+    m.entry(k).or_insert_with(|| {
+        let x = (String::new(), String::new());
+        let _ = x.0;
+        v
+    });
 }
 
 fn main() {}