X-Git-Url: https://git.chrismorgan.info/anymap/blobdiff_plain/521fbfe6bcbf60e7abc8d8ab33bf73349fc4b38d..1e5c62d8f801c3ac36ec833d3c8373fcd4d429f1:/src/any.rs

diff --git a/src/any.rs b/src/any.rs
index 8404cd4..453d7dd 100644
--- a/src/any.rs
+++ b/src/any.rs
@@ -4,7 +4,7 @@
 //! cloneable `Any` and with the `Send` and `Sync` bounds possible on both `Any` and `CloneAny`.
 
 use std::fmt;
-use std::any::Any as StdAny;
+use std::any::Any;
 
 #[doc(hidden)]
 pub trait CloneToAny {
@@ -40,6 +40,13 @@ macro_rules! impl_clone {
                 unsafe { Box::from_raw(raw as *mut $t) }
             }
         }
+
+        impl fmt::Debug for $t {
+            #[inline]
+            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                f.pad(stringify!($t))
+            }
+        }
     }
 }
 
@@ -59,13 +66,6 @@ pub trait IntoBox<A: ?Sized + UncheckedAnyExt>: Any {
 
 macro_rules! implement {
     ($base:ident, $(+ $bounds:ident)*) => {
-        impl fmt::Debug for dyn $base $(+ $bounds)* {
-            #[inline]
-            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                f.pad(stringify!(dyn $base $(+ $bounds)*))
-            }
-        }
-
         impl UncheckedAnyExt for dyn $base $(+ $bounds)* {
             #[inline]
             unsafe fn downcast_ref_unchecked<T: 'static>(&self) -> &T {
@@ -92,48 +92,19 @@ macro_rules! implement {
     }
 }
 
-/// A type to emulate dynamic typing.
-///
-/// Every type with no non-`'static` references implements `Any`.
-/// See the [`std::any` documentation](https://doc.rust-lang.org/std/any/index.html) for
-/// more details on `Any` in general.
-///
-/// This trait is not `std::any::Any` but rather a type extending that for this library’s
-/// purposes so that it can be combined with marker traits like
-/// <code><a class=trait title=core::marker::Send
-/// href=http://doc.rust-lang.org/std/marker/trait.Send.html>Send</a></code> and
-/// <code><a class=trait title=core::marker::Sync
-/// href=http://doc.rust-lang.org/std/marker/trait.Sync.html>Sync</a></code>.
-///
-/// See also [`CloneAny`](trait.CloneAny.html) for a cloneable version of this trait.
-pub trait Any: StdAny { }
-impl<T: StdAny> Any for T { }
 implement!(Any,);
 implement!(Any, + Send);
-implement!(Any, + Sync);
 implement!(Any, + Send + Sync);
 
-/// A type to emulate dynamic typing with cloning.
-///
-/// Every type with no non-`'static` references that implements `Clone` implements `Any`.
-/// See the [`std::any` documentation](https://doc.rust-lang.org/std/any/index.html) for
-/// more details on `Any` in general.
-///
-/// This trait is not `std::any::Any` but rather a type extending that for this library’s
-/// purposes so that it can be combined with marker traits like
-/// <code><a class=trait title=core::marker::Send
-/// href=http://doc.rust-lang.org/std/marker/trait.Send.html>Send</a></code> and
-/// <code><a class=trait title=core::marker::Sync
-/// href=http://doc.rust-lang.org/std/marker/trait.Sync.html>Sync</a></code>.
+/// [`Any`], but with cloning.
 ///
-/// See also [`Any`](trait.Any.html) for a version without the `Clone` requirement.
+/// Every type with no non-`'static` references that implements `Clone` implements `CloneAny`.
+/// See [`std::any`] for more details on `Any` in general.
 pub trait CloneAny: Any + CloneToAny { }
-impl<T: StdAny + Clone> CloneAny for T { }
+impl<T: Any + Clone> CloneAny for T { }
 implement!(CloneAny,);
 implement!(CloneAny, + Send);
-implement!(CloneAny, + Sync);
 implement!(CloneAny, + Send + Sync);
 impl_clone!(dyn CloneAny);
 impl_clone!(dyn CloneAny + Send);
-impl_clone!(dyn CloneAny + Sync);
 impl_clone!(dyn CloneAny + Send + Sync);