---

pczarn · pczarn · commit 52fa96e8b79c · 2016-03-06T12:24:18.000+01:00
yaml --- r: 271407 b: refs/heads/auto c: ef87431 h: refs/heads/master i: 271405: 9c0695f 271403: 413bc26 271399: 7aff841 271391: bed8363
diff --git a/[refs] b/[refs]
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: d67cf45d2222fdde16d935dead18a8be4b080060
+refs/heads/auto: ef874310f2c11671e96fd700aceb9dcbc44db983
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1
diff --git a/branches/auto/src/libstd/collections/hash/map.rs b/branches/auto/src/libstd/collections/hash/map.rs
@@ -1668,8 +1668,13 @@ impl<K, S, Q: ?Sized> super::Recover<Q> for HashMap<K, (), S>
             InternalEntry::Occupied { mut elem } => {
                 Some(mem::replace(elem.read_mut().0, key))
             }
-            _ => {
-                None
+            other => {
+                if let Some(Vacant(vacant)) = other.into_entry(key) {
+                    vacant.insert(());
+                    None
+                } else {
+                    unreachable!()
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1668,8 +1668,13 @@ impl<K, S, Q: ?Sized> super::Recover<Q> for HashMap<K, (), S>`
`1668`	`1668`	`InternalEntry::Occupied { mut elem } => {`
`1669`	`1669`	`Some(mem::replace(elem.read_mut().0, key))`
`1670`	`1670`	`}`
`1671`		`- _ => {`
`1672`		`- None`
	`1671`	`+ other => {`
	`1672`	`+ if let Some(Vacant(vacant)) = other.into_entry(key) {`
	`1673`	`+ vacant.insert(());`
	`1674`	`+ None`
	`1675`	`+ } else {`
	`1676`	`+ unreachable!()`
	`1677`	`+ }`
`1673`	`1678`	`}`
`1674`	`1679`	`}`
`1675`	`1680`	`}`