Enable serde tests for no-std

Author: Gianmarco Garrisi

Cargo.toml

@@ -23,6 +23,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 uuid = {version= "1", features = ["v4", "serde"] }
 hashbrown = "0.14"
+twox-hash = { version = "1.5", default-features = false }
 
 [features]
 default = ["std"]

tests/double_priority_queue.rs

@@ -1260,16 +1260,28 @@ mod doublepq_tests {
 mod serde_tests_basics {
     use priority_queue::DoublePriorityQueue;
     use serde_test::{assert_tokens, Token};
+    
+    #[cfg(not(feature = "std"))]
+    use twox_hash::XxHash64;
+    #[cfg(not(feature = "std"))]
+    use core::hash::BuildHasherDefault;
+
     #[test]
     fn serde_empty() {
+        #[cfg(feature = "std")]
         let pq: DoublePriorityQueue<String, i32> = DoublePriorityQueue::new();
+        #[cfg(not(feature = "std"))]
+        let pq: DoublePriorityQueue<String, i32, BuildHasherDefault<XxHash64>> = DoublePriorityQueue::default();
 
         assert_tokens(&pq, &[Token::Seq { len: Some(0) }, Token::SeqEnd]);
     }
 
     #[test]
     fn serde() {
+        #[cfg(feature = "std")]
         let mut pq = DoublePriorityQueue::new();
+        #[cfg(not(feature = "std"))]
+        let mut pq: DoublePriorityQueue<&str, i32, BuildHasherDefault<XxHash64>> = DoublePriorityQueue::default();
 
         pq.push("a", 1);
         pq.push("b", 2);
@@ -1316,6 +1328,11 @@ mod serde_tests_custom_structs {
     use std::default::Default;
     use std::time::Duration;
     use uuid::Uuid;
+    
+    #[cfg(not(feature = "std"))]
+    use twox_hash::XxHash64;
+    #[cfg(not(feature = "std"))]
+    use core::hash::BuildHasherDefault;
 
     use serde::{Deserialize, Serialize};
 
@@ -1410,9 +1427,12 @@ mod serde_tests_custom_structs {
     fn test1() {
         println!("test1()");
 
+        #[cfg(feature = "std")]
         type PqType = DoublePriorityQueue<i32, i32>;
+        #[cfg(not(feature = "std"))]
+        type PqType = DoublePriorityQueue<i32, i32,  BuildHasherDefault<XxHash64>>;
 
-        let mut pq: PqType = DoublePriorityQueue::new();
+        let mut pq: PqType = DoublePriorityQueue::default();
         pq.push(0, 0);
         pq.push(1, 1);
 
@@ -1429,9 +1449,12 @@ mod serde_tests_custom_structs {
     fn test2() {
         println!("\n\ntest2()");
 
+        #[cfg(feature = "std")]
         type PqType = DoublePriorityQueue<i32, EventComparables>;
+        #[cfg(not(feature = "std"))]
+        type PqType = DoublePriorityQueue<i32, EventComparables, BuildHasherDefault<XxHash64>>;
 
-        let mut pq: PqType = DoublePriorityQueue::new();
+        let mut pq: PqType = DoublePriorityQueue::default();
         pq.push(0, Default::default()); // Uuids will be different
         pq.push(1, Default::default());
 
@@ -1488,9 +1511,12 @@ mod serde_tests_custom_structs {
         assert_eq!(ec2, deserialized);
 
         {
+            #[cfg(feature = "std")]
             type PqType = DoublePriorityQueue<ConcreteEvent1, EventComparables>;
+            #[cfg(not(feature = "std"))]
+            type PqType = DoublePriorityQueue<ConcreteEvent1, EventComparables, BuildHasherDefault<XxHash64>>;
 
-            let mut pq: PqType = DoublePriorityQueue::new();
+            let mut pq: PqType = DoublePriorityQueue::default();
             pq.push(ce1, ec1);
             pq.push(ce2, ec2);
 

tests/priority_queue.rs

@@ -1076,16 +1076,28 @@ mod pqueue_tests {
 mod serde_tests_basics {
     use priority_queue::PriorityQueue;
     use serde_test::{assert_tokens, Token};
+    
+    #[cfg(not(feature = "std"))]
+    use twox_hash::XxHash64;
+    #[cfg(not(feature = "std"))]
+    use core::hash::BuildHasherDefault;
+
     #[test]
     fn serde_empty() {
+        #[cfg(feature = "std")]
         let pq: PriorityQueue<String, i32> = PriorityQueue::new();
+        #[cfg(not(feature = "std"))]
+        let pq: PriorityQueue<String, i32, BuildHasherDefault<XxHash64>> = PriorityQueue::default();
 
         assert_tokens(&pq, &[Token::Seq { len: Some(0) }, Token::SeqEnd]);
     }
 
     #[test]
     fn serde() {
+        #[cfg(feature = "std")]
         let mut pq = PriorityQueue::new();
+        #[cfg(not(feature = "std"))]
+        let mut pq: PriorityQueue<&str, i32, BuildHasherDefault<XxHash64>> = PriorityQueue::default();
 
         pq.push("a", 1);
         pq.push("b", 2);
@@ -1128,10 +1140,15 @@ mod serde_tests_basics {
 #[cfg(all(feature = "serde", test))]
 mod serde_tests_custom_structs {
     use priority_queue::PriorityQueue;
-    use std::cmp::{Ord, Ordering, PartialOrd};
-    use std::default::Default;
-    use std::time::Duration;
+    use core::cmp::{Ord, Ordering, PartialOrd};
+    use core::default::Default;
+    use core::time::Duration;
     use uuid::Uuid;
+    
+    #[cfg(not(feature = "std"))]
+    use twox_hash::XxHash64;
+    #[cfg(not(feature = "std"))]
+    use core::hash::BuildHasherDefault;
 
     use serde::{Deserialize, Serialize};
 
@@ -1226,9 +1243,12 @@ mod serde_tests_custom_structs {
     fn test1() {
         println!("test1()");
 
+        #[cfg(feature = "std")]
         type PqType = PriorityQueue<i32, i32>;
+        #[cfg(not(feature = "std"))]
+        type PqType = PriorityQueue<i32, i32,  BuildHasherDefault<XxHash64>>;
 
-        let mut pq: PqType = PriorityQueue::new();
+        let mut pq: PqType = PriorityQueue::default();
         pq.push(0, 0);
         pq.push(1, 1);
 
@@ -1245,9 +1265,12 @@ mod serde_tests_custom_structs {
     fn test2() {
         println!("\n\ntest2()");
 
+        #[cfg(feature = "std")]
         type PqType = PriorityQueue<i32, EventComparables>;
+        #[cfg(not(feature = "std"))]
+        type PqType = PriorityQueue<i32, EventComparables, BuildHasherDefault<XxHash64>>;
 
-        let mut pq: PqType = PriorityQueue::new();
+        let mut pq: PqType = PriorityQueue::default();
         pq.push(0, Default::default()); // Uuids will be different
         pq.push(1, Default::default());
 
@@ -1304,9 +1327,12 @@ mod serde_tests_custom_structs {
         assert_eq!(ec2, deserialized);
 
         {
+            #[cfg(feature = "std")]
             type PqType = PriorityQueue<ConcreteEvent1, EventComparables>;
+            #[cfg(not(feature = "std"))]
+            type PqType = PriorityQueue<ConcreteEvent1, EventComparables, BuildHasherDefault<XxHash64>>;
 
-            let mut pq: PqType = PriorityQueue::new();
+            let mut pq: PqType = PriorityQueue::default();
             pq.push(ce1, ec1);
             pq.push(ce2, ec2);