about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-02-01 23:31:51 +0000
committerbors <bors@rust-lang.org>2020-02-01 23:31:51 +0000
commite5b150edafc0e72cd7f5f3f67a4e8b417d515b01 (patch)
treef29b6c6172ad7b834afac0155d93036c028cfc63 /src/libcore
parent13db6501c7273cd1997ce20e15106f362e5613c4 (diff)
parent87bb0c4389b09bfa86780eb014a4a2de95a3840b (diff)
downloadrust-e5b150edafc0e72cd7f5f3f67a4e8b417d515b01.tar.gz
rust-e5b150edafc0e72cd7f5f3f67a4e8b417d515b01.zip
Auto merge of #68752 - JohnTitor:rollup-zz3u4xl, r=JohnTitor
Rollup of 7 pull requests

Successful merges:

 - #68460 (Use BufWriter for emitting MIR)
 - #68681 (Suggest path separator for single-colon typos)
 - #68688 ([docs] remind bug reporters to update nightly)
 - #68704 (Ignore `build` dir formatting)
 - #68727 (Remove a comment about pretty printer in formatting tests)
 - #68736 (Remove `Alloc` in favor of `AllocRef`)
 - #68740 (Do not suggest things named underscore)

Failed merges:

r? @ghost
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;