about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-03-19 07:49:32 +0000
committerbors <bors@rust-lang.org>2018-03-19 07:49:32 +0000
commitaafe7d89f0643e40f6f60b4bd4dd742041120227 (patch)
tree90ae2c3c599a1f22b95880cf941e05faa908361b /src/libstd
parent15add366faac554db51244d1e27e4d10a08ab6e8 (diff)
parent89ecb0d5424f4eb72de70c0b7b0c3fb819273728 (diff)
downloadrust-aafe7d89f0643e40f6f60b4bd4dd742041120227.tar.gz
rust-aafe7d89f0643e40f6f60b4bd4dd742041120227.zip
Auto merge of #49108 - SimonSapin:sip, r=TimNN
Remove or hide deprecated unstable SipHasher{13,24}

Deprecated since Rust 1.13.0.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/lib.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 70a1f82c9a1..62bef4bc499 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -267,7 +267,7 @@
 #![feature(fn_traits)]
 #![feature(fnbox)]
 #![feature(generic_param_attrs)]
-#![feature(hashmap_hasher)]
+#![feature(hashmap_internals)]
 #![feature(heap_api)]
 #![feature(i128)]
 #![feature(i128_type)]
@@ -298,7 +298,6 @@
 #![feature(raw)]
 #![feature(rustc_attrs)]
 #![feature(stdsimd)]
-#![feature(sip_hash_13)]
 #![feature(slice_bytes)]
 #![feature(slice_concat_ext)]
 #![feature(slice_internals)]