diff options
| author | the8472 <the8472@users.noreply.github.com> | 2021-09-22 19:03:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-22 19:03:20 +0200 |
| commit | 00635511dbc093ae4e4a494c1d54f17397c107b4 (patch) | |
| tree | dadac0c66c56192812ac3ecd7a4e05385ec2e7ce | |
| parent | cfff31bc833070a00578bd6178160aeed56f28ba (diff) | |
| parent | be5a5b70b48ce6d9111bea36a11c9c8827960251 (diff) | |
| download | rust-00635511dbc093ae4e4a494c1d54f17397c107b4.tar.gz rust-00635511dbc093ae4e4a494c1d54f17397c107b4.zip | |
Rollup merge of #89036 - nbdd0121:alloc, r=yaahc
Fix missing `no_global_oom_handling` cfg-gating Cfg-gate these trait impls that are neglected. These functions compile now because they use `box` syntax which depends on `exchange_malloc` during codegen only; as a result they compiles with cfg `no_global_oom_handling` but shouldn't. Discovered in #89030 because that PR makes `box` syntax depend on `exchange_malloc` lang item during MIR construction.
| -rw-r--r-- | library/alloc/src/boxed.rs | 2 | ||||
| -rw-r--r-- | library/alloc/src/vec/mod.rs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/library/alloc/src/boxed.rs b/library/alloc/src/boxed.rs index 72216852376..2b3a18a439f 100644 --- a/library/alloc/src/boxed.rs +++ b/library/alloc/src/boxed.rs @@ -1086,6 +1086,7 @@ unsafe impl<#[may_dangle] T: ?Sized, A: Allocator> Drop for Box<T, A> { } } +#[cfg(not(no_global_oom_handling))] #[stable(feature = "rust1", since = "1.0.0")] impl<T: Default> Default for Box<T> { /// Creates a `Box<T>`, with the `Default` value for T. @@ -1394,6 +1395,7 @@ impl<A: Allocator> From<Box<str, A>> for Box<[u8], A> { } } +#[cfg(not(no_global_oom_handling))] #[stable(feature = "box_from_array", since = "1.45.0")] impl<T, const N: usize> From<[T; N]> for Box<[T]> { /// Converts a `[T; N]` into a `Box<[T]>` diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs index 87a0d371815..2f6887229e7 100644 --- a/library/alloc/src/vec/mod.rs +++ b/library/alloc/src/vec/mod.rs @@ -2841,6 +2841,7 @@ impl<T: Clone> From<&mut [T]> for Vec<T> { } } +#[cfg(not(no_global_oom_handling))] #[stable(feature = "vec_from_array", since = "1.44.0")] impl<T, const N: usize> From<[T; N]> for Vec<T> { #[cfg(not(test))] |
