Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 261c5b9

Browse files
committedNov 2, 2024
remove const_hash feature leftovers
1 parent d515da6 commit 261c5b9

File tree

5 files changed

+5
-13
lines changed

5 files changed

+5
-13
lines changed
 

‎core/src/hash/sip.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -147,19 +147,17 @@ impl SipHasher {
147147
#[inline]
148148
#[stable(feature = "rust1", since = "1.0.0")]
149149
#[deprecated(since = "1.13.0", note = "use `std::hash::DefaultHasher` instead")]
150-
#[rustc_const_unstable(feature = "const_hash", issue = "104061")]
151150
#[must_use]
152-
pub const fn new() -> SipHasher {
151+
pub fn new() -> SipHasher {
153152
SipHasher::new_with_keys(0, 0)
154153
}
155154

156155
/// Creates a `SipHasher` that is keyed off the provided keys.
157156
#[inline]
158157
#[stable(feature = "rust1", since = "1.0.0")]
159158
#[deprecated(since = "1.13.0", note = "use `std::hash::DefaultHasher` instead")]
160-
#[rustc_const_unstable(feature = "const_hash", issue = "104061")]
161159
#[must_use]
162-
pub const fn new_with_keys(key0: u64, key1: u64) -> SipHasher {
160+
pub fn new_with_keys(key0: u64, key1: u64) -> SipHasher {
163161
SipHasher(SipHasher24 { hasher: Hasher::new_with_keys(key0, key1) })
164162
}
165163
}
@@ -169,17 +167,15 @@ impl SipHasher13 {
169167
#[inline]
170168
#[unstable(feature = "hashmap_internals", issue = "none")]
171169
#[deprecated(since = "1.13.0", note = "use `std::hash::DefaultHasher` instead")]
172-
#[rustc_const_unstable(feature = "const_hash", issue = "104061")]
173-
pub const fn new() -> SipHasher13 {
170+
pub fn new() -> SipHasher13 {
174171
SipHasher13::new_with_keys(0, 0)
175172
}
176173

177174
/// Creates a `SipHasher13` that is keyed off the provided keys.
178175
#[inline]
179176
#[unstable(feature = "hashmap_internals", issue = "none")]
180177
#[deprecated(since = "1.13.0", note = "use `std::hash::DefaultHasher` instead")]
181-
#[rustc_const_unstable(feature = "const_hash", issue = "104061")]
182-
pub const fn new_with_keys(key0: u64, key1: u64) -> SipHasher13 {
178+
pub fn new_with_keys(key0: u64, key1: u64) -> SipHasher13 {
183179
SipHasher13 { hasher: Hasher::new_with_keys(key0, key1) }
184180
}
185181
}

‎core/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
#![feature(const_eval_select)]
123123
#![feature(const_exact_div)]
124124
#![feature(const_float_methods)]
125-
#![feature(const_hash)]
126125
#![feature(const_heap)]
127126
#![feature(const_nonnull_new)]
128127
#![feature(const_num_midpoint)]

‎core/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#![feature(const_bigint_helper_methods)]
2121
#![feature(const_black_box)]
2222
#![feature(const_eval_select)]
23-
#![feature(const_hash)]
2423
#![feature(const_heap)]
2524
#![feature(const_nonnull_new)]
2625
#![feature(const_num_midpoint)]

‎std/src/hash/random.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,8 @@ impl DefaultHasher {
105105
#[stable(feature = "hashmap_default_hasher", since = "1.13.0")]
106106
#[inline]
107107
#[allow(deprecated)]
108-
#[rustc_const_unstable(feature = "const_hash", issue = "104061")]
109108
#[must_use]
110-
pub const fn new() -> DefaultHasher {
109+
pub fn new() -> DefaultHasher {
111110
DefaultHasher(SipHasher13::new_with_keys(0, 0))
112111
}
113112
}

‎std/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,6 @@
416416
// Only for const-ness:
417417
// tidy-alphabetical-start
418418
#![feature(const_collections_with_hasher)]
419-
#![feature(const_hash)]
420419
#![feature(thread_local_internals)]
421420
// tidy-alphabetical-end
422421
//

0 commit comments

Comments
 (0)
Failed to load comments.