refactor IntoLayout to HandleAllocError

Author: pitaj

library/alloc/src/alloc.rs

@@ -16,7 +16,7 @@ use core::ptr::{self, NonNull};
 pub use crate::falloc::{Allocator, FallibleAdapter};
 #[unstable(feature = "allocator_api", issue = "32838")]
 #[cfg(not(no_global_oom_handling))]
-pub use crate::falloc::{InfallibleAdapter, IntoLayout};
+pub use crate::falloc::{HandleAllocError, InfallibleAdapter};
 #[stable(feature = "alloc_module", since = "1.28.0")]
 #[doc(inline)]
 #[allow(deprecated)]
@@ -333,14 +333,14 @@ unsafe impl Allocator for Global {
     #[cfg(not(no_global_oom_handling))]
     type Result<T, E: Error> = T
     where
-        E: IntoLayout;
+        E: HandleAllocError;
 
     #[cfg(not(no_global_oom_handling))]
     fn map_result<T, E: Error>(result: Result<T, E>) -> Self::Result<T, E>
     where
-        E: IntoLayout,
+        E: HandleAllocError,
     {
-        result.unwrap_or_else(|e| handle_alloc_error(e.into_layout()))
+        result.unwrap_or_else(|e| e.handle_alloc_error())
     }
 
     #[cfg(no_global_oom_handling)]

library/alloc/src/falloc.rs

@@ -328,7 +328,7 @@ pub unsafe trait Allocator {
     #[must_use] // Doesn't actually work
     type Result<T, E: Error>
     where
-        E: IntoLayout;
+        E: HandleAllocError;
 
     /// Function to map allocation results into `Self::Result`.
     ///
@@ -338,7 +338,7 @@ pub unsafe trait Allocator {
     #[must_use]
     fn map_result<T, E: Error>(result: Result<T, E>) -> Self::Result<T, E>
     where
-        E: IntoLayout;
+        E: HandleAllocError;
 
     /// Result type returned by functions that are conditionally fallible.
     ///
@@ -414,12 +414,12 @@ where
     #[cfg(not(no_global_oom_handling))]
     type Result<T, E: Error> = A::Result<T, E>
     where
-        E: IntoLayout;
+        E: HandleAllocError;
 
     #[cfg(not(no_global_oom_handling))]
     fn map_result<T, E: Error>(result: Result<T, E>) -> Self::Result<T, E>
     where
-        E: IntoLayout,
+        E: HandleAllocError,
     {
         A::map_result(result)
     }
@@ -445,22 +445,22 @@ pub(crate) fn capacity_overflow() -> ! {
     panic!("capacity overflow");
 }
 
-/// Trait for converting an error into a `Layout` struct,
-/// used for passing the layout to [`handle_alloc_error`].
+/// Trait for handling alloc errors for allocators which
+/// panic or abort instead of returning errors.
 #[cfg(not(no_global_oom_handling))]
 #[unstable(feature = "allocator_api", issue = "32838")]
-pub trait IntoLayout {
-    /// Convert into a `Layout` struct.
-    fn into_layout(self) -> Layout;
+pub trait HandleAllocError {
+    /// Globally handle this allocation error, using [`handle_alloc_error`]
+    fn handle_alloc_error(self) -> !;
 }
 
 #[cfg(not(no_global_oom_handling))]
 #[unstable(feature = "allocator_api", issue = "32838")]
-impl IntoLayout for TryReserveError {
-    fn into_layout(self) -> Layout {
+impl HandleAllocError for TryReserveError {
+    fn handle_alloc_error(self) -> ! {
         match self.kind() {
             TryReserveErrorKind::CapacityOverflow => capacity_overflow(),
-            TryReserveErrorKind::AllocError { layout, .. } => layout,
+            TryReserveErrorKind::AllocError { layout, .. } => handle_alloc_error(layout),
         }
     }
 }
@@ -535,13 +535,13 @@ where
 
     type Result<T, E: Error> = T
     where
-        E: IntoLayout;
+        E: HandleAllocError;
 
     fn map_result<T, E: Error>(result: Result<T, E>) -> Self::Result<T, E>
     where
-        E: IntoLayout,
+        E: HandleAllocError,
     {
-        result.unwrap_or_else(|e| handle_alloc_error(e.into_layout()))
+        result.unwrap_or_else(|e| e.handle_alloc_error())
     }
 }
 
@@ -624,12 +624,12 @@ where
     #[cfg(not(no_global_oom_handling))]
     type Result<T, E: Error> = Result<T, E>
     where
-        E: IntoLayout;
+        E: HandleAllocError;
 
     #[cfg(not(no_global_oom_handling))]
     fn map_result<T, E: Error>(result: Result<T, E>) -> Self::Result<T, E>
     where
-        E: IntoLayout,
+        E: HandleAllocError,
     {
         result
     }

library/std/src/alloc.rs

@@ -287,13 +287,13 @@ unsafe impl Allocator for System {
 
     type Result<T, E: core::error::Error> = T
     where
-        E: IntoLayout;
+        E: HandleAllocError;
 
     fn map_result<T, E: core::error::Error>(result: Result<T, E>) -> Self::Result<T, E>
     where
-        E: IntoLayout,
+        E: HandleAllocError,
     {
-        result.unwrap_or_else(|e| handle_alloc_error(e.into_layout()))
+        result.unwrap_or_else(|e| e.handle_alloc_error())
     }
 }