Skip to content

Commit c7332ab

Browse files
authored
Rollup merge of #68736 - TimDiekmann:remove-alloc, r=Amanieu
Remove `Alloc` in favor of `AllocRef` `AllocRef` was reexported as `Alloc` in #68529 in order to not break toolstate in the week before the next stable release. r? @Amanieu
2 parents 1529126 + 8bbaeb7 commit c7332ab

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

src/libcore/alloc.rs

-7
Original file line numberDiff line numberDiff line change
@@ -1227,10 +1227,3 @@ pub unsafe trait AllocRef {
12271227
}
12281228
}
12291229
}
1230-
1231-
// In order to rename `Alloc` to `AllocRef`, some submoduleshas to be updated as well. The CI fails
1232-
// if either of the submodules fails to compile. The submodules have their own CI depending on a
1233-
// specific Rust version, which don't have `AllocRef` yet. This alias is used to make the submodules
1234-
// compile and pass the CI.
1235-
#[unstable(feature = "allocator_api", issue = "32838")]
1236-
pub use self::AllocRef as Alloc;

0 commit comments

Comments
 (0)