about summary refs log tree commit diff
path: root/src/libcore/ptr.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-04-29 20:38:15 +0000
committerbors <bors@rust-lang.org>2017-04-29 20:38:15 +0000
commitafa1240e57330d85a372db4e28cd8bc8fa528ccb (patch)
tree196d279b28389512c66dd2facdf615604ac51d1f /src/libcore/ptr.rs
parentb4d3ed64ec7f6d7a9fa0530377a29520a90a451f (diff)
parent5daf557a77391f14a26038d7ab70d424cfe5b040 (diff)
downloadrust-afa1240e57330d85a372db4e28cd8bc8fa528ccb.tar.gz
rust-afa1240e57330d85a372db4e28cd8bc8fa528ccb.zip
Auto merge of #41544 - alexcrichton:bump-bootstrap, r=brson
Update stage0 bootstrap compiler

We've got a freshly minted beta compiler, let's update to use that on nightly!
This has a few other changes associated with it as well

* A bump to the rustc version number (to 1.19.0)
* Movement of the `cargo` and `rls` submodules to their "proper" location in
  `src/tools/{cargo,rls}`. Now that Cargo workspaces support the `exclude`
  option this can work.
* Updates of the `cargo` and `rls` submodules to their master branches.
* Tweak to the `src/stage0.txt` format to be more amenable for Cargo version
  numbers. On the beta channel Cargo will bootstrap from a different version
  than rustc (e.g. the version numbers are different), so we need different
  configuration for this.
* Addition of `dev` as a readable key in the `src/stage0.txt` format. If present
  then stage0 compilers are downloaded from `dev-static.rust-lang.org` instead
  of `static.rust-lang.org`. This is added to accomodate our updated release
  process with Travis and AppVeyor.
Diffstat (limited to 'src/libcore/ptr.rs')
-rw-r--r--src/libcore/ptr.rs5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
index 04480fc5d31..115326bb916 100644
--- a/src/libcore/ptr.rs
+++ b/src/libcore/ptr.rs
@@ -37,11 +37,6 @@ pub use intrinsics::copy;
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use intrinsics::write_bytes;
 
-#[cfg(stage0)]
-#[stable(feature = "drop_in_place", since = "1.8.0")]
-pub use intrinsics::drop_in_place;
-
-#[cfg(not(stage0))]
 /// Executes the destructor (if any) of the pointed-to value.
 ///
 /// This has two use cases: