about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-03-19 01:40:57 +0000
committerbors <bors@rust-lang.org>2017-03-19 01:40:57 +0000
commitbfc49b1092512aee4fe3d1348c3250fcdc8978d3 (patch)
treedc83cc0640869000912004d809bb4630c0442e69 /src/libstd
parent4853584000c2e71710318b1ff3393b6be25c076a (diff)
parent1241a88fa9ddf5e645d1e6e93e04c435bbf15cd4 (diff)
downloadrust-bfc49b1092512aee4fe3d1348c3250fcdc8978d3.tar.gz
rust-bfc49b1092512aee4fe3d1348c3250fcdc8978d3.zip
Auto merge of #40538 - aturon:stab-1.17, r=alexcrichton
Library stabilizations for 1.17

Details of the stabilizations are available in the commits. Includes only library stabilizations; there are a couple of compiler stabilizations that should also be done for 1.17.

Will need a beta backport, which I will create after approval.

r? @alexcrichton
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/collections/hash/table.rs2
-rw-r--r--src/libstd/lib.rs1
-rw-r--r--src/libstd/process.rs2
3 files changed, 2 insertions, 3 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)]
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index f846ef3e69e..97c48ee5903 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -1032,7 +1032,7 @@ pub fn exit(code: i32) -> ! {
 /// will be run. If a clean shutdown is needed it is recommended to only call
 /// this function at a known point where there are no more destructors left
 /// to run.
-#[unstable(feature = "process_abort", issue = "37838")]
+#[stable(feature = "process_abort", since = "1.17.0")]
 pub fn abort() -> ! {
     unsafe { ::sys::abort_internal() };
 }