diff options
| author | Aaron Turon <aturon@mozilla.com> | 2017-03-14 21:10:02 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-03-17 13:28:53 -0700 |
| commit | a8f4a1bd984091ffb8f87f9440e2483f94b44a20 (patch) | |
| tree | 09e1c6b160d9151d0b7ec19ef15454a8a531f3ff /src/libstd | |
| parent | 48890d497163bec75d40198b365b3ca670cc3454 (diff) | |
| download | rust-a8f4a1bd984091ffb8f87f9440e2483f94b44a20.tar.gz rust-a8f4a1bd984091ffb8f87f9440e2483f94b44a20.zip | |
Stabilize rc_raw feature, closes #37197
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/collections/hash/table.rs | 2 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs index 2c8bb433e8a..211605bef1e 100644 --- a/src/libstd/collections/hash/table.rs +++ b/src/libstd/collections/hash/table.rs @@ -1154,7 +1154,7 @@ impl<'a, K, V> Iterator for Drain<'a, K, V> { fn next(&mut self) -> Option<(SafeHash, K, V)> { self.iter.next().map(|bucket| { unsafe { - (**self.table).size -= 1; + (*self.table.as_mut_ptr()).size -= 1; let (k, v) = ptr::read(bucket.pair); (SafeHash { hash: ptr::replace(bucket.hash, EMPTY_BUCKET) }, k, v) } diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 2c83518d388..206a37b8e5d 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -245,7 +245,6 @@ #![feature(char_escape_debug)] #![feature(char_internals)] #![feature(collections)] -#![feature(collections_bound)] #![feature(collections_range)] #![feature(compiler_builtins_lib)] #![feature(const_fn)] |
