bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

alloc: no_global_oom_handling: disable new()s, pin()s, etc.

Browse source 
They are infallible, and could not be actually used because
they will trigger an error when monomorphized, but it is better
to just remove them.

Link: https://github.com/Rust-for-Linux/linux/pull/402
Suggested-by: Gary Guo <gary@garyguo.net>
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
This commit is contained in:
Miguel Ojeda 2021-07-02 14:55:20 +02:00
parent f9fa13f705
commit 7775dffbc0
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
library/alloc/src/rc.rs
View file

@ -262,6 +262,7 @@ use core::marker::{self, PhantomData, Unpin, Unsize};
use core::mem::size_of_val; use core::mem::size_of_val;
use core::mem::{self, align_of_val_raw, forget}; use core::mem::{self, align_of_val_raw, forget};
use core::ops::{CoerceUnsized, Deref, DispatchFromDyn, Receiver}; use core::ops::{CoerceUnsized, Deref, DispatchFromDyn, Receiver};
#[cfg(not(no_global_oom_handling))]
use core::pin::Pin; use core::pin::Pin;
use core::ptr::{self, NonNull}; use core::ptr::{self, NonNull};
#[cfg(not(no_global_oom_handling))] #[cfg(not(no_global_oom_handling))]
@ -346,6 +347,7 @@ impl<T> Rc<T> {
/// ///
/// let five = Rc::new(5); /// let five = Rc::new(5);
/// ``` /// ```
#[cfg(not(no_global_oom_handling))]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn new(value: T) -> Rc<T> { pub fn new(value: T) -> Rc<T> {
// There is an implicit weak pointer owned by all the strong // There is an implicit weak pointer owned by all the strong
@ -381,6 +383,7 @@ impl<T> Rc<T> {
/// } /// }
/// } /// }
/// ``` /// ```
#[cfg(not(no_global_oom_handling))]
#[unstable(feature = "arc_new_cyclic", issue = "75861")] #[unstable(feature = "arc_new_cyclic", issue = "75861")]
pub fn new_cyclic(data_fn: impl FnOnce(&Weak<T>) -> T) -> Rc<T> { pub fn new_cyclic(data_fn: impl FnOnce(&Weak<T>) -> T) -> Rc<T> {
// Construct the inner in the "uninitialized" state with a single // Construct the inner in the "uninitialized" state with a single
@ -577,6 +580,7 @@ impl<T> Rc<T> {
} }
/// Constructs a new `Pin<Rc<T>>`. If `T` does not implement `Unpin`, then /// Constructs a new `Pin<Rc<T>>`. If `T` does not implement `Unpin`, then
/// `value` will be pinned in memory and unable to be moved. /// `value` will be pinned in memory and unable to be moved.
#[cfg(not(no_global_oom_handling))]
#[stable(feature = "pin", since = "1.33.0")] #[stable(feature = "pin", since = "1.33.0")]
pub fn pin(value: T) -> Pin<Rc<T>> { pub fn pin(value: T) -> Pin<Rc<T>> {
unsafe { Pin::new_unchecked(Rc::new(value)) } unsafe { Pin::new_unchecked(Rc::new(value)) }
@ -1473,6 +1477,7 @@ impl<T: ?Sized> Clone for Rc<T> {
} }
} }
#[cfg(not(no_global_oom_handling))]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<T: Default> Default for Rc<T> { impl<T: Default> Default for Rc<T> {
/// Creates a new `Rc<T>`, with the `Default` value for `T`. /// Creates a new `Rc<T>`, with the `Default` value for `T`.
@ -1731,6 +1736,7 @@ impl<T: ?Sized> fmt::Pointer for Rc<T> {
} }
} }
#[cfg(not(no_global_oom_handling))]
#[stable(feature = "from_for_ptrs", since = "1.6.0")] #[stable(feature = "from_for_ptrs", since = "1.6.0")]
impl<T> From<T> for Rc<T> { impl<T> From<T> for Rc<T> {
/// Converts a generic type `T` into a `Rc<T>` /// Converts a generic type `T` into a `Rc<T>`

6
library/alloc/src/sync.rs
View file

@ -19,6 +19,7 @@ use core::marker::{PhantomData, Unpin, Unsize};
use core::mem::size_of_val; use core::mem::size_of_val;
use core::mem::{self, align_of_val_raw}; use core::mem::{self, align_of_val_raw};
use core::ops::{CoerceUnsized, Deref, DispatchFromDyn, Receiver}; use core::ops::{CoerceUnsized, Deref, DispatchFromDyn, Receiver};
#[cfg(not(no_global_oom_handling))]
use core::pin::Pin; use core::pin::Pin;
use core::ptr::{self, NonNull}; use core::ptr::{self, NonNull};
#[cfg(not(no_global_oom_handling))] #[cfg(not(no_global_oom_handling))]
@ -332,6 +333,7 @@ impl<T> Arc<T> {
/// ///
/// let five = Arc::new(5); /// let five = Arc::new(5);
/// ``` /// ```
#[cfg(not(no_global_oom_handling))]
#[inline] #[inline]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn new(data: T) -> Arc<T> { pub fn new(data: T) -> Arc<T> {
@ -365,6 +367,7 @@ impl<T> Arc<T> {
/// me: me.clone(), /// me: me.clone(),
/// }); /// });
/// ``` /// ```
#[cfg(not(no_global_oom_handling))]
#[inline] #[inline]
#[unstable(feature = "arc_new_cyclic", issue = "75861")] #[unstable(feature = "arc_new_cyclic", issue = "75861")]
pub fn new_cyclic(data_fn: impl FnOnce(&Weak<T>) -> T) -> Arc<T> { pub fn new_cyclic(data_fn: impl FnOnce(&Weak<T>) -> T) -> Arc<T> {
@ -485,6 +488,7 @@ impl<T> Arc<T> {
/// Constructs a new `Pin<Arc<T>>`. If `T` does not implement `Unpin`, then /// Constructs a new `Pin<Arc<T>>`. If `T` does not implement `Unpin`, then
/// `data` will be pinned in memory and unable to be moved. /// `data` will be pinned in memory and unable to be moved.
#[cfg(not(no_global_oom_handling))]
#[stable(feature = "pin", since = "1.33.0")] #[stable(feature = "pin", since = "1.33.0")]
pub fn pin(data: T) -> Pin<Arc<T>> { pub fn pin(data: T) -> Pin<Arc<T>> {
unsafe { Pin::new_unchecked(Arc::new(data)) } unsafe { Pin::new_unchecked(Arc::new(data)) }
@ -2274,6 +2278,7 @@ impl<T: ?Sized> fmt::Pointer for Arc<T> {
} }
} }
#[cfg(not(no_global_oom_handling))]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<T: Default> Default for Arc<T> { impl<T: Default> Default for Arc<T> {
/// Creates a new `Arc<T>`, with the `Default` value for `T`. /// Creates a new `Arc<T>`, with the `Default` value for `T`.
@ -2298,6 +2303,7 @@ impl<T: ?Sized + Hash> Hash for Arc<T> {
} }
} }
#[cfg(not(no_global_oom_handling))]
#[stable(feature = "from_for_ptrs", since = "1.6.0")] #[stable(feature = "from_for_ptrs", since = "1.6.0")]
impl<T> From<T> for Arc<T> { impl<T> From<T> for Arc<T> {
/// Converts a `T` into an `Arc<T>` /// Converts a `T` into an `Arc<T>`