Switch out fnv in favor of foldhash in test

This commit is contained in:
David Tolnay
2024-11-16 12:24:01 -08:00
parent c270e27a4d
commit b9dbfcb4ac
3 changed files with 5 additions and 7 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ serde = { path = "../serde" }
[dev-dependencies] [dev-dependencies]
automod = "1.0.1" automod = "1.0.1"
fnv = "1.0" foldhash = "0.1"
rustversion = "1.0" rustversion = "1.0"
serde = { path = "../serde", features = ["rc"] } serde = { path = "../serde", features = ["rc"] }
serde_derive = { path = "../serde_derive", features = ["deserialize_in_place"] } serde_derive = { path = "../serde_derive", features = ["deserialize_in_place"] }
+2 -3
View File
@@ -10,7 +10,6 @@
)] )]
#![cfg_attr(feature = "unstable", feature(never_type))] #![cfg_attr(feature = "unstable", feature(never_type))]
use fnv::FnvBuildHasher;
use serde::de::value::{F32Deserializer, F64Deserializer}; use serde::de::value::{F32Deserializer, F64Deserializer};
use serde::de::{Deserialize, DeserializeOwned, Deserializer, IntoDeserializer}; use serde::de::{Deserialize, DeserializeOwned, Deserializer, IntoDeserializer};
use serde_derive::Deserialize; use serde_derive::Deserialize;
@@ -1040,7 +1039,7 @@ fn test_hashset() {
], ],
); );
test( test(
hashset![FnvBuildHasher; 1, 2, 3], hashset![foldhash::fast::FixedState; 1, 2, 3],
&[ &[
Token::Seq { len: Some(3) }, Token::Seq { len: Some(3) },
Token::I32(1), Token::I32(1),
@@ -1275,7 +1274,7 @@ fn test_hashmap() {
], ],
); );
test( test(
hashmap![FnvBuildHasher; 1 => 2, 3 => 4], hashmap![foldhash::fast::FixedState; 1 => 2, 3 => 4],
&[ &[
Token::Map { len: Some(2) }, Token::Map { len: Some(2) },
Token::I32(1), Token::I32(1),
+2 -3
View File
@@ -1,7 +1,6 @@
#![allow(clippy::derive_partial_eq_without_eq, clippy::unreadable_literal)] #![allow(clippy::derive_partial_eq_without_eq, clippy::unreadable_literal)]
#![cfg_attr(feature = "unstable", feature(never_type))] #![cfg_attr(feature = "unstable", feature(never_type))]
use fnv::FnvBuildHasher;
use serde_derive::Serialize; use serde_derive::Serialize;
use serde_test::{assert_ser_tokens, assert_ser_tokens_error, Configure, Token}; use serde_test::{assert_ser_tokens, assert_ser_tokens_error, Configure, Token};
use std::cell::RefCell; use std::cell::RefCell;
@@ -220,7 +219,7 @@ fn test_hashset() {
&[Token::Seq { len: Some(1) }, Token::I32(1), Token::SeqEnd], &[Token::Seq { len: Some(1) }, Token::I32(1), Token::SeqEnd],
); );
assert_ser_tokens( assert_ser_tokens(
&hashset![FnvBuildHasher; 1], &hashset![foldhash::fast::FixedState; 1],
&[Token::Seq { len: Some(1) }, Token::I32(1), Token::SeqEnd], &[Token::Seq { len: Some(1) }, Token::I32(1), Token::SeqEnd],
); );
} }
@@ -300,7 +299,7 @@ fn test_hashmap() {
], ],
); );
assert_ser_tokens( assert_ser_tokens(
&hashmap![FnvBuildHasher; 1 => 2], &hashmap![foldhash::fast::FixedState; 1 => 2],
&[ &[
Token::Map { len: Some(1) }, Token::Map { len: Some(1) },
Token::I32(1), Token::I32(1),