diff options
| author | Jonathan Turner <jonathandturner@users.noreply.github.com> | 2016-09-28 20:21:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-28 20:21:52 -0700 |
| commit | 02c050644bf2361dad41557b2972d6bf84604e74 (patch) | |
| tree | 4cd05071a4d498466dd7ad0161037293a050396f /src/libcore | |
| parent | 47a335b67711d7a5cdcf7b6c2469a5adc597a54e (diff) | |
| parent | 3b49c60ab71547e6dbaef086eb4cd2bb7fe9ff94 (diff) | |
| download | rust-02c050644bf2361dad41557b2972d6bf84604e74.tar.gz rust-02c050644bf2361dad41557b2972d6bf84604e74.zip | |
Rollup merge of #36811 - brson:bootstrap, r=alexcrichton
Update bootstrap compiler
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/clone.rs | 7 | ||||
| -rw-r--r-- | src/libcore/intrinsics.rs | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/libcore/clone.rs b/src/libcore/clone.rs index 0b800cacfc1..d72b18ae345 100644 --- a/src/libcore/clone.rs +++ b/src/libcore/clone.rs @@ -129,13 +129,6 @@ pub struct AssertParamIsClone<T: Clone + ?Sized> { _field: ::marker::PhantomData reason = "deriving hack, should not be public", issue = "0")] pub struct AssertParamIsCopy<T: Copy + ?Sized> { _field: ::marker::PhantomData<T> } -#[cfg(stage0)] -#[doc(hidden)] -#[inline(always)] -#[unstable(feature = "derive_clone_copy", - reason = "deriving hack, should not be public", - issue = "0")] -pub fn assert_receiver_is_clone<T: Clone + ?Sized>(_: &T) {} #[stable(feature = "rust1", since = "1.0.0")] impl<'a, T: ?Sized> Clone for &'a T { diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs index 6c4da2a8851..e844a158484 100644 --- a/src/libcore/intrinsics.rs +++ b/src/libcore/intrinsics.rs @@ -194,14 +194,12 @@ extern "rust-intrinsic" { /// own, or if it does not enable any significant optimizations. pub fn assume(b: bool); - #[cfg(not(stage0))] /// Hints to the compiler that branch condition is likely to be true. /// Returns the value passed to it. /// /// Any use other than with `if` statements will probably not have an effect. pub fn likely(b: bool) -> bool; - #[cfg(not(stage0))] /// Hints to the compiler that branch condition is likely to be false. /// Returns the value passed to it. /// |