error in core changes

.github/workflows/rust.yml

@@ -80,7 +80,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --no-default-features --features ${{ matrix.feature }}
+          args: --no-default-features --features "std, ${{ matrix.feature }}"
 
   no_std_features:
     name: Test Individual Features NoStd
@@ -106,7 +106,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --no-default-features --features "no_std, ${{ matrix.feature }}"
+          args: --no-default-features --features "${{ matrix.feature }}"
 
   test:
     name: Test
@@ -153,4 +153,4 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test 
-          args: --features "no_std"
+          args: --no-default-features --features "binary, json, ron, toml"

Cargo.toml

@@ -22,12 +22,12 @@ edition = "2018"
 repository = "https://github.com/not-fl3/nanoserde"
 
 [features]
-default = ["json", "binary", "ron", "toml"]
+default = ["json", "binary", "ron", "toml", "std"]
 json = ["dep:nanoserde-derive", "nanoserde-derive/json"]
 binary = ["dep:nanoserde-derive", "nanoserde-derive/binary"]
 ron = ["dep:nanoserde-derive", "nanoserde-derive/ron"]
 toml = []
-no_std = []
+std = []
 
 [dependencies]
 nanoserde-derive = { path = "derive", version = "=0.2.0", optional = true }

README.md

@@ -56,7 +56,7 @@ For more examples take a look at [tests](/tests)
 
 All features are enabled by default. To enable only specific formats, import nanoserde using 
 ```toml
-nanoserde = { version = "*", default-features = false, features = [] }
+nanoserde = { version = "*", default-features = false, features = ["std", "{format feature name}"] }
 ```
 in your `Cargo.toml` and add one or more of the following crate features:
 

derive/Cargo.toml

@@ -14,4 +14,3 @@ default = []
 json = []
 binary = []
 ron = []
-no_std = []

derive/src/lib.rs

@@ -1,4 +1,4 @@
-#![cfg_attr(feature = "no_std", no_std)]
+#![no_std]
 
 extern crate alloc;
 extern crate proc_macro;

derive/src/parse.rs

@@ -4,10 +4,12 @@
 //! https://docs.rs/syn/0.15.44/syn/enum.Type.html
 //! https://ziglang.org/documentation/0.5.0/#toc-typeInfo
 
+use alloc::collections::BTreeSet;
 use core::iter::Peekable;
-use std::collections::HashSet;
-use std::num::IntErrorKind;
+use core::num::IntErrorKind;
 
+use alloc::borrow::ToOwned;
+use alloc::boxed::Box;
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
 use alloc::{format, vec};
@@ -16,6 +18,7 @@
 
 #[derive(Debug, Clone)]
 pub struct Attribute {
+    #[allow(unused)]
     pub name: String,
     pub tokens: Vec<String>,
 }
@@ -37,6 +40,7 @@
 #[derive(Debug, Clone)]
 pub struct Field {
     pub attributes: Vec<Attribute>,
+    #[allow(unused)]
     pub vis: Visibility,
     pub field_name: Option<String>,
     pub ty: Type,
@@ -131,7 +135,7 @@
     pub named: bool,
     pub fields: Vec<Field>,
     pub attributes: Vec<Attribute>,
     pub generics: Vec<Generic>,
 }
 
 #[derive(Debug)]
@@ -139,7 +143,7 @@
     pub name: String,
     pub variants: Vec<Field>,
     pub attributes: Vec<Attribute>,
     pub generics: Vec<Generic>,
 }
 
 #[allow(dead_code)]
@@ -1079,14 +1083,14 @@
             (true, _) => {
                 attrs.push(Attribute {
                     name: name.clone(),
-                    tokens: std::mem::take(&mut attr_tokens),
+                    tokens: core::mem::take(&mut attr_tokens),
                 });
                 break;
             }
             (false, Some(",")) => {
                 attrs.push(Attribute {
                     name: name.clone(),
-                    tokens: std::mem::take(&mut attr_tokens),
+                    tokens: core::mem::take(&mut attr_tokens),
                 });
                 continue;
             }
@@ -1105,14 +1109,14 @@
             (true, _) => {
                 attrs.push(Attribute {
                     name: name.clone(),
-                    tokens: std::mem::take(&mut attr_tokens),
+                    tokens: core::mem::take(&mut attr_tokens),
                 });
                 break;
             }
             (false, true) => {
                 attrs.push(Attribute {
                     name: name.clone(),
-                    tokens: std::mem::take(&mut attr_tokens),
+                    tokens: core::mem::take(&mut attr_tokens),
                 });
             }
             _ => {}
@@ -1402,7 +1406,7 @@
 
 fn get_all_bounds<T: Iterator<Item = TokenTree> + Clone>(source: &mut Peekable<T>) -> Vec<Generic> {
     let mut ret = Vec::new();
-    let mut already = HashSet::new();
+    let mut already = BTreeSet::new();
     if source.peek().map_or(false, |x| x.to_string() == "<") {
         source.next();
     } else {

derive/src/shared.rs

@@ -1,4 +1,8 @@
-use alloc::string::String;
+use alloc::{
+    format,
+    string::{String, ToString},
+    vec::Vec,
+};
 
 #[cfg(any(feature = "binary", feature = "json"))]
 use crate::parse::{Enum, Struct};

src/lib.rs

@@ -15,11 +15,8 @@
 //! `nanoserde` supports some serialization customisation with `#[nserde()]` attributes.
 //! For `#[nserde(..)]` supported attributes for each format check [Features support matrix](https://github.com/not-fl3/nanoserde#features-support-matrix)
 
-#![cfg_attr(feature = "no_std", no_std)]
-// Possibly stable in 1.65.
-// See: https://github.com/rust-lang/rust/pull/99917
-// and https://github.com/rust-lang/rust/issues/103765
-#![cfg_attr(feature = "no_std", feature(error_in_core))]
+#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(not(feature = "std"), feature(error_in_core))]
 
 extern crate alloc;
 

src/serde_bin.rs

@@ -1,5 +1,11 @@
 use core::convert::TryInto;
 
+// remove this after 1.81 is live
+#[cfg(not(feature = "std"))]
+use core::error::Error;
+#[cfg(feature = "std")]
+use std::error::Error;
+
 use alloc::borrow::ToOwned;
 use alloc::boxed::Box;
 use alloc::collections::{BTreeMap, BTreeSet, LinkedList};
@@ -77,11 +83,7 @@ impl core::fmt::Display for DeBinErr {
     }
 }
 
-#[cfg(feature = "no_std")]
-impl core::error::Error for DeBinErr {}
-
-#[cfg(not(feature = "no_std"))]
-impl std::error::Error for DeBinErr {}
+impl Error for DeBinErr {}
 
 macro_rules! impl_ser_de_bin_for {
     ($ty:ident) => {
@@ -287,7 +289,7 @@ where
     }
 }
 
-#[cfg(not(feature = "no_std"))]
+#[cfg(feature = "std")]
 impl<T> SerBin for std::collections::HashSet<T>
 where
     T: SerBin,
@@ -301,7 +303,7 @@ where
     }
 }
 
-#[cfg(not(feature = "no_std"))]
+#[cfg(feature = "std")]
 impl<T> DeBin for std::collections::HashSet<T>
 where
     T: DeBin + core::hash::Hash + Eq,
@@ -529,7 +531,7 @@ where
     }
 }
 
-#[cfg(not(feature = "no_std"))]
+#[cfg(feature = "std")]
 impl<K, V> SerBin for std::collections::HashMap<K, V>
 where
     K: SerBin,
@@ -545,7 +547,7 @@ where
     }
 }
 
-#[cfg(not(feature = "no_std"))]
+#[cfg(feature = "std")]
 impl<K, V> DeBin for std::collections::HashMap<K, V>
 where
     K: DeBin + core::cmp::Eq + core::hash::Hash,

src/serde_json.rs

@@ -1,5 +1,11 @@
 use core::str::Chars;
 
+// remove this after 1.81 is live
+#[cfg(not(feature = "std"))]
+use core::error::Error;
+#[cfg(feature = "std")]
+use std::error::Error;
+
 use alloc::boxed::Box;
 use alloc::collections::{BTreeMap, BTreeSet, LinkedList};
 use alloc::format;
@@ -160,11 +166,7 @@ impl core::fmt::Display for DeJsonErr {
     }
 }
 
-#[cfg(feature = "no_std")]
-impl core::error::Error for DeJsonErr {}
-
-#[cfg(not(feature = "no_std"))]
-impl std::error::Error for DeJsonErr {}
+impl Error for DeJsonErr {}
 
 impl DeJsonState {
     pub fn next(&mut self, i: &mut Chars) {
@@ -878,7 +880,7 @@ where
     }
 }
 
-#[cfg(not(feature = "no_std"))]
+#[cfg(feature = "std")]
 impl<T> SerJson for std::collections::HashSet<T>
 where
     T: SerJson,
@@ -899,7 +901,7 @@ where
     }
 }
 
-#[cfg(not(feature = "no_std"))]
+#[cfg(feature = "std")]
 impl<T> DeJson for std::collections::HashSet<T>
 where
     T: DeJson + core::hash::Hash + Eq,
@@ -1172,7 +1174,7 @@ where
     }
 }
 
-#[cfg(not(feature = "no_std"))]
+#[cfg(feature = "std")]
 impl<K, V> SerJson for std::collections::HashMap<K, V>
 where
     K: SerJson,
@@ -1197,7 +1199,7 @@ where
     }
 }
 
-#[cfg(not(feature = "no_std"))]
+#[cfg(feature = "std")]
 impl<K, V> DeJson for std::collections::HashMap<K, V>
 where
     K: DeJson + Eq + core::hash::Hash,

src/serde_ron.rs

@@ -1,5 +1,11 @@
 use core::str::Chars;
 
+// remove this after 1.81 is live
+#[cfg(not(feature = "std"))]
+use core::error::Error;
+#[cfg(feature = "std")]
+use std::error::Error;
+
 use alloc::boxed::Box;
 use alloc::collections::{BTreeMap, BTreeSet, LinkedList};
 use alloc::format;
@@ -157,11 +163,7 @@ impl core::fmt::Display for DeRonErr {
     }
 }
 
-#[cfg(feature = "no_std")]
-impl core::error::Error for DeRonErr {}
-
-#[cfg(not(feature = "no_std"))]
-impl std::error::Error for DeRonErr {}
+impl Error for DeRonErr {}
 
 impl DeRonState {
     pub fn next(&mut self, i: &mut Chars) {
@@ -876,7 +878,7 @@ where
     }
 }
 
-#[cfg(not(feature = "no_std"))]
+#[cfg(feature = "std")]
 impl<T> SerRon for std::collections::HashSet<T>
 where
     T: SerRon,
@@ -897,7 +899,7 @@ where
     }
 }
 
-#[cfg(not(feature = "no_std"))]
+#[cfg(feature = "std")]
 impl<T> DeRon for std::collections::HashSet<T>
 where
     T: DeRon + core::hash::Hash + Eq,
@@ -1184,7 +1186,7 @@ where
     }
 }
 
-#[cfg(not(feature = "no_std"))]
+#[cfg(feature = "std")]
 impl<K, V> SerRon for std::collections::HashMap<K, V>
 where
     K: SerRon,
@@ -1204,7 +1206,7 @@ where
     }
 }
 
-#[cfg(not(feature = "no_std"))]
+#[cfg(feature = "std")]
 impl<K, V> DeRon for std::collections::HashMap<K, V>
 where
     K: DeRon + Eq + core::hash::Hash,

src/toml.rs

@@ -1,5 +1,11 @@
 use core::str::Chars;
 
+// remove this after 1.81 is live
+#[cfg(not(feature = "std"))]
+use core::error::Error;
+#[cfg(feature = "std")]
+use std::error::Error;
+
 use alloc::format;
 use alloc::string::{String, ToString};
 use alloc::{collections::BTreeMap, vec, vec::Vec};
@@ -249,11 +255,7 @@ impl Out {
     }
 }
 
-#[cfg(feature = "no_std")]
-impl core::error::Error for TomlErr {}
-
-#[cfg(not(feature = "no_std"))]
-impl std::error::Error for TomlErr {}
+impl Error for TomlErr {}
 
 impl TomlParser {
     /// Parse a TOML string.

tests/json.rs

@@ -6,7 +6,7 @@ use std::{
     sync::atomic::AtomicBool,
 };
 
-#[cfg(not(feature = "no_std"))]
+#[cfg(feature = "std")]
 use std::collections::HashMap;
 
 #[test]
@@ -69,6 +69,7 @@ fn de_multiline_comment() {
 fn de_illegal_inline_comment() {
     #[derive(DeJson)]
     pub struct Test {
+        #[allow(unused)]
         pub a: f32,
     }
 
@@ -92,6 +93,7 @@ fn de_illegal_inline_comment() {
 fn de_illegal_multiline_comment() {
     #[derive(DeJson)]
     pub struct Test {
+        #[allow(unused)]
         pub a: f32,
     }
 
@@ -467,7 +469,7 @@ fn path_type() {
     assert_eq!(bar.d, Some(vec![vec![1, 2], vec![3, 4]]));
 }
 
-#[cfg(not(feature = "no_std"))]
+#[cfg(feature = "std")]
 #[test]
 fn hashmaps() {
     #[derive(DeJson)]