diff --git a/Cargo.toml b/Cargo.toml index ddc3ff5..1278927 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,9 +56,9 @@ fatal-warnings = [] std = [] [lints.clippy] -all = { level = "warn", priority = -1 } -pedantic = { level = "warn", priority = -1 } -correctness = "deny" +all = { level = "warn", priority = -2 } +pedantic = { level = "warn", priority = -2 } +correctness = { level = "deny", priority = -1 } enum-glob-use = "allow" if-not-else = "allow" diff --git a/src/list/test.rs b/src/list/test.rs index 216353d..61aea30 100644 --- a/src/list/test.rs +++ b/src/list/test.rs @@ -258,7 +258,7 @@ fn test_partial_ord() { let list_1_prime = list!["a"]; let list_2 = list!["b"]; let list_3 = list![0.0]; - let list_4 = list![core::f32::NAN]; + let list_4 = list![f32::NAN]; assert_eq!(list_1.partial_cmp(&list_1_prime), Some(Ordering::Equal)); assert_eq!(list_1.partial_cmp(&list_2), Some(Ordering::Less)); diff --git a/src/map/hash_trie_map/mod.rs b/src/map/hash_trie_map/mod.rs index 0ac44de..7cb8f45 100644 --- a/src/map/hash_trie_map/mod.rs +++ b/src/map/hash_trie_map/mod.rs @@ -213,7 +213,6 @@ mod node_utils { use super::HashValue; use core::hash::BuildHasher; use core::hash::Hash; - use core::hash::Hasher; use core::mem::size_of_val; /// Returns the index of the array for the given hash on depth `depth`. @@ -237,11 +236,7 @@ mod node_utils { } pub fn hash(v: &T, hasher_builder: &H) -> HashValue { - let mut hasher = hasher_builder.build_hasher(); - - v.hash(&mut hasher); - - hasher.finish() + hasher_builder.hash_one(&v) } } diff --git a/src/map/red_black_tree_map/test.rs b/src/map/red_black_tree_map/test.rs index 9fd79d0..eced735 100644 --- a/src/map/red_black_tree_map/test.rs +++ b/src/map/red_black_tree_map/test.rs @@ -1750,7 +1750,7 @@ fn test_partial_ord() { let map_1_prime = rbt_map!["a" => 0xa]; let map_2 = rbt_map!["b" => 0xb]; let map_3 = rbt_map![0 => 0.0]; - let map_4 = rbt_map![0 => core::f32::NAN]; + let map_4 = rbt_map![0 => f32::NAN]; assert_eq!(map_1.partial_cmp(&map_1_prime), Some(Ordering::Equal)); assert_eq!(map_1.partial_cmp(&map_2), Some(Ordering::Less)); diff --git a/src/queue/test.rs b/src/queue/test.rs index bf8152b..668a417 100644 --- a/src/queue/test.rs +++ b/src/queue/test.rs @@ -353,7 +353,7 @@ fn test_partial_ord() { let queue_1_prime = queue!["a"]; let queue_2 = queue!["b"]; let queue_3 = queue![0.0]; - let queue_4 = queue![core::f32::NAN]; + let queue_4 = queue![f32::NAN]; assert_eq!(queue_1.partial_cmp(&queue_1_prime), Some(Ordering::Equal)); assert_eq!(queue_1.partial_cmp(&queue_2), Some(Ordering::Less)); diff --git a/src/set/hash_trie_set/mod.rs b/src/set/hash_trie_set/mod.rs index 8f439a9..92f99ca 100644 --- a/src/set/hash_trie_set/mod.rs +++ b/src/set/hash_trie_set/mod.rs @@ -193,7 +193,7 @@ where T: Borrow, V: Hash + Eq, { - self.map.get_key_value(v).map(|(k, _)| k) + self.map.get_key_value(v).map(|(k, ())| k) } #[must_use] diff --git a/src/set/red_black_tree_set/mod.rs b/src/set/red_black_tree_set/mod.rs index df30e91..bbef771 100644 --- a/src/set/red_black_tree_set/mod.rs +++ b/src/set/red_black_tree_set/mod.rs @@ -168,7 +168,7 @@ where T: Borrow, V: Ord, { - self.map.get_key_value(v).map(|(k, _)| k) + self.map.get_key_value(v).map(|(k, ())| k) } #[must_use] @@ -182,12 +182,12 @@ where #[must_use] pub fn first(&self) -> Option<&T> { - self.map.first().map(|(k, _)| k) + self.map.first().map(|(k, ())| k) } #[must_use] pub fn last(&self) -> Option<&T> { - self.map.last().map(|(k, _)| k) + self.map.last().map(|(k, ())| k) } #[must_use] @@ -279,7 +279,7 @@ where Q: Ord + ?Sized, RB: RangeBounds, { - self.map.range(range).map(|(k, _)| k) + self.map.range(range).map(|(k, ())| k) } } diff --git a/src/stack/test.rs b/src/stack/test.rs index 38b9312..89a9864 100644 --- a/src/stack/test.rs +++ b/src/stack/test.rs @@ -188,7 +188,7 @@ fn test_partial_ord() { let stack_1_prime = stack!["a"]; let stack_2 = stack!["b"]; let stack_3 = stack![0.0]; - let stack_4 = stack![core::f32::NAN]; + let stack_4 = stack![f32::NAN]; assert_eq!(stack_1.partial_cmp(&stack_1_prime), Some(Ordering::Equal)); assert_eq!(stack_1.partial_cmp(&stack_2), Some(Ordering::Less)); diff --git a/src/vector/test.rs b/src/vector/test.rs index 3c3e297..87c6080 100644 --- a/src/vector/test.rs +++ b/src/vector/test.rs @@ -623,7 +623,7 @@ fn test_partial_ord() { let vector_1_prime = vector!["a"]; let vector_2 = vector!["b"]; let vector_3 = vector![0.0]; - let vector_4 = vector![core::f32::NAN]; + let vector_4 = vector![f32::NAN]; assert_eq!(vector_1.partial_cmp(&vector_1_prime), Some(Ordering::Equal)); assert_eq!(vector_1.partial_cmp(&vector_2), Some(Ordering::Less));