diff --git a/src/atomic.rs b/src/atomic.rs index 7f6fc4d..4850025 100644 --- a/src/atomic.rs +++ b/src/atomic.rs @@ -1,7 +1,14 @@ +mod modes; + use std::error::Error; use crate::mode::*; +pub use self::modes::{ + AExtensionResultM, AExtensionSourceM, AModeResultM, AtomicModeParse, AtomicModeProxy, + CRegularAtomic, RegularAtomic, +}; + /// [`Atomic`] equivalent of [`ParseError`]. /// /// [`ParseError`]: crate::rcore::ParseError diff --git a/src/rstd/atomic/modes.rs b/src/atomic/modes.rs similarity index 100% rename from src/rstd/atomic/modes.rs rename to src/atomic/modes.rs diff --git a/src/mode.rs b/src/mode.rs index 5b71fda..a5f476a 100644 --- a/src/mode.rs +++ b/src/mode.rs @@ -219,7 +219,7 @@ pub trait WithParseMode: ImplMode { /// [`WithMode`] implementing [`FactoryModeProxy`] or [`AtomicModeProxy`]. /// /// [`FactoryModeProxy`]: crate::rcore::FactoryModeProxy - /// [`AtomicModeProxy`]: crate::rstd::atomic::AtomicModeProxy + /// [`AtomicModeProxy`]: crate::atomic::AtomicModeProxy type WithMode: ?Sized; } diff --git a/src/mode/regular.rs b/src/mode/regular.rs index 4d242d1..74919ad 100644 --- a/src/mode/regular.rs +++ b/src/mode/regular.rs @@ -3,7 +3,7 @@ use super::*; /// [`Mode`] for [`RegularFactory`] and [`RegularAtomic`]. /// /// [`RegularFactory`]: crate::rcore::RegularFactory -/// [`RegularAtomic`]: crate::rstd::atomic::RegularAtomic +/// [`RegularAtomic`]: crate::atomic::RegularAtomic pub struct RegularMode; impl Mode for RegularMode { diff --git a/src/rstd/atomic.rs b/src/rstd/atomic.rs index e124183..fe41364 100644 --- a/src/rstd/atomic.rs +++ b/src/rstd/atomic.rs @@ -5,7 +5,6 @@ pub mod array; pub mod atomic_object; pub mod au64; pub mod boolean; -mod modes; pub mod plain; use std::marker::PhantomData; @@ -14,11 +13,6 @@ use crate::{atomic::*, mode::*}; use super::*; -pub use self::modes::{ - AExtensionResultM, AExtensionSourceM, AModeResultM, AtomicModeParse, AtomicModeProxy, - CRegularAtomic, RegularAtomic, -}; - fn _parse_slice(slice: &[u8]) -> AParseResult { let mut deserializer = SliceDeserializer::from(slice); let atomic = A::a_deserialize(&mut deserializer)?; diff --git a/src/rstd/inlining.rs b/src/rstd/inlining.rs index 59182ef..25ad96e 100644 --- a/src/rstd/inlining.rs +++ b/src/rstd/inlining.rs @@ -7,10 +7,7 @@ use crate::atomic::*; use crate::mode::*; use crate::rcore::*; -use super::{ - atomic::{atomic_object::*, *}, - *, -}; +use super::{atomic::atomic_object::*, *}; pub type IParseResult<'a, Ctx, F, I> = Result<(Mtbl<'a, Ctx, F>, I), ParseError<'a, Ctx, F>>;