about summary refs log tree commit diff
path: root/src/libcoretest
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-10-03 11:00:03 -0700
committerGitHub <noreply@github.com>2016-10-03 11:00:03 -0700
commit7a26aeca77bcf334747eddb630e3b9475149b7f5 (patch)
tree1c3b1e3e30d338f9ecdc2d8b9badf13d1ab4cb84 /src/libcoretest
parentff713464e6530fab2e13d0965929d8189c59ae56 (diff)
parent10c3134da025f3d63700abf52769c0f106637a14 (diff)
downloadrust-7a26aeca77bcf334747eddb630e3b9475149b7f5.tar.gz
rust-7a26aeca77bcf334747eddb630e3b9475149b7f5.zip
Auto merge of #36815 - alexcrichton:stabilize-1.13, r=aturon
std: Stabilize and deprecate APIs for 1.13

This commit is intended to be backported to the 1.13 branch, and works with the
following APIs:

Stabilized

* `i32::checked_abs`
* `i32::wrapping_abs`
* `i32::overflowing_abs`
* `RefCell::try_borrow`
* `RefCell::try_borrow_mut`

Deprecated

* `BinaryHeap::push_pop`
* `BinaryHeap::replace`
* `SipHash13`
* `SipHash24`
* `SipHasher` - use `DefaultHasher` instead in the `std::collections::hash_map`
  module

Closes #28147
Closes #34767
Closes #35057
Closes #35070
Diffstat (limited to 'src/libcoretest')
-rw-r--r--src/libcoretest/hash/sip.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libcoretest/hash/sip.rs b/src/libcoretest/hash/sip.rs
index a5e6005545b..b465d7de180 100644
--- a/src/libcoretest/hash/sip.rs
+++ b/src/libcoretest/hash/sip.rs
@@ -7,6 +7,9 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
+
+#![allow(deprecated)]
+
 use test::{Bencher, black_box};
 
 use core::hash::{Hash, Hasher};