about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2020-02-02 08:30:19 +0900
committerGitHub <noreply@github.com>2020-02-02 08:30:19 +0900
commitc7332abee219ca36d9920bde4e51101fc549452b (patch)
treea9899d717bc80943560b7e64716db19f0b8f3aac /src/libcore
parent1529126411685a417c907144b886c679737b5f95 (diff)
parent8bbaeb7ff9a830e85106a00c84a1aa262f77a7f3 (diff)
downloadrust-c7332abee219ca36d9920bde4e51101fc549452b.tar.gz
rust-c7332abee219ca36d9920bde4e51101fc549452b.zip
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
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/alloc.rs7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/libcore/alloc.rs b/src/libcore/alloc.rs
index 1b7dfafbd70..38df843d258 100644
--- a/src/libcore/alloc.rs
+++ b/src/libcore/alloc.rs
@@ -1227,10 +1227,3 @@ pub unsafe trait AllocRef {
         }
     }
 }
-
-// In order to rename `Alloc` to `AllocRef`, some submoduleshas to be updated as well. The CI fails
-// if either of the submodules fails to compile. The submodules have their own CI depending on a
-// specific Rust version, which don't have `AllocRef` yet. This alias is used to make the submodules
-// compile and pass the CI.
-#[unstable(feature = "allocator_api", issue = "32838")]
-pub use self::AllocRef as Alloc;