remove core module for clarity; duplicate with core from Rust

readme.md

@@ -8,17 +8,15 @@ The very same hex color example from nom but using binator:
 
 ```rust
 use binator::{
+  Parse,
+  Parsed,
   base::{
     is,
     uint_radix,
     IntRadixParse,
     Radix,
   },
   context::Ignore,
-  core::{
-    Parse,
-    Parsed,
-  },
   utils::Utils,
 };
 

src/base/all.rs

@@ -1,4 +1,4 @@
-use crate::core::{
+use crate::{
   Contexting,
   CoreAtom,
   Parsed,

src/base/any.rs

@@ -1,4 +1,4 @@
-use crate::core::{
+use crate::{
   Contexting,
   CoreAtom,
   Parsed,

src/base/ascii.rs

@@ -1,15 +1,15 @@
 //! ASCII Core Rules (RFC5234 B.1.)
 
-use stdcore::fmt::{
+use core::fmt::{
   self,
   Display,
   Formatter,
 };
 
 use crate::{
   base::*,
-  core::*,
   utils::*,
+  *,
 };
 
 /// Meta trait for ascii combinator

src/base/base_atom.rs

@@ -1,4 +1,4 @@
-use stdcore::fmt::{
+use core::fmt::{
   Debug,
   Display,
   Formatter,

src/base/character.rs

@@ -1,4 +1,4 @@
-use crate::core::{
+use crate::{
   any,
   Contexting,
   CoreAtom,

src/base/end_of_stream.rs

@@ -1,12 +1,10 @@
 use crate::{
   base::any,
-  core::{
-    Contexting,
-    CoreAtom,
-    Parse,
-    Parsed,
-    Streaming,
-  },
+  Contexting,
+  CoreAtom,
+  Parse,
+  Parsed,
+  Streaming,
 };
 
 /// Context from end_of_stream parser.

src/base/failure.rs

@@ -3,7 +3,7 @@ use core::{
   fmt::Debug,
 };
 
-use crate::core::{
+use crate::{
   Contexting,
   Parse,
   Parsed,

src/base/float.rs

@@ -1,4 +1,4 @@
-use stdcore::{
+use core::{
   fmt::{
     self,
     Debug,
@@ -17,19 +17,17 @@ use crate::{
     to_digit,
     BaseAtom,
   },
-  core::{
-    Acc,
-    Contexting,
-    CoreAtom,
-    Parse,
-    Parsed,
-    Streaming,
-    Success,
-  },
   utils::{
+    Acc,
     Utils,
     UtilsAtom,
   },
+  Contexting,
+  CoreAtom,
+  Parse,
+  Parsed,
+  Streaming,
+  Success,
 };
 
 /// Information about float failure
@@ -178,13 +176,11 @@ mod tests {
   use crate::{
     base::BaseAtom,
     context::Tree,
-    core::{
-      CoreAtom,
-      Parse,
-      Parsed,
-      Streaming,
-    },
     utils::UtilsAtom,
+    CoreAtom,
+    Parse,
+    Parsed,
+    Streaming,
   };
 
   #[derive(Display, Debug, Clone, From)]

src/base/is.rs

@@ -5,14 +5,12 @@ use crate::{
     any,
     BaseAtom,
   },
-  core::{
-    Contexting,
-    CoreAtom,
-    Parse,
-    Parsed,
-    Streaming,
-  },
   utils::Utils,
+  Contexting,
+  CoreAtom,
+  Parse,
+  Parsed,
+  Streaming,
 };
 
 /// Return Success if item from stream is partially equal to t.

src/base/list.rs

@@ -5,17 +5,15 @@ use crate::{
     any,
     BaseAtom,
   },
-  core::{
-    Contexting,
-    CoreAtom,
-    Parse,
-    Parsed,
-    Streaming,
-  },
   utils::{
     Utils,
     UtilsAtom,
   },
+  Contexting,
+  CoreAtom,
+  Parse,
+  Parsed,
+  Streaming,
 };
 
 /// Take a list of T and return a Parser that will partially Eq in order Item

src/base/nbit.rs

@@ -1,12 +1,10 @@
 use crate::{
   base::octet,
-  core::{
-    Contexting,
-    CoreAtom,
-    Parse,
-    Streaming,
-  },
   utils::Utils,
+  Contexting,
+  CoreAtom,
+  Parse,
+  Streaming,
 };
 
 /// Used by nbit to represent n only if 0 > n > 8
@@ -65,7 +63,7 @@ where
     feature = "tracing",
     tracing::instrument(level = "trace", name = "nbit", skip_all, ret(Display))
   )]
-  fn parse(&mut self, stream: Stream) -> crate::core::Parsed<Self::Token, Stream, Context> {
+  fn parse(&mut self, stream: Stream) -> crate::Parsed<Self::Token, Stream, Context> {
     octet
       .map(|b| (b >> self.n, b & u8::MAX >> (8 - self.n)))
       .parse(stream)
@@ -77,7 +75,7 @@ mod tests {
   use super::*;
   use crate::{
     context::*,
-    core::*,
+    *,
   };
 
   #[test]

src/base/octet.rs

@@ -1,13 +1,11 @@
 use crate::{
   base::any,
-  core::{
-    Contexting,
-    CoreAtom,
-    Parse,
-    Parsed,
-    Streaming,
-  },
   utils::Utils,
+  Contexting,
+  CoreAtom,
+  Parse,
+  Parsed,
+  Streaming,
 };
 
 /// Will read an item from the Stream and convert it to an octet

src/base/one_of.rs

@@ -5,14 +5,12 @@ use crate::{
     any,
     BaseAtom,
   },
-  core::{
-    Contexting,
-    CoreAtom,
-    Parse,
-    Parsed,
-    Streaming,
-  },
   utils::Utils,
+  Contexting,
+  CoreAtom,
+  Parse,
+  Parsed,
+  Streaming,
 };
 
 /// Will check if next Item from Stream is partially equal

src/base/parse.rs

@@ -1,6 +1,6 @@
 use core::fmt::Debug;
 
-use crate::core::Parse;
+use crate::Parse;
 
 /// Take a parser and return a Parser that will call parse on it.
 pub fn parse<Stream, Context, Parser>(

src/base/primitive.rs

@@ -2,17 +2,15 @@ use paste::paste;
 
 use crate::{
   base::octet,
-  core::{
-    Contexting,
-    CoreAtom,
-    Parse,
-    Parsed,
-    Streaming,
-  },
   utils::{
     Utils,
     UtilsAtom,
   },
+  Contexting,
+  CoreAtom,
+  Parse,
+  Parsed,
+  Streaming,
 };
 
 /// Meta trait for number

src/base/radix.rs

@@ -1,3 +1,13 @@
+use core::{
+  fmt::{
+    self,
+    Debug,
+    Display,
+    Formatter,
+  },
+  marker::PhantomData,
+};
+
 use num_traits::{
   cast::AsPrimitive,
   identities::Zero,
@@ -11,15 +21,6 @@ use num_traits::{
   },
   CheckedSub,
 };
-use stdcore::{
-  fmt::{
-    self,
-    Debug,
-    Display,
-    Formatter,
-  },
-  marker::PhantomData,
-};
 
 use crate::{
   base::{
@@ -28,19 +29,17 @@ use crate::{
     BaseAtom,
     Sign,
   },
-  core::{
-    Contexting,
-    CoreAtom,
-    Parse,
-    Parsed,
-    Streaming,
-    Success,
-  },
   utils::{
     TryFoldBoundsParse,
     Utils,
     UtilsAtom,
   },
+  Contexting,
+  CoreAtom,
+  Parse,
+  Parsed,
+  Streaming,
+  Success,
 };
 
 /// Represent Radix, used to limit radix <= 36
@@ -309,13 +308,11 @@ mod tests {
   use crate::{
     base::BaseAtom,
     context::Tree,
-    core::{
-      CoreAtom,
-      Parse,
-      Parsed,
-      Streaming,
-    },
     utils::UtilsAtom,
+    CoreAtom,
+    Parse,
+    Parsed,
+    Streaming,
   };
 
   #[derive(Display, Debug, Clone, From)]

src/base/sign.rs

@@ -3,17 +3,15 @@ use crate::{
     is,
     BaseAtom,
   },
-  core::{
-    Contexting,
-    CoreAtom,
-    Parse,
-    Parsed,
-    Streaming,
-  },
   utils::{
     Utils,
     UtilsAtom,
   },
+  Contexting,
+  CoreAtom,
+  Parse,
+  Parsed,
+  Streaming,
 };
 
 /// Enum that hold Sign value

src/base/success.rs

@@ -1,6 +1,6 @@
 use core::fmt::Debug;
 
-use crate::core::{
+use crate::{
   Parse,
   Parsed,
   ProvideElement,