about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-04-06 13:44:51 -0700
committerbors <bors@rust-lang.org>2016-04-06 13:44:51 -0700
commitbf5da36f1dfae45941ec39ef67a41fdbd22c1a50 (patch)
treec019fe043d842df6d5e19c131d304cb541f7e7a8 /src/libcore
parent943ec3bdfc9ba28e94b6d00a2b53fb2cd8b21655 (diff)
parent862ae9aa75b073f4d753aa8275fb139ab9729d74 (diff)
downloadrust-bf5da36f1dfae45941ec39ef67a41fdbd22c1a50.tar.gz
rust-bf5da36f1dfae45941ec39ef67a41fdbd22c1a50.zip
Auto merge of #32778 - steveklabnik:rollup, r=steveklabnik
Rollup of 12 pull requests

- Successful merges: #31762, #32538, #32634, #32668, #32679, #32691, #32724, #32727, #32744, #32761, #32766, #32774
- Failed merges:
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/ptr.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
index 37e9d18095f..42aef3ab3dd 100644
--- a/src/libcore/ptr.rs
+++ b/src/libcore/ptr.rs
@@ -220,7 +220,7 @@ impl<T: ?Sized> *const T {
     /// ```
     /// let s: &str = "Follow the rabbit";
     /// let ptr: *const u8 = s.as_ptr();
-    /// assert!(ptr.is_null() == false);
+    /// assert!(!ptr.is_null());
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
@@ -306,7 +306,7 @@ impl<T: ?Sized> *mut T {
     /// ```
     /// let mut s = [1, 2, 3];
     /// let ptr: *mut u32 = s.as_mut_ptr();
-    /// assert!(ptr.is_null() == false);
+    /// assert!(!ptr.is_null());
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]