Skip to content

Commit 8337e86

Browse files
clarfontheyclarfonthey
committed
Add insta-stable std::hash::{DefaultHasher, RandomState} exports
1 parent 075409d commit 8337e86

File tree

19 files changed

+40
-68
lines changed

19 files changed

+40
-68
lines changed

‎compiler/rustc_middle/src/ty/error.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ use rustc_hir::def_id::DefId;
77
use rustc_span::symbol::Symbol;
88
use rustc_target::spec::abi;
99
use std::borrow::Cow;
10-
use std::collections::hash_map::DefaultHasher;
11-
use std::hash::{Hash, Hasher};
10+
use std::hash::{DefaultHasher, Hash, Hasher};
1211
use std::path::PathBuf;
1312

1413
#[derive(Clone, Copy, Debug, PartialEq, Eq, TypeFoldable, TypeVisitable)]

‎compiler/rustc_session/src/config.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -3179,9 +3179,8 @@ pub(crate) mod dep_tracking {
31793179
use rustc_target::spec::{
31803180
RelroLevel, SanitizerSet, SplitDebuginfo, StackProtector, TargetTriple, TlsModel,
31813181
};
3182-
use std::collections::hash_map::DefaultHasher;
31833182
use std::collections::BTreeMap;
3184-
use std::hash::Hash;
3183+
use std::hash::{DefaultHasher, Hash};
31853184
use std::num::NonZeroUsize;
31863185
use std::path::PathBuf;
31873186

‎compiler/rustc_session/src/options.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ use rustc_span::SourceFileHashAlgorithm;
1919

2020
use std::collections::BTreeMap;
2121

22-
use std::collections::hash_map::DefaultHasher;
23-
use std::hash::Hasher;
22+
use std::hash::{DefaultHasher, Hasher};
2423
use std::num::{IntErrorKind, NonZeroUsize};
2524
use std::path::PathBuf;
2625
use std::str;

‎compiler/rustc_target/src/spec/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3537,7 +3537,7 @@ impl TargetTriple {
35373537
/// If this target is a path, a hash of the path is appended to the triple returned
35383538
/// by `triple()`.
35393539
pub fn debug_triple(&self) -> String {
3540-
use std::collections::hash_map::DefaultHasher;
3540+
use std::hash::DefaultHasher;
35413541

35423542
match self {
35433543
TargetTriple::TargetTriple(triple) => triple.to_owned(),

‎library/alloc/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ pub(crate) mod test_helpers {
271271
/// seed not being the same for every RNG invocation too.
272272
pub(crate) fn test_rng() -> rand_xorshift::XorShiftRng {
273273
use std::hash::{BuildHasher, Hash, Hasher};
274-
let mut hasher = std::collections::hash_map::RandomState::new().build_hasher();
274+
let mut hasher = std::hash::RandomState::new().build_hasher();
275275
std::panic::Location::caller().hash(&mut hasher);
276276
let hc64 = hasher.finish();
277277
let seed_vec =

‎library/alloc/src/vec/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2706,7 +2706,7 @@ impl<T: Clone, A: Allocator + Clone> Clone for Vec<T, A> {
27062706
/// ```
27072707
/// use std::hash::BuildHasher;
27082708
///
2709-
/// let b = std::collections::hash_map::RandomState::new();
2709+
/// let b = std::hash::RandomState::new();
27102710
/// let v: Vec<u8> = vec![0xa8, 0x3c, 0x09];
27112711
/// let s: &[u8] = &[0xa8, 0x3c, 0x09];
27122712
/// assert_eq!(b.hash_one(v), b.hash_one(s));

‎library/alloc/tests/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@
4343
#![deny(fuzzy_provenance_casts)]
4444
#![deny(unsafe_op_in_unsafe_fn)]
4545

46-
use std::collections::hash_map::DefaultHasher;
47-
use std::hash::{Hash, Hasher};
46+
use std::hash::{DefaultHasher, Hash, Hasher};
4847

4948
mod arc;
5049
mod autotraits;

‎library/core/src/array/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ impl<'a, T, const N: usize> TryFrom<&'a mut [T]> for &'a mut [T; N] {
297297
/// ```
298298
/// use std::hash::BuildHasher;
299299
///
300-
/// let b = std::collections::hash_map::RandomState::new();
300+
/// let b = std::hash::RandomState::new();
301301
/// let a: [u8; 3] = [0xa8, 0x3c, 0x09];
302302
/// let s: &[u8] = &[0xa8, 0x3c, 0x09];
303303
/// assert_eq!(b.hash_one(a), b.hash_one(s));

‎library/core/src/hash/mod.rs

+10-19
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
//! # Examples
1313
//!
1414
//! ```rust
15-
//! use std::collections::hash_map::DefaultHasher;
16-
//! use std::hash::{Hash, Hasher};
15+
//! use std::hash::{DefaultHasher, Hash, Hasher};
1716
//!
1817
//! #[derive(Hash)]
1918
//! struct Person {
@@ -46,8 +45,7 @@
4645
//! the [`Hash`] trait:
4746
//!
4847
//! ```rust
49-
//! use std::collections::hash_map::DefaultHasher;
50-
//! use std::hash::{Hash, Hasher};
48+
//! use std::hash::{DefaultHasher, Hash, Hasher};
5149
//!
5250
//! struct Person {
5351
//! id: u32,
@@ -194,8 +192,7 @@ pub trait Hash {
194192
/// # Examples
195193
///
196194
/// ```
197-
/// use std::collections::hash_map::DefaultHasher;
198-
/// use std::hash::{Hash, Hasher};
195+
/// use std::hash::{DefaultHasher, Hash, Hasher};
199196
///
200197
/// let mut hasher = DefaultHasher::new();
201198
/// 7920.hash(&mut hasher);
@@ -224,8 +221,7 @@ pub trait Hash {
224221
/// # Examples
225222
///
226223
/// ```
227-
/// use std::collections::hash_map::DefaultHasher;
228-
/// use std::hash::{Hash, Hasher};
224+
/// use std::hash::{DefaultHasher, Hash, Hasher};
229225
///
230226
/// let mut hasher = DefaultHasher::new();
231227
/// let numbers = [6, 28, 496, 8128];
@@ -300,8 +296,7 @@ pub use macros::Hash;
300296
/// # Examples
301297
///
302298
/// ```
303-
/// use std::collections::hash_map::DefaultHasher;
304-
/// use std::hash::Hasher;
299+
/// use std::hash::{DefaultHasher, Hasher};
305300
///
306301
/// let mut hasher = DefaultHasher::new();
307302
///
@@ -329,8 +324,7 @@ pub trait Hasher {
329324
/// # Examples
330325
///
331326
/// ```
332-
/// use std::collections::hash_map::DefaultHasher;
333-
/// use std::hash::Hasher;
327+
/// use std::hash::{DefaultHasher, Hasher};
334328
///
335329
/// let mut hasher = DefaultHasher::new();
336330
/// hasher.write(b"Cool!");
@@ -347,8 +341,7 @@ pub trait Hasher {
347341
/// # Examples
348342
///
349343
/// ```
350-
/// use std::collections::hash_map::DefaultHasher;
351-
/// use std::hash::Hasher;
344+
/// use std::hash::{DefaultHasher, Hasher};
352345
///
353346
/// let mut hasher = DefaultHasher::new();
354347
/// let data = [0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef];
@@ -627,8 +620,7 @@ impl<H: Hasher + ?Sized> Hasher for &mut H {
627620
/// # Examples
628621
///
629622
/// ```
630-
/// use std::collections::hash_map::RandomState;
631-
/// use std::hash::{BuildHasher, Hasher};
623+
/// use std::hash::{BuildHasher, Hasher, RandomState};
632624
///
633625
/// let s = RandomState::new();
634626
/// let mut hasher_1 = s.build_hasher();
@@ -656,8 +648,7 @@ pub trait BuildHasher {
656648
/// # Examples
657649
///
658650
/// ```
659-
/// use std::collections::hash_map::RandomState;
660-
/// use std::hash::BuildHasher;
651+
/// use std::hash::{BuildHasher, RandomState};
661652
///
662653
/// let s = RandomState::new();
663654
/// let new_s = s.build_hasher();
@@ -690,7 +681,7 @@ pub trait BuildHasher {
690681
/// }
691682
///
692683
/// // Then later, in a `#[test]` for the type...
693-
/// let bh = std::collections::hash_map::RandomState::new();
684+
/// let bh = std::hash::RandomState::new();
694685
/// assert_eq!(
695686
/// bh.hash_one(OrderAmbivalentPair(1, 2)),
696687
/// bh.hash_one(OrderAmbivalentPair(2, 1))

‎library/core/src/hash/sip.rs

+7-19
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::ptr;
1414
///
1515
/// See: <https://131002.net/siphash>
1616
#[unstable(feature = "hashmap_internals", issue = "none")]
17-
#[deprecated(since = "1.13.0", note = "use `std::collections::hash_map::DefaultHasher` instead")]
17+
#[deprecated(since = "1.13.0", note = "use `std::hash::DefaultHasher` instead")]
1818
#[derive(Debug, Clone, Default)]
1919
#[doc(hidden)]
2020
pub struct SipHasher13 {
@@ -25,7 +25,7 @@ pub struct SipHasher13 {
2525
///
2626
/// See: <https://131002.net/siphash/>
2727
#[unstable(feature = "hashmap_internals", issue = "none")]
28-
#[deprecated(since = "1.13.0", note = "use `std::collections::hash_map::DefaultHasher` instead")]
28+
#[deprecated(since = "1.13.0", note = "use `std::hash::DefaultHasher` instead")]
2929
#[derive(Debug, Clone, Default)]
3030
struct SipHasher24 {
3131
hasher: Hasher<Sip24Rounds>,
@@ -44,7 +44,7 @@ struct SipHasher24 {
4444
/// it is not intended for cryptographic purposes. As such, all
4545
/// cryptographic uses of this implementation are _strongly discouraged_.
4646
#[stable(feature = "rust1", since = "1.0.0")]
47-
#[deprecated(since = "1.13.0", note = "use `std::collections::hash_map::DefaultHasher` instead")]
47+
#[deprecated(since = "1.13.0", note = "use `std::hash::DefaultHasher` instead")]
4848
#[derive(Debug, Clone, Default)]
4949
pub struct SipHasher(SipHasher24);
5050

@@ -147,10 +147,7 @@ impl SipHasher {
147147
/// Creates a new `SipHasher` with the two initial keys set to 0.
148148
#[inline]
149149
#[stable(feature = "rust1", since = "1.0.0")]
150-
#[deprecated(
151-
since = "1.13.0",
152-
note = "use `std::collections::hash_map::DefaultHasher` instead"
153-
)]
150+
#[deprecated(since = "1.13.0", note = "use `std::hash::DefaultHasher` instead")]
154151
#[rustc_const_unstable(feature = "const_hash", issue = "104061")]
155152
#[must_use]
156153
pub const fn new() -> SipHasher {
@@ -160,10 +157,7 @@ impl SipHasher {
160157
/// Creates a `SipHasher` that is keyed off the provided keys.
161158
#[inline]
162159
#[stable(feature = "rust1", since = "1.0.0")]
163-
#[deprecated(
164-
since = "1.13.0",
165-
note = "use `std::collections::hash_map::DefaultHasher` instead"
166-
)]
160+
#[deprecated(since = "1.13.0", note = "use `std::hash::DefaultHasher` instead")]
167161
#[rustc_const_unstable(feature = "const_hash", issue = "104061")]
168162
#[must_use]
169163
pub const fn new_with_keys(key0: u64, key1: u64) -> SipHasher {
@@ -175,10 +169,7 @@ impl SipHasher13 {
175169
/// Creates a new `SipHasher13` with the two initial keys set to 0.
176170
#[inline]
177171
#[unstable(feature = "hashmap_internals", issue = "none")]
178-
#[deprecated(
179-
since = "1.13.0",
180-
note = "use `std::collections::hash_map::DefaultHasher` instead"
181-
)]
172+
#[deprecated(since = "1.13.0", note = "use `std::hash::DefaultHasher` instead")]
182173
#[rustc_const_unstable(feature = "const_hash", issue = "104061")]
183174
pub const fn new() -> SipHasher13 {
184175
SipHasher13::new_with_keys(0, 0)
@@ -187,10 +178,7 @@ impl SipHasher13 {
187178
/// Creates a `SipHasher13` that is keyed off the provided keys.
188179
#[inline]
189180
#[unstable(feature = "hashmap_internals", issue = "none")]
190-
#[deprecated(
191-
since = "1.13.0",
192-
note = "use `std::collections::hash_map::DefaultHasher` instead"
193-
)]
181+
#[deprecated(since = "1.13.0", note = "use `std::hash::DefaultHasher` instead")]
194182
#[rustc_const_unstable(feature = "const_hash", issue = "104061")]
195183
pub const fn new_with_keys(key0: u64, key1: u64) -> SipHasher13 {
196184
SipHasher13 { hasher: Hasher::new_with_keys(key0, key1) }

‎library/core/src/ptr/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1911,8 +1911,7 @@ pub fn addr_eq<T: ?Sized, U: ?Sized>(p: *const T, q: *const U) -> bool {
19111911
/// # Examples
19121912
///
19131913
/// ```
1914-
/// use std::collections::hash_map::DefaultHasher;
1915-
/// use std::hash::{Hash, Hasher};
1914+
/// use std::hash::{DefaultHasher, Hash, Hasher};
19161915
/// use std::ptr;
19171916
///
19181917
/// let five = 5;

‎library/core/tests/hash/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ fn test_indirect_hasher() {
167167

168168
#[test]
169169
fn test_build_hasher_object_safe() {
170-
use std::collections::hash_map::{DefaultHasher, RandomState};
170+
use std::hash::{DefaultHasher, RandomState};
171171

172172
let _: &dyn BuildHasher<Hasher = DefaultHasher> = &RandomState::new();
173173
}

‎library/core/tests/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ mod waker;
167167
#[allow(dead_code)] // Not used in all configurations.
168168
pub(crate) fn test_rng() -> rand_xorshift::XorShiftRng {
169169
use core::hash::{BuildHasher, Hash, Hasher};
170-
let mut hasher = std::collections::hash_map::RandomState::new().build_hasher();
170+
let mut hasher = std::hash::RandomState::new().build_hasher();
171171
core::panic::Location::caller().hash(&mut hasher);
172172
let hc64 = hasher.finish();
173173
let seed_vec = hc64.to_le_bytes().into_iter().chain(0u8..8).collect::<Vec<u8>>();

‎library/std/src/collections/hash/map.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ impl<K, V, S> HashMap<K, V, S> {
271271
///
272272
/// ```
273273
/// use std::collections::HashMap;
274-
/// use std::collections::hash_map::RandomState;
274+
/// use std::hash::RandomState;
275275
///
276276
/// let s = RandomState::new();
277277
/// let mut map = HashMap::with_hasher(s);
@@ -303,7 +303,7 @@ impl<K, V, S> HashMap<K, V, S> {
303303
///
304304
/// ```
305305
/// use std::collections::HashMap;
306-
/// use std::collections::hash_map::RandomState;
306+
/// use std::hash::RandomState;
307307
///
308308
/// let s = RandomState::new();
309309
/// let mut map = HashMap::with_capacity_and_hasher(10, s);
@@ -714,7 +714,7 @@ impl<K, V, S> HashMap<K, V, S> {
714714
///
715715
/// ```
716716
/// use std::collections::HashMap;
717-
/// use std::collections::hash_map::RandomState;
717+
/// use std::hash::RandomState;
718718
///
719719
/// let hasher = RandomState::new();
720720
/// let map: HashMap<i32, i32> = HashMap::with_hasher(hasher);

‎library/std/src/collections/hash/set.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ impl<T, S> HashSet<T, S> {
361361
///
362362
/// ```
363363
/// use std::collections::HashSet;
364-
/// use std::collections::hash_map::RandomState;
364+
/// use std::hash::RandomState;
365365
///
366366
/// let s = RandomState::new();
367367
/// let mut set = HashSet::with_hasher(s);
@@ -393,7 +393,7 @@ impl<T, S> HashSet<T, S> {
393393
///
394394
/// ```
395395
/// use std::collections::HashSet;
396-
/// use std::collections::hash_map::RandomState;
396+
/// use std::hash::RandomState;
397397
///
398398
/// let s = RandomState::new();
399399
/// let mut set = HashSet::with_capacity_and_hasher(10, s);
@@ -411,7 +411,7 @@ impl<T, S> HashSet<T, S> {
411411
///
412412
/// ```
413413
/// use std::collections::HashSet;
414-
/// use std::collections::hash_map::RandomState;
414+
/// use std::hash::RandomState;
415415
///
416416
/// let hasher = RandomState::new();
417417
/// let set: HashSet<i32> = HashSet::with_hasher(hasher);

‎library/std/src/hash/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,5 @@ pub(crate) mod random;
8787
#[stable(feature = "rust1", since = "1.0.0")]
8888
pub use core::hash::*;
8989

90-
// #[stable(feature = "std_hash_exports", since = "CURRENT_RUSTC_VERSION")]
91-
pub(crate) use self::random::{DefaultHasher, RandomState};
90+
#[stable(feature = "std_hash_exports", since = "CURRENT_RUSTC_VERSION")]
91+
pub use self::random::{DefaultHasher, RandomState};

‎library/test/src/lib.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ where
265265
F: FnMut(TestEvent) -> io::Result<()>,
266266
{
267267
use std::collections::HashMap;
268-
use std::hash::{DefaultHasher, BuildHasherDefault};
268+
use std::hash::{BuildHasherDefault, DefaultHasher};
269269
use std::sync::mpsc::RecvTimeoutError;
270270

271271
struct RunningTest {
@@ -286,8 +286,7 @@ where
286286
}
287287

288288
// Use a deterministic hasher
289-
type TestMap =
290-
HashMap<TestId, RunningTest, BuildHasherDefault<DefaultHasher>>;
289+
type TestMap = HashMap<TestId, RunningTest, BuildHasherDefault<DefaultHasher>>;
291290

292291
struct TimeoutEntry {
293292
id: TestId,

‎src/tools/compiletest/src/runtest.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ use regex::{Captures, Regex};
2020
use rustfix::{apply_suggestions, get_suggestions_from_json, Filter};
2121

2222
use std::borrow::Cow;
23-
use std::collections::hash_map::DefaultHasher;
2423
use std::collections::{HashMap, HashSet};
2524
use std::env;
2625
use std::ffi::{OsStr, OsString};
2726
use std::fs::{self, create_dir_all, File, OpenOptions};
28-
use std::hash::{Hash, Hasher};
27+
use std::hash::{DefaultHasher, Hash, Hasher};
2928
use std::io::prelude::*;
3029
use std::io::{self, BufReader};
3130
use std::iter;

‎tests/ui/suggestions/import-trait-for-method-call.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::hash::BuildHasher;
22

33
fn next_u64() -> u64 {
4-
let bh = std::collections::hash_map::RandomState::new();
4+
let bh = std::hash::RandomState::new();
55
let h = bh.build_hasher();
66
h.finish() //~ ERROR no method named `finish` found for struct `DefaultHasher`
77
}

0 commit comments

Comments
 (0)