Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve manual_hash_one lint in test #1095

Merged
merged 3 commits into from Dec 28, 2023
Merged

Resolve manual_hash_one lint in test #1095

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ff6c9e
Use random hasher state for number hashing test
dtolnay Dec 28, 2023
b9bcbad
Use BuildHasher::hash_one
dtolnay Dec 28, 2023
b328ee7
Eliminate hash closure in favor of calling hash_one directly
dtolnay Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 5 additions & 8 deletions tests/test.rs
View file
Open in desktop
Expand Up @@ -30,11 +30,12 @@ use serde_json::{
from_reader, from_slice, from_str, from_value, json, to_string, to_string_pretty, to_value,
to_vec, Deserializer, Number, Value,
};
use std::collections::hash_map::DefaultHasher;
use std::collections::BTreeMap;
#[cfg(feature = "raw_value")]
use std::collections::HashMap;
use std::fmt::{self, Debug};
use std::hash::BuildHasher;
#[cfg(feature = "raw_value")]
use std::hash::{Hash, Hasher};
use std::io;
use std::iter;
Expand Down Expand Up @@ -2490,19 +2491,15 @@ fn test_value_into_deserializer() {

#[test]
fn hash_positive_and_negative_zero() {
fn hash(obj: impl Hash) -> u64 {
let mut hasher = DefaultHasher::new();
obj.hash(&mut hasher);
hasher.finish()
}
let rand = std::hash::RandomState::new();

let k1 = serde_json::from_str::<Number>("0.0").unwrap();
let k2 = serde_json::from_str::<Number>("-0.0").unwrap();
if cfg!(feature = "arbitrary_precision") {
assert_ne!(k1, k2);
assert_ne!(hash(k1), hash(k2));
assert_ne!(rand.hash_one(k1), rand.hash_one(k2));
} else {
assert_eq!(k1, k2);
assert_eq!(hash(k1), hash(k2));
assert_eq!(rand.hash_one(k1), rand.hash_one(k2));
}
}