conflicts merged

danielhumanmod · Nov 19, 2024 · 78d7894 · 78d7894
2 parents 7b7ec2f + a27cf5e
commit 78d7894
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/library/core/src/ptr/non_null.rs b/library/core/src/ptr/non_null.rs
@@ -309,7 +309,6 @@ impl<T: ?Sized> NonNull<T> {
     #[must_use]
     #[inline]
     #[stable(feature = "strict_provenance", since = "CURRENT_RUSTC_VERSION")]
-   // #[requires(addr.get() != 0)]
     #[ensures(|result: &Self| 
         !result.as_ptr().is_null() &&
         result.addr() == addr )]