Fix use of wrongGlobal in tests

Author: TimDiekmann

src/liballoc/alloc.rs

@@ -2,8 +2,13 @@
 
 #![stable(feature = "alloc_module", since = "1.28.0")]
 
-use core::intrinsics::{self, min_align_of_val, size_of_val};
-use core::ptr::{NonNull, Unique};
+#[cfg(not(test))]
+use core::intrinsics;
+#[cfg(not(test))]
+use core::ptr::NonNull;
+
+use core::intrinsics::{min_align_of_val, size_of_val};
+use core::ptr::Unique;
 
 #[stable(feature = "alloc_module", since = "1.28.0")]
 #[doc(inline)]
@@ -40,8 +45,12 @@ extern "Rust" {
 /// [`AllocRef`]: trait.AllocRef.html
 #[unstable(feature = "allocator_api", issue = "32838")]
 #[derive(Copy, Clone, Default, Debug)]
+#[cfg(not(test))]
 pub struct Global;
 
+#[cfg(test)]
+pub use std::alloc::Global;
+
 /// Allocate memory with the global allocator.
 ///
 /// This function forwards calls to the [`GlobalAlloc::alloc`] method
@@ -162,6 +171,7 @@ pub unsafe fn alloc_zeroed(layout: Layout) -> *mut u8 {
 }
 
 #[unstable(feature = "allocator_api", issue = "32838")]
+#[cfg(not(test))]
 unsafe impl AllocRef for Global {
     #[inline]
     fn alloc(&mut self, layout: Layout, init: AllocInit) -> Result<MemoryBlock, AllocErr> {

src/liballoc/boxed.rs

@@ -739,7 +739,7 @@ unsafe impl<#[may_dangle] T: ?Sized, A: AllocRef> Drop for Box<T, A> {
 }
 
 #[stable(feature = "rust1", since = "1.0.0")]
-impl<T: Default, A: AllocRef + Default> Default for Box<T, A> {
+impl<T: Default> Default for Box<T> {
     /// Creates a `Box<T>`, with the `Default` value for T.
     fn default() -> Self {
         box T::default()
@@ -916,7 +916,7 @@ impl<T: ?Sized + Hasher, A: AllocRef> Hasher for Box<T, A> {
 }
 
 #[stable(feature = "from_for_ptrs", since = "1.6.0")]
-impl<T, A: AllocRef + Default> From<T> for Box<T, A> {
+impl<T> From<T> for Box<T> {
     /// Converts a generic type `T` into a `Box<T>`
     ///
     /// The conversion allocates on the heap and moves `t`
@@ -930,7 +930,7 @@ impl<T, A: AllocRef + Default> From<T> for Box<T, A> {
     /// assert_eq!(Box::from(x), boxed);
     /// ```
     fn from(t: T) -> Self {
-        Box::new_in(t, A::default())
+        Box::new(t)
     }
 }
 
@@ -945,7 +945,7 @@ impl<T: ?Sized, A: AllocRef> From<Box<T, A>> for Pin<Box<T, A>> {
 }
 
 #[stable(feature = "box_from_slice", since = "1.17.0")]
-impl<T: Copy, A: AllocRef + Default> From<&[T]> for Box<[T], A> {
+impl<T: Copy> From<&[T]> for Box<[T]> {
     /// Converts a `&[T]` into a `Box<[T]>`
     ///
     /// This conversion allocates on the heap
@@ -970,7 +970,7 @@ impl<T: Copy, A: AllocRef + Default> From<&[T]> for Box<[T], A> {
 }
 
 #[stable(feature = "box_from_slice", since = "1.17.0")]
-impl<A: AllocRef + Default> From<&str> for Box<str, A> {
+impl From<&str> for Box<str> {
     /// Converts a `&str` into a `Box<str>`
     ///
     /// This conversion allocates on the heap
@@ -1237,9 +1237,9 @@ impl<I> FromIterator<I> for Box<[I]> {
 }
 
 #[stable(feature = "box_slice_clone", since = "1.3.0")]
-impl<T: Clone, A: AllocRef + Clone> Clone for Box<[T], A> {
+impl<T: Clone> Clone for Box<[T]> {
     fn clone(&self) -> Self {
-        self.to_vec_in(self.1.clone()).into_boxed_slice()
+        self.to_vec().into_boxed_slice()
     }
 }