diff options
| author | bors <bors@rust-lang.org> | 2020-07-17 03:51:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-17 03:51:35 +0000 |
| commit | 86c0b85da98a3c69e0fc9014e36e1c88bd3ae8d7 (patch) | |
| tree | c3752892cdc43bf31324ebea11371fa503981bd4 /src/libcore/ptr | |
| parent | 8534be72fc3b9c5f2f2dc4e4ee7b651a008e9a3e (diff) | |
| parent | 8321b3fbe44b1edc9b6d012daeaf46ae2b6bc3c8 (diff) | |
Auto merge of #74395 - Mark-Simulacrum:stage0-next, r=pietroalbini
Bump version to 1.47 This also bumps to a more recent rustfmt version, just to keep us relatively up to date (though almost nothing has changed in rustfmt we use beyond bumps to the parser infra). No formatting changes as a result of this. r? @pietroalbini
Diffstat (limited to 'src/libcore/ptr')
| -rw-r--r-- | src/libcore/ptr/const_ptr.rs | 2 | ||||
| -rw-r--r-- | src/libcore/ptr/mut_ptr.rs | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/libcore/ptr/const_ptr.rs b/src/libcore/ptr/const_ptr.rs index 39d4aca636a..896ad740e1e 100644 --- a/src/libcore/ptr/const_ptr.rs +++ b/src/libcore/ptr/const_ptr.rs @@ -324,7 +324,6 @@ impl<T: ?Sized> *const T { #[unstable(feature = "const_raw_ptr_comparison", issue = "53020")] #[rustc_const_unstable(feature = "const_raw_ptr_comparison", issue = "53020")] #[inline] - #[cfg(not(bootstrap))] pub const fn guaranteed_eq(self, other: *const T) -> bool where T: Sized, @@ -356,7 +355,6 @@ impl<T: ?Sized> *const T { #[unstable(feature = "const_raw_ptr_comparison", issue = "53020")] #[rustc_const_unstable(feature = "const_raw_ptr_comparison", issue = "53020")] #[inline] - #[cfg(not(bootstrap))] pub const fn guaranteed_ne(self, other: *const T) -> bool where T: Sized, diff --git a/src/libcore/ptr/mut_ptr.rs b/src/libcore/ptr/mut_ptr.rs index 644465d7d17..96856e7512c 100644 --- a/src/libcore/ptr/mut_ptr.rs +++ b/src/libcore/ptr/mut_ptr.rs @@ -305,7 +305,6 @@ impl<T: ?Sized> *mut T { #[unstable(feature = "const_raw_ptr_comparison", issue = "53020")] #[rustc_const_unstable(feature = "const_raw_ptr_comparison", issue = "53020")] #[inline] - #[cfg(not(bootstrap))] pub const fn guaranteed_eq(self, other: *mut T) -> bool where T: Sized, @@ -337,7 +336,6 @@ impl<T: ?Sized> *mut T { #[unstable(feature = "const_raw_ptr_comparison", issue = "53020")] #[rustc_const_unstable(feature = "const_raw_ptr_comparison", issue = "53020")] #[inline] - #[cfg(not(bootstrap))] pub const unsafe fn guaranteed_ne(self, other: *mut T) -> bool where T: Sized, |