fix no-std feature

knickish · Oct 22, 2023 · 287ecde · 287ecde
1 parent a216438
commit 287ecde
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 4 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -75,6 +75,29 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
+
+  test_no_std:
+    name: Test No Std
+    runs-on: ${{ matrix.config.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - { os: ubuntu-latest, target: 'x86_64-unknown-linux-gnu' }
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          target: ${{ matrix.config.target }}
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          command: test
       - uses: actions-rs/cargo@v1
         with:
           command: test 

diff --git a/src/serde_bin.rs b/src/serde_bin.rs
@@ -543,7 +543,7 @@ where
 
 impl<K, V> DeBin for HashMap<K, V>
 where
-    K: DeBin + std::cmp::Eq + std::hash::Hash,
+    K: DeBin + core::cmp::Eq + Hash,
     V: DeBin,
 {
     fn de_bin(o: &mut usize, d: &[u8]) -> Result<Self, DeBinErr> {

diff --git a/tests/bin.rs b/tests/bin.rs
@@ -1,9 +1,15 @@
 use std::{
     array,
-    collections::{BTreeSet, HashMap, HashSet, LinkedList},
+    collections::{BTreeSet, LinkedList},
     sync::atomic::AtomicBool,
 };
 
+#[cfg(feature = "no_std")]
+use hashbrown::{HashMap, HashSet};
+
+#[cfg(not(feature = "no_std"))]
+use std::collections::{HashMap, HashSet};
+
 use nanoserde::{DeBin, SerBin};
 
 #[test]

diff --git a/tests/json.rs b/tests/json.rs
@@ -1,10 +1,16 @@
 use nanoserde::{DeJson, SerJson};
 
 use std::{
-    collections::{BTreeSet, HashMap, HashSet, LinkedList},
+    collections::{BTreeSet, LinkedList},
     sync::atomic::AtomicBool,
 };
 
+#[cfg(feature = "no_std")]
+use hashbrown::{HashMap, HashSet};
+
+#[cfg(not(feature = "no_std"))]
+use std::collections::{HashMap, HashSet};
+
 #[test]
 fn de() {
     #[derive(DeJson)]

diff --git a/tests/ron.rs b/tests/ron.rs
@@ -1,10 +1,16 @@
 use nanoserde::{DeRon, SerRon};
 
 use std::{
-    collections::{BTreeSet, HashMap, HashSet, LinkedList},
+    collections::{BTreeSet, LinkedList},
     sync::atomic::AtomicBool,
 };
 
+#[cfg(feature = "no_std")]
+use hashbrown::{HashMap, HashSet};
+
+#[cfg(not(feature = "no_std"))]
+use std::collections::{HashMap, HashSet};
+
 #[test]
 fn ron_de() {
     #[derive(DeRon)]

diff --git a/tests/ser_de.rs b/tests/ser_de.rs
@@ -1,5 +1,9 @@
 use nanoserde::{DeBin, DeJson, DeRon, SerBin, SerJson, SerRon};
 
+#[cfg(feature = "no_std")]
+use hashbrown::HashMap;
+
+#[cfg(not(feature = "no_std"))]
 use std::collections::HashMap;
 
 #[test]