Skip to content

Commit c270e27

Browse files
committed
Use BuildHasher instead of Hasher in collection macros
1 parent 0307f60 commit c270e27

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

test_suite/tests/macros/mod.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ macro_rules! hashset {
3434
$(set.insert($value);)+
3535
set
3636
}};
37-
($hasher:ident @ $($value:expr),+) => {{
38-
use std::hash::BuildHasherDefault;
39-
let mut set = HashSet::with_hasher(BuildHasherDefault::<$hasher>::default());
37+
($hasher:ty; $($value:expr),+) => {{
38+
let mut set = HashSet::<_, $hasher>::default();
4039
$(set.insert($value);)+
4140
set
4241
}};
@@ -51,9 +50,8 @@ macro_rules! hashmap {
5150
$(map.insert($key, $value);)+
5251
map
5352
}};
54-
($hasher:ident @ $($key:expr => $value:expr),+) => {{
55-
use std::hash::BuildHasherDefault;
56-
let mut map = HashMap::with_hasher(BuildHasherDefault::<$hasher>::default());
53+
($hasher:ty; $($key:expr => $value:expr),+) => {{
54+
let mut map = HashMap::<_, _, $hasher>::default();
5755
$(map.insert($key, $value);)+
5856
map
5957
}};

test_suite/tests/test_de.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
)]
1111
#![cfg_attr(feature = "unstable", feature(never_type))]
1212

13-
use fnv::FnvHasher;
13+
use fnv::FnvBuildHasher;
1414
use serde::de::value::{F32Deserializer, F64Deserializer};
1515
use serde::de::{Deserialize, DeserializeOwned, Deserializer, IntoDeserializer};
1616
use serde_derive::Deserialize;
@@ -1040,7 +1040,7 @@ fn test_hashset() {
10401040
],
10411041
);
10421042
test(
1043-
hashset![FnvHasher @ 1, 2, 3],
1043+
hashset![FnvBuildHasher; 1, 2, 3],
10441044
&[
10451045
Token::Seq { len: Some(3) },
10461046
Token::I32(1),
@@ -1275,7 +1275,7 @@ fn test_hashmap() {
12751275
],
12761276
);
12771277
test(
1278-
hashmap![FnvHasher @ 1 => 2, 3 => 4],
1278+
hashmap![FnvBuildHasher; 1 => 2, 3 => 4],
12791279
&[
12801280
Token::Map { len: Some(2) },
12811281
Token::I32(1),

test_suite/tests/test_ser.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![allow(clippy::derive_partial_eq_without_eq, clippy::unreadable_literal)]
22
#![cfg_attr(feature = "unstable", feature(never_type))]
33

4-
use fnv::FnvHasher;
4+
use fnv::FnvBuildHasher;
55
use serde_derive::Serialize;
66
use serde_test::{assert_ser_tokens, assert_ser_tokens_error, Configure, Token};
77
use std::cell::RefCell;
@@ -220,7 +220,7 @@ fn test_hashset() {
220220
&[Token::Seq { len: Some(1) }, Token::I32(1), Token::SeqEnd],
221221
);
222222
assert_ser_tokens(
223-
&hashset![FnvHasher @ 1],
223+
&hashset![FnvBuildHasher; 1],
224224
&[Token::Seq { len: Some(1) }, Token::I32(1), Token::SeqEnd],
225225
);
226226
}
@@ -300,7 +300,7 @@ fn test_hashmap() {
300300
],
301301
);
302302
assert_ser_tokens(
303-
&hashmap![FnvHasher @ 1 => 2],
303+
&hashmap![FnvBuildHasher; 1 => 2],
304304
&[
305305
Token::Map { len: Some(1) },
306306
Token::I32(1),

0 commit comments

Comments
 (0)