fix no_global_oom_handling

Author: pitaj

library/alloc/src/boxed.rs

@@ -2014,6 +2014,7 @@ impl<I> FromIterator<I> for Box<[I]> {
     }
 }
 
+#[cfg(not(no_global_oom_handling))]
 #[stable(feature = "box_slice_clone", since = "1.3.0")]
 impl<T: Clone, A: Allocator<Result<Self, TryReserveError> = Self> + Clone> Clone for Box<[T], A> {
     fn clone(&self) -> Self {

library/alloc/src/falloc.rs

@@ -60,15 +60,25 @@ pub use crate::alloc::{AllocError, Global, GlobalAlloc, Layout, LayoutError};
 /// [*currently allocated*]: #currently-allocated-memory
 #[unstable(feature = "allocator_api", issue = "32838")]
 pub unsafe trait Allocator: crate::alloc::Allocator {
+    #[cfg(not(no_global_oom_handling))]
     #[must_use] // Doesn't actually work
-    type Result<T, E>
+    type Result<T, E: Error>
     where
-        E: Error + IntoLayout;
+        E: IntoLayout;
 
+    #[cfg(not(no_global_oom_handling))]
     #[must_use]
-    fn map_result<T, E>(result: Result<T, E>) -> Self::Result<T, E>
+    fn map_result<T, E: Error>(result: Result<T, E>) -> Self::Result<T, E>
     where
-        E: Error + IntoLayout;
+        E: IntoLayout;
+
+    #[cfg(no_global_oom_handling)]
+    #[must_use] // Doesn't actually work
+    type Result<T, E: Error>;
+
+    #[cfg(no_global_oom_handling)]
+    #[must_use]
+    fn map_result<T, E: Error>(result: Result<T, E>) -> Self::Result<T, E>;
 }
 
 #[cfg(not(no_global_oom_handling))]
@@ -84,15 +94,15 @@ pub(crate) fn capacity_overflow() -> ! {
     panic!("capacity overflow");
 }
 
+#[cfg(not(no_global_oom_handling))]
 #[unstable(feature = "allocator_api", issue = "32838")]
 pub trait IntoLayout {
-    #[cfg(not(no_global_oom_handling))]
     fn into_layout(self) -> Layout;
 }
 
+#[cfg(not(no_global_oom_handling))]
 #[unstable(feature = "allocator_api", issue = "32838")]
 impl IntoLayout for TryReserveError {
-    #[cfg(not(no_global_oom_handling))]
     fn into_layout(self) -> Layout {
         match self.kind() {
             TryReserveErrorKind::CapacityOverflow => capacity_overflow(),
@@ -104,14 +114,24 @@ impl IntoLayout for TryReserveError {
 #[unstable(feature = "allocator_api", issue = "32838")]
 #[cfg(not(no_global_oom_handling))]
 unsafe impl<X: crate::alloc::Allocator> Allocator for X {
-    type Result<T, E> = T
+    type Result<T, E: Error> = T
     where
-        E: Error + IntoLayout;
+        E: IntoLayout;
 
-    fn map_result<T, E>(result: Result<T, E>) -> Self::Result<T, E>
+    fn map_result<T, E: Error>(result: Result<T, E>) -> Self::Result<T, E>
     where
-        E: Error + IntoLayout,
+        E: IntoLayout,
     {
         result.unwrap_or_else(|error| handle_alloc_error(error.into_layout()))
     }
 }
+
+#[unstable(feature = "allocator_api", issue = "32838")]
+#[cfg(no_global_oom_handling)]
+unsafe impl<X: crate::alloc::Allocator> Allocator for X {
+    type Result<T, E: Error> = Result<T, E>;
+
+    fn map_result<T, E: Error>(result: Result<T, E>) -> Self::Result<T, E> {
+        result
+    }
+}

library/alloc/src/vec/mod.rs

@@ -53,7 +53,6 @@
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-#[cfg(not(no_global_oom_handling))]
 use core::cmp;
 use core::cmp::Ordering;
 use core::fmt;
@@ -111,10 +110,8 @@ use self::spec_from_elem::SpecFromElem;
 
 mod spec_from_elem;
 
-#[cfg(not(no_global_oom_handling))]
 use self::set_len_on_drop::SetLenOnDrop;
 
-#[cfg(not(no_global_oom_handling))]
 mod set_len_on_drop;
 
 #[cfg(not(no_global_oom_handling))]