Skip to content

Commit

Permalink
Rollup merge of rust-lang#68736 - TimDiekmann:remove-alloc, r=Amanieu
Browse files Browse the repository at this point in the history
Remove `Alloc` in favor of `AllocRef`

`AllocRef` was reexported as `Alloc` in rust-lang#68529  in order to not break toolstate in the week before the next stable release.

r? @Amanieu
  • Loading branch information
JohnTitor committed Feb 1, 2020
2 parents 1529126 + 8bbaeb7 commit c7332ab
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions src/libcore/alloc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

0 comments on commit c7332ab

Please sign in to comment.