From ab11e37da075cffea65278851f618678c61ad80a Mon Sep 17 00:00:00 2001 From: trivernis Date: Sun, 13 Mar 2022 19:53:19 +0100 Subject: [PATCH] Fixup macro paths and remove prelude mod Signed-off-by: trivernis --- README.md | 2 +- src/lib.rs | 6 +----- src/macros.rs | 17 ++++++++--------- src/tests.rs | 2 +- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 8199cf6..b60a2a6 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ been noticed yet. ## Usage ```rust -use multi_trait_object::prelude::*; +use multi_trait_object::*; use std::fmt::Debug; #[derive(Debug)] diff --git a/src/lib.rs b/src/lib.rs index e10ffce..908db16 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -23,7 +23,7 @@ pub struct FatPointer { /// A container to store data with the associated type and trait objects /// allowing for casting down to trait_impl or the concrete type /// ```rust -/// use multi_trait_object::prelude::*; +/// use multi_trait_object::*; /// use std::fmt::{Debug, Display}; /// /// let mut mto = MultitraitObject::new(String::new()); @@ -195,8 +195,4 @@ impl From for MultitraitObject where T: IntoMultitrait { fn from(other: T) -> Self { other.into_multitrait() } -} - -pub mod prelude { - pub use crate::*; } \ No newline at end of file diff --git a/src/macros.rs b/src/macros.rs index 6c146d0..1e1a62d 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -1,7 +1,6 @@ /// Implements the `IntoMultitrait` trait on the defined type. /// ```rust -/// use multi_trait_object::prelude::*; -/// +/// use multi_trait_object::*; /// struct MyStruct { /// a: u64, /// } @@ -17,11 +16,11 @@ #[macro_export] macro_rules! impl_trait_object { ($obj:ty, $($trt:ty),*) => { - impl IntoMultitrait for $obj { - fn into_multitrait(self) -> MultitraitObject { - let mut mto = MultitraitObject::new(self); + impl $crate::IntoMultitrait for $obj { + fn into_multitrait(self) -> $crate::MultitraitObject { + let mut mto = $crate::MultitraitObject::new(self); $( - register_traits!(mto, $obj, $trt); + $crate::register_traits!(mto, $obj, $trt); )* mto @@ -32,7 +31,7 @@ macro_rules! impl_trait_object { /// Registers multiple trait_impl on a multitrait object /// ```rust -/// use multi_trait_object::prelude::*; +/// use multi_trait_object::*; /// use std::fmt::{Debug, Display}; /// /// let value = String::new(); @@ -43,7 +42,7 @@ macro_rules! impl_trait_object { macro_rules! register_traits { ($r:expr, $v:ty, $($t:ty), +) => { $( - $r._register::<$t>(__fat_pointer!($v as $t).vptr); + $r._register::<$t>($crate::__fat_pointer!($v as $t).vptr); )+ } } @@ -55,7 +54,7 @@ macro_rules! __fat_pointer { let x = ::std::ptr::null::<$v>() as *const $v as *const $t; #[allow(unused_unsafe)] unsafe { - std::mem::transmute::<_, FatPointer>(x) + std::mem::transmute::<_, $crate::FatPointer>(x) } }} } diff --git a/src/tests.rs b/src/tests.rs index feb2bcf..94d9e1f 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -1,5 +1,5 @@ use std::fmt::Debug; -use crate::prelude::*; +use crate::{__fat_pointer, impl_trait_object, IntoMultitrait, TryClone, TryPartialEq, RawClone, PartialEqAny}; #[derive(Clone, Debug, Eq, PartialEq)] struct TestStruct {