New alloc org

src/allocator/boxed.rs

@@ -0,0 +1,4 @@
+#[cfg(not(feature = "allocator-api2"))]
+pub use alloc::boxed::Box;
+#[cfg(feature = "allocator-api2")]
+pub use allocator_api2::boxed::Box;

src/allocator/global.rs

@@ -0,0 +1,7 @@
+#[cfg(not(feature = "allocator-api"))]
+#[derive(Clone)]
+pub struct Global;
+#[cfg(all(feature = "allocator-api", not(feature = "allocator-api2")))]
+pub use alloc::alloc::Global;
+#[cfg(feature = "allocator-api2")]
+pub use allocator_api2::alloc::Global;

src/allocator/base.rs → src/allocator/implementations/base.rs

@@ -1,5 +1,8 @@
 use {
-    super::Allocator,
+    super::super::{
+        Allocator,
+        global::Global
+    },
     alloc::alloc::{
         alloc,
         dealloc,
@@ -11,9 +14,6 @@ use {
     }
 };
 
-#[derive(Clone)]
-pub struct Global;
-
 impl Allocator for Global {
     #[inline]
     fn allocate(&self, layout: Layout) -> Option<NonNull<[u8]>> {

src/allocator/external.rs → src/allocator/implementations/external.rs

@@ -1,5 +1,5 @@
 use {
-    super::Allocator,
+    super::super::Allocator,
     allocator_api2::alloc::Allocator as External,
     core::{
         alloc::Layout,

src/allocator/implementations/mod.rs

@@ -0,0 +1,6 @@
+#[cfg(not(feature = "allocator-api"))]
+mod base;
+#[cfg(feature = "allocator-api2")]
+mod external;
+#[cfg(all(feature = "allocator-api", not(feature = "allocator-api2")))]
+mod native;

src/allocator/native.rs → src/allocator/implementations/native.rs

@@ -1,5 +1,5 @@
 use {
-    super::Allocator,
+    super::super::Allocator,
     alloc::alloc::Allocator as Native,
     core::{
         alloc::Layout,

src/allocator/mod.rs

@@ -1,43 +1,14 @@
-#[cfg(not(feature = "allocator-api"))]
-mod base;
-#[cfg(feature = "allocator-api2")]
-mod external;
-#[cfg(all(feature = "allocator-api", not(feature = "allocator-api2")))]
-mod native;
+pub mod boxed;
+pub mod global;
+mod implementations;
 pub mod proxy;
+pub mod vec;
 
 use core::{
     alloc::Layout,
     ptr::NonNull
 };
 
-#[cfg(not(feature = "allocator-api"))]
-#[rustfmt::skip]
-pub use {
-    alloc::{
-        boxed::Box,
-        vec::Vec,
-        vec
-    },
-    base::Global
-};
-#[cfg(feature = "allocator-api2")]
-#[rustfmt::skip]
-pub use allocator_api2::{
-    alloc::Global,
-    boxed::Box,
-    vec::Vec,
-    vec
-};
-#[cfg(all(feature = "allocator-api", not(feature = "allocator-api2")))]
-#[rustfmt::skip]
-pub use alloc::{
-    alloc::Global,
-    boxed::Box,
-    vec::Vec,
-    vec
-};
-
 pub trait Allocator {
     fn allocate(&self, layout: Layout) -> Option<NonNull<[u8]>>;
     unsafe fn deallocate(&self, pointer: NonNull<u8>, layout: Layout);

src/allocator/vec.rs

@@ -0,0 +1,13 @@
+#[cfg(not(feature = "allocator-api2"))]
+#[rustfmt::skip]
+pub use alloc::{
+    vec,
+    vec::Vec
+};
+
+#[cfg(feature = "allocator-api2")]
+#[rustfmt::skip]
+pub use allocator_api2::{
+    vec,
+    vec::Vec
+};

src/iterators/mod.rs

@@ -1,7 +1,6 @@
 pub mod drain;
 pub mod extractif;
 pub mod intoiter;
-pub mod splice;
-
 #[cfg(feature = "rayon")]
 mod rayon;
+pub mod splice;

src/lib.rs

@@ -58,10 +58,12 @@ use std::io;
 use {
     allocator::{
         Allocator,
-        Box,
-        Global,
-        Vec,
-        vec
+        boxed::Box,
+        global::Global,
+        vec::{
+            Vec,
+            vec
+        }
     },
     core::{
         alloc::Layout,