Add generic parameter for allocator to Box

TimDiekmann · TimDiekmann · commit 75d830a0aa47 · 2020-05-11T11:08:28.000+02:00
diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs
@@ -278,11 +278,11 @@ unsafe fn exchange_malloc(size: usize, align: usize) -> *mut u8 {
 // well.
 // For example if `Box` is changed to  `struct Box<T: ?Sized, A: AllocRef>(Unique<T>, A)`,
 // this function has to be changed to `fn box_free<T: ?Sized, A: AllocRef>(Unique<T>, A)` as well.
-pub(crate) unsafe fn box_free<T: ?Sized>(ptr: Unique<T>) {
+pub(crate) unsafe fn box_free<T: ?Sized, A: AllocRef>(ptr: Unique<T>, mut alloc: A) {
     let size = size_of_val(ptr.as_ref());
     let align = min_align_of_val(ptr.as_ref());
     let layout = Layout::from_size_align_unchecked(size, align);
-    Global.dealloc(ptr.cast().into(), layout)
+    alloc.dealloc(ptr.cast().into(), layout)
 }
 
 /// Abort on memory allocation error or failure.
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
@@ -156,7 +156,7 @@ use crate::vec::Vec;
 #[lang = "owned_box"]
 #[fundamental]
 #[stable(feature = "rust1", since = "1.0.0")]
-pub struct Box<T: ?Sized>(Unique<T>);
+pub struct Box<T: ?Sized, A: AllocRef = Global>(Unique<T>, A);
 
 impl<T> Box<T> {
     /// Allocates memory on the heap and then places `x` into it.
@@ -392,7 +392,7 @@ impl<T: ?Sized> Box<T> {
     #[stable(feature = "box_raw", since = "1.4.0")]
     #[inline]
     pub unsafe fn from_raw(raw: *mut T) -> Self {
-        Box(Unique::new_unchecked(raw))
+        Box(Unique::new_unchecked(raw), Global)
     }
 
     /// Consumes the `Box`, returning a wrapped raw pointer.
@@ -567,7 +567,7 @@ impl<T: ?Sized> Box<T> {
 }
 
 #[stable(feature = "rust1", since = "1.0.0")]
-unsafe impl<#[may_dangle] T: ?Sized> Drop for Box<T> {
+unsafe impl<#[may_dangle] T: ?Sized, A: AllocRef> Drop for Box<T, A> {
     fn drop(&mut self) {
         // FIXME: Do nothing, drop is currently performed by compiler.
     }
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs
@@ -997,7 +997,7 @@ impl<T: ?Sized> Rc<T> {
             );
 
             // Free the allocation without dropping its contents
-            box_free(box_unique);
+            box_free(box_unique, Global);
 
             Self::from_ptr(ptr)
         }
diff --git a/src/liballoc/sync.rs b/src/liballoc/sync.rs
@@ -950,7 +950,7 @@ impl<T: ?Sized> Arc<T> {
             );
 
             // Free the allocation without dropping its contents
-            box_free(box_unique);
+            box_free(box_unique, Global);
 
             Self::from_ptr(ptr)
         }
diff --git a/src/test/mir-opt/inline/inline-into-box-place/64bit/rustc.main.Inline.diff b/src/test/mir-opt/inline/inline-into-box-place/64bit/rustc.main.Inline.diff
@@ -69,7 +69,7 @@
 -     bb4 (cleanup): {
 -         _3 = const alloc::alloc::box_free::<std::vec::Vec<u32>>(move (_2.0: std::ptr::Unique<std::vec::Vec<u32>>)) -> bb3; // scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43
 -                                          // ty::Const
--                                          // + ty: unsafe fn(std::ptr::Unique<std::vec::Vec<u32>>) {alloc::alloc::box_free::<std::vec::Vec<u32>>}
+-                                          // + ty: unsafe fn(std::ptr::Unique<std::vec::Vec<u32>>, std::alloc::Global) {alloc::alloc::box_free::<std::vec::Vec<u32>, std::alloc::Global>}
 -                                          // + val: Value(Scalar(<ZST>))
 -                                          // mir::Constant
 -                                          // + span: $DIR/inline-into-box-place.rs:8:42: 8:43
diff --git a/src/test/ui/coherence/impl-foreign-for-fundamental[foreign].stderr b/src/test/ui/coherence/impl-foreign-for-fundamental[foreign].stderr
@@ -2,9 +2,10 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
   --> $DIR/impl-foreign-for-fundamental[foreign].rs:10:1
    |
 LL | impl Remote for Box<i32> {
-   | ^^^^^^^^^^^^^^^^--------
-   | |               |
-   | |               `i32` is not defined in the current crate
+   | ^^^^^------^^^^^--------
+   | |    |          |
+   | |    |          `i32` is not defined in the current crate
+   | |    `std::alloc::Global` is not defined in the current crate
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -13,9 +14,10 @@ error[E0117]: only traits defined in the current crate can be implemented for ar
   --> $DIR/impl-foreign-for-fundamental[foreign].rs:14:1
    |
 LL | impl<T> Remote for Box<Rc<T>> {
-   | ^^^^^^^^^^^^^^^^^^^----------
-   | |                  |
-   | |                  `std::rc::Rc` is not defined in the current crate
+   | ^^^^^^^^------^^^^^----------
+   | |       |          |
+   | |       |          `std::rc::Rc` is not defined in the current crate
+   | |       `std::alloc::Global` is not defined in the current crate
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
diff --git a/src/test/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.stderr b/src/test/ui/coherence/impl-foreign[fundemental[foreign]]-for-foreign.stderr
@@ -6,6 +6,7 @@ LL | impl Remote1<Box<String>> for i32 {
    | |    |                        |
    | |    |                        `i32` is not defined in the current crate
    | |    `std::string::String` is not defined in the current crate
+   | |    `std::alloc::Global` is not defined in the current crate
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -18,6 +19,7 @@ LL | impl Remote1<Box<Rc<i32>>> for f64 {
    | |    |                         |
    | |    |                         `f64` is not defined in the current crate
    | |    `std::rc::Rc` is not defined in the current crate
+   | |    `std::alloc::Global` is not defined in the current crate
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
@@ -30,6 +32,7 @@ LL | impl<T> Remote1<Box<Rc<T>>> for f32 {
    | |       |                       |
    | |       |                       `f32` is not defined in the current crate
    | |       `std::rc::Rc` is not defined in the current crate
+   | |       `std::alloc::Global` is not defined in the current crate
    | impl doesn't use only types from inside the current crate
    |
    = note: define and implement a trait or new type instead
diff --git a/src/test/ui/issues/issue-14092.rs b/src/test/ui/issues/issue-14092.rs
@@ -1,4 +1,4 @@
 fn fn1(0: Box) {}
-        //~^ ERROR wrong number of type arguments: expected 1, found 0 [E0107]
+        //~^ ERROR wrong number of type arguments: expected at least 1, found 0 [E0107]
 
 fn main() {}
diff --git a/src/test/ui/issues/issue-14092.stderr b/src/test/ui/issues/issue-14092.stderr
@@ -1,8 +1,8 @@
-error[E0107]: wrong number of type arguments: expected 1, found 0
+error[E0107]: wrong number of type arguments: expected at least 1, found 0
   --> $DIR/issue-14092.rs:1:11
    |
 LL | fn fn1(0: Box) {}
-   |           ^^^ expected 1 type argument
+   |           ^^^ expected at least 1 type argument
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-3601.stderr b/src/test/ui/issues/issue-3601.stderr
@@ -1,8 +1,8 @@
-error[E0004]: non-exhaustive patterns: `Box(_)` not covered
+error[E0004]: non-exhaustive patterns: `Box(_, _)` not covered
   --> $DIR/issue-3601.rs:30:44
    |
 LL |         box NodeKind::Element(ed) => match ed.kind {
-   |                                            ^^^^^^^ pattern `Box(_)` not covered
+   |                                            ^^^^^^^ pattern `Box(_, _)` not covered
    |
    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
    = note: the matched value is of type `std::boxed::Box<ElementKind>`
diff --git a/src/test/ui/issues/issue-41974.stderr b/src/test/ui/issues/issue-41974.stderr
@@ -1,13 +1,13 @@
-error[E0119]: conflicting implementations of trait `std::ops::Drop` for type `std::boxed::Box<_>`:
+error[E0119]: conflicting implementations of trait `std::ops::Drop` for type `std::boxed::Box<_, _>`:
   --> $DIR/issue-41974.rs:7:1
    |
 LL | impl<T> Drop for T where T: A {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: conflicting implementation in crate `alloc`:
-           - impl<T> std::ops::Drop for std::boxed::Box<T>
-             where T: ?Sized;
-   = note: downstream crates may implement trait `A` for type `std::boxed::Box<_>`
+           - impl<T, A> std::ops::Drop for std::boxed::Box<T, A>
+             where A: std::alloc::AllocRef, T: ?Sized;
+   = note: downstream crates may implement trait `A` for type `std::boxed::Box<_, _>`
 
 error[E0120]: the `Drop` trait may only be implemented for structs, enums, and unions
   --> $DIR/issue-41974.rs:7:18
diff --git a/src/test/ui/privacy/privacy-ns1.rs b/src/test/ui/privacy/privacy-ns1.rs
@@ -33,7 +33,7 @@ fn test_glob2() {
     use foo2::*;
 
     let _x: Box<Bar>;  //~ ERROR wrong number of const arguments: expected 0, found 1
-    //~^ ERROR wrong number of type arguments: expected 1, found 0
+    //~^ ERROR wrong number of type arguments: expected at least 1, found 0
 }
 
 // neither public
diff --git a/src/test/ui/privacy/privacy-ns1.stderr b/src/test/ui/privacy/privacy-ns1.stderr
@@ -70,11 +70,11 @@ error[E0107]: wrong number of const arguments: expected 0, found 1
 LL |     let _x: Box<Bar>;
    |                 ^^^ unexpected const argument
 
-error[E0107]: wrong number of type arguments: expected 1, found 0
+error[E0107]: wrong number of type arguments: expected at least 1, found 0
   --> $DIR/privacy-ns1.rs:35:13
    |
 LL |     let _x: Box<Bar>;
-   |             ^^^^^^^^ expected 1 type argument
+   |             ^^^^^^^^ expected at least 1 type argument
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/privacy/privacy-ns2.rs b/src/test/ui/privacy/privacy-ns2.rs
@@ -39,15 +39,15 @@ fn test_single2() {
     use foo2::Bar;
 
     let _x : Box<Bar>; //~ ERROR wrong number of const arguments: expected 0, found 1
-    //~^ ERROR wrong number of type arguments: expected 1, found 0
+    //~^ ERROR wrong number of type arguments: expected at least 1, found 0
     let _x : Bar(); //~ ERROR expected type, found function `Bar`
 }
 
 fn test_list2() {
     use foo2::{Bar,Baz};
 
     let _x: Box<Bar>; //~ ERROR wrong number of const arguments: expected 0, found 1
-    //~^ ERROR wrong number of type arguments: expected 1, found 0
+    //~^ ERROR wrong number of type arguments: expected at least 1, found 0
 }
 
 // neither public
diff --git a/src/test/ui/privacy/privacy-ns2.stderr b/src/test/ui/privacy/privacy-ns2.stderr
@@ -96,23 +96,23 @@ error[E0107]: wrong number of const arguments: expected 0, found 1
 LL |     let _x : Box<Bar>;
    |                  ^^^ unexpected const argument
 
-error[E0107]: wrong number of type arguments: expected 1, found 0
+error[E0107]: wrong number of type arguments: expected at least 1, found 0
   --> $DIR/privacy-ns2.rs:41:14
    |
 LL |     let _x : Box<Bar>;
-   |              ^^^^^^^^ expected 1 type argument
+   |              ^^^^^^^^ expected at least 1 type argument
 
 error[E0107]: wrong number of const arguments: expected 0, found 1
   --> $DIR/privacy-ns2.rs:49:17
    |
 LL |     let _x: Box<Bar>;
    |                 ^^^ unexpected const argument
 
-error[E0107]: wrong number of type arguments: expected 1, found 0
+error[E0107]: wrong number of type arguments: expected at least 1, found 0
   --> $DIR/privacy-ns2.rs:49:13
    |
 LL |     let _x: Box<Bar>;
-   |             ^^^^^^^^ expected 1 type argument
+   |             ^^^^^^^^ expected at least 1 type argument
 
 error: aborting due to 10 previous errors
 
diff --git a/src/test/ui/unique-object-noncopyable.stderr b/src/test/ui/unique-object-noncopyable.stderr
@@ -12,8 +12,8 @@ LL |     let _z = y.clone();
    | 
   ::: $SRC_DIR/liballoc/boxed.rs:LL:COL
    |
-LL | pub struct Box<T: ?Sized>(Unique<T>);
-   | ------------------------------------- doesn't satisfy `std::boxed::Box<dyn Foo>: std::clone::Clone`
+LL | pub struct Box<T: ?Sized, A: AllocRef = Global>(Unique<T>, A);
+   | -------------------------------------------------------------- doesn't satisfy `std::boxed::Box<dyn Foo>: std::clone::Clone`
    | 
   ::: $SRC_DIR/libcore/clone.rs:LL:COL
    |
diff --git a/src/test/ui/unique-pinned-nocopy.stderr b/src/test/ui/unique-pinned-nocopy.stderr
@@ -9,8 +9,8 @@ LL |     let _j = i.clone();
    | 
   ::: $SRC_DIR/liballoc/boxed.rs:LL:COL
    |
-LL | pub struct Box<T: ?Sized>(Unique<T>);
-   | ------------------------------------- doesn't satisfy `std::boxed::Box<R>: std::clone::Clone`
+LL | pub struct Box<T: ?Sized, A: AllocRef = Global>(Unique<T>, A);
+   | -------------------------------------------------------------- doesn't satisfy `std::boxed::Box<R>: std::clone::Clone`
    | 
   ::: $SRC_DIR/libcore/clone.rs:LL:COL
    |

Original file line number	Diff line number	Diff line change
`@@ -997,7 +997,7 @@ impl<T: ?Sized> Rc<T> {`
`997`	`997`	`);`
`998`	`998`
`999`	`999`	`// Free the allocation without dropping its contents`
`1000`		`- box_free(box_unique);`
	`1000`	`+ box_free(box_unique, Global);`
`1001`	`1001`
`1002`	`1002`	`Self::from_ptr(ptr)`
`1003`	`1003`	`}`
Original file line number	Diff line number	Diff line change
`@@ -950,7 +950,7 @@ impl<T: ?Sized> Arc<T> {`
`950`	`950`	`);`
`951`	`951`
`952`	`952`	`// Free the allocation without dropping its contents`
`953`		`- box_free(box_unique);`
	`953`	`+ box_free(box_unique, Global);`
`954`	`954`
`955`	`955`	`Self::from_ptr(ptr)`
`956`	`956`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-error[E0107]: wrong number of type arguments: expected 1, found 0`
	`1`	`+error[E0107]: wrong number of type arguments: expected at least 1, found 0`
`2`	`2`	`--> $DIR/issue-14092.rs:1:11`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn fn1(0: Box) {}`
`5`		`- \| ^^^ expected 1 type argument`
	`5`	`+ \| ^^^ expected at least 1 type argument`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		-error[E0004]: non-exhaustive patterns: `Box(_)` not covered
	`1`	+error[E0004]: non-exhaustive patterns: `Box(_, _)` not covered
`2`	`2`	`--> $DIR/issue-3601.rs:30:44`
`3`	`3`	`\|`
`4`	`4`	`LL \| box NodeKind::Element(ed) => match ed.kind {`
`5`		- \| ^^^^^^^ pattern `Box(_)` not covered
	`5`	+ \| ^^^^^^^ pattern `Box(_, _)` not covered
`6`	`6`	`\|`
`7`	`7`	`= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms`
`8`	`8`	= note: the matched value is of type `std::boxed::Box<ElementKind>`