File tree 3 files changed +10
-12
lines changed
3 files changed +10
-12
lines changed Original file line number Diff line number Diff line change @@ -34,9 +34,8 @@ macro_rules! hashset {
34
34
$( set. insert( $value) ; ) +
35
35
set
36
36
} } ;
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 ( ) ;
40
39
$( set. insert( $value) ; ) +
41
40
set
42
41
} } ;
@@ -51,9 +50,8 @@ macro_rules! hashmap {
51
50
$( map. insert( $key, $value) ; ) +
52
51
map
53
52
} } ;
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 ( ) ;
57
55
$( map. insert( $key, $value) ; ) +
58
56
map
59
57
} } ;
Original file line number Diff line number Diff line change 10
10
) ]
11
11
#![ cfg_attr( feature = "unstable" , feature( never_type) ) ]
12
12
13
- use fnv:: FnvHasher ;
13
+ use fnv:: FnvBuildHasher ;
14
14
use serde:: de:: value:: { F32Deserializer , F64Deserializer } ;
15
15
use serde:: de:: { Deserialize , DeserializeOwned , Deserializer , IntoDeserializer } ;
16
16
use serde_derive:: Deserialize ;
@@ -1040,7 +1040,7 @@ fn test_hashset() {
1040
1040
] ,
1041
1041
) ;
1042
1042
test (
1043
- hashset ! [ FnvHasher @ 1 , 2 , 3 ] ,
1043
+ hashset ! [ FnvBuildHasher ; 1 , 2 , 3 ] ,
1044
1044
& [
1045
1045
Token :: Seq { len : Some ( 3 ) } ,
1046
1046
Token :: I32 ( 1 ) ,
@@ -1275,7 +1275,7 @@ fn test_hashmap() {
1275
1275
] ,
1276
1276
) ;
1277
1277
test (
1278
- hashmap ! [ FnvHasher @ 1 => 2 , 3 => 4 ] ,
1278
+ hashmap ! [ FnvBuildHasher ; 1 => 2 , 3 => 4 ] ,
1279
1279
& [
1280
1280
Token :: Map { len : Some ( 2 ) } ,
1281
1281
Token :: I32 ( 1 ) ,
Original file line number Diff line number Diff line change 1
1
#![ allow( clippy:: derive_partial_eq_without_eq, clippy:: unreadable_literal) ]
2
2
#![ cfg_attr( feature = "unstable" , feature( never_type) ) ]
3
3
4
- use fnv:: FnvHasher ;
4
+ use fnv:: FnvBuildHasher ;
5
5
use serde_derive:: Serialize ;
6
6
use serde_test:: { assert_ser_tokens, assert_ser_tokens_error, Configure , Token } ;
7
7
use std:: cell:: RefCell ;
@@ -220,7 +220,7 @@ fn test_hashset() {
220
220
& [ Token :: Seq { len : Some ( 1 ) } , Token :: I32 ( 1 ) , Token :: SeqEnd ] ,
221
221
) ;
222
222
assert_ser_tokens (
223
- & hashset ! [ FnvHasher @ 1 ] ,
223
+ & hashset ! [ FnvBuildHasher ; 1 ] ,
224
224
& [ Token :: Seq { len : Some ( 1 ) } , Token :: I32 ( 1 ) , Token :: SeqEnd ] ,
225
225
) ;
226
226
}
@@ -300,7 +300,7 @@ fn test_hashmap() {
300
300
] ,
301
301
) ;
302
302
assert_ser_tokens (
303
- & hashmap ! [ FnvHasher @ 1 => 2 ] ,
303
+ & hashmap ! [ FnvBuildHasher ; 1 => 2 ] ,
304
304
& [
305
305
Token :: Map { len : Some ( 1 ) } ,
306
306
Token :: I32 ( 1 ) ,
You can’t perform that action at this time.
0 commit comments