Merge pull request torvalds#501 from AltF02/try_pin

rust: add `try_pin` under `no_global_oom_handling`
sodar · Sep 28, 2021 · f104b42 · f104b42
2 parents 335d42e + 13c31e6
commit f104b42
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/rust/alloc/sync.rs b/rust/alloc/sync.rs
@@ -21,7 +21,6 @@ use core::marker::{PhantomData, Unpin, Unsize};
 use core::mem::size_of_val;
 use core::mem::{self, align_of_val_raw};
 use core::ops::{CoerceUnsized, Deref, DispatchFromDyn, Receiver};
-#[cfg(not(no_global_oom_handling))]
 use core::pin::Pin;
 use core::ptr::{self, NonNull};
 #[cfg(not(no_global_oom_handling))]
@@ -497,7 +496,6 @@ impl<T> Arc<T> {
     }
 
     /// Constructs a new `Pin<Arc<T>>`, return an error if allocation fails.
-    #[cfg(not(no_global_oom_handling))]
     #[unstable(feature = "allocator_api", issue = "32838")]
     #[inline]
     pub fn try_pin(data: T) -> Result<Pin<Arc<T>>, AllocError> {