0.11.0: merge concurrency branch.

[anymap] / src / any.rs
diff --git a/src/any.rs b/src/any.rs

index 45ad5cccc98dd59ba7309fcde048469e062d261d..93130e0a82f559ba6fce755fc44fbaceeb82a137 100644 (file)
--- a/src/any.rs
+++ b/src/any.rs
@@ -88,10 +88,10 @@ macro_rules! impl_clone {
      }
  }
  
      }
  }
  
-#[cfg(feature = "nightly")]
+#[cfg(feature = "unstable")]
  use std::raw::TraitObject;
  
  use std::raw::TraitObject;
  
-#[cfg(not(feature = "nightly"))]
+#[cfg(not(feature = "unstable"))]
  #[repr(C)]
  #[allow(raw_pointer_derive)]
  #[derive(Copy, Clone)]
  #[repr(C)]
  #[allow(raw_pointer_derive)]
  #[derive(Copy, Clone)]
@@ -116,15 +116,9 @@ pub trait IntoBox<A: ?Sized + UncheckedAnyExt>: Any {
  
  macro_rules! implement {
      ($base:ident, $(+ $bounds:ident)*) => {
  
  macro_rules! implement {
      ($base:ident, $(+ $bounds:ident)*) => {
-        impl<'a> fmt::Debug for &'a ($base $(+ $bounds)*) {
+        impl fmt::Debug for $base $(+ $bounds)* {
              fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
              fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                f.pad(stringify!(&($base $(+ $bounds)*)))
-            }
-        }
-
-        impl<'a> fmt::Debug for Box<$base $(+ $bounds)*> {
-            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                f.pad(stringify!(Box<$base $(+ $bounds)*>))
+                f.pad(stringify!($base $(+ $bounds)*))
              }
          }
  
              }
          }