Skip to content

Commit

Permalink
Switch out fnv in favor of foldhash in test
Browse files Browse the repository at this point in the history
  • Loading branch information
dtolnay committed Nov 16, 2024
1 parent c270e27 commit b9dbfcb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion test_suite/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ serde = { path = "../serde" }

[dev-dependencies]
automod = "1.0.1"
fnv = "1.0"
foldhash = "0.1"
rustversion = "1.0"
serde = { path = "../serde", features = ["rc"] }
serde_derive = { path = "../serde_derive", features = ["deserialize_in_place"] }
Expand Down
5 changes: 2 additions & 3 deletions test_suite/tests/test_de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
)]
#![cfg_attr(feature = "unstable", feature(never_type))]

use fnv::FnvBuildHasher;
use serde::de::value::{F32Deserializer, F64Deserializer};
use serde::de::{Deserialize, DeserializeOwned, Deserializer, IntoDeserializer};
use serde_derive::Deserialize;
Expand Down Expand Up @@ -1040,7 +1039,7 @@ fn test_hashset() {
],
);
test(
hashset![FnvBuildHasher; 1, 2, 3],
hashset![foldhash::fast::FixedState; 1, 2, 3],
&[
Token::Seq { len: Some(3) },
Token::I32(1),
Expand Down Expand Up @@ -1275,7 +1274,7 @@ fn test_hashmap() {
],
);
test(
hashmap![FnvBuildHasher; 1 => 2, 3 => 4],
hashmap![foldhash::fast::FixedState; 1 => 2, 3 => 4],
&[
Token::Map { len: Some(2) },
Token::I32(1),
Expand Down
5 changes: 2 additions & 3 deletions test_suite/tests/test_ser.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#![allow(clippy::derive_partial_eq_without_eq, clippy::unreadable_literal)]
#![cfg_attr(feature = "unstable", feature(never_type))]

use fnv::FnvBuildHasher;
use serde_derive::Serialize;
use serde_test::{assert_ser_tokens, assert_ser_tokens_error, Configure, Token};
use std::cell::RefCell;
Expand Down Expand Up @@ -220,7 +219,7 @@ fn test_hashset() {
&[Token::Seq { len: Some(1) }, Token::I32(1), Token::SeqEnd],
);
assert_ser_tokens(
&hashset![FnvBuildHasher; 1],
&hashset![foldhash::fast::FixedState; 1],
&[Token::Seq { len: Some(1) }, Token::I32(1), Token::SeqEnd],
);
}
Expand Down Expand Up @@ -300,7 +299,7 @@ fn test_hashmap() {
],
);
assert_ser_tokens(
&hashmap![FnvBuildHasher; 1 => 2],
&hashmap![foldhash::fast::FixedState; 1 => 2],
&[
Token::Map { len: Some(1) },
Token::I32(1),
Expand Down

0 comments on commit b9dbfcb

Please sign in to comment.