refactor: move collection types to crate::collections

Author: bavshin-f5

examples/shared_dict.rs

@@ -10,9 +10,8 @@ use nginx_sys::{
     NGX_HTTP_MAIN_CONF, NGX_HTTP_MAIN_CONF_OFFSET, NGX_HTTP_MODULE, NGX_HTTP_VAR_CHANGEABLE,
     NGX_HTTP_VAR_NOCACHEABLE, NGX_LOG_EMERG,
 };
-use ngx::core::{
-    NgxStr, NgxString, Pool, RbTreeMap, SlabPool, Status, NGX_CONF_ERROR, NGX_CONF_OK,
-};
+use ngx::collections::RbTreeMap;
+use ngx::core::{NgxStr, NgxString, Pool, SlabPool, Status, NGX_CONF_ERROR, NGX_CONF_OK};
 use ngx::http::{HttpModule, HttpModuleMainConf};
 use ngx::{ngx_conf_log_error, ngx_log_debug, ngx_string};
 

src/allocator.rs

@@ -14,7 +14,7 @@ use ::core::ptr::{self, NonNull};
 pub use allocator_api2::alloc::{AllocError, Allocator, Global};
 
 #[cfg(feature = "alloc")]
-pub use allocator_api2::{boxed, collections, vec};
+pub use allocator_api2::boxed;
 
 /// Explicitly duplicate an object using the specified Allocator.
 pub trait TryCloneIn: Sized {

src/collections/mod.rs

@@ -0,0 +1,15 @@
+//! Collection types.
+//!
+//! This module provides common collection types, mostly implemented as wrappers over the
+//! corresponding NGINX types.
+
+#[cfg(feature = "alloc")]
+pub use allocator_api2::{
+    collections::{TryReserveError, TryReserveErrorKind},
+    vec, // reexport both the module and the macro
+    vec::Vec,
+};
+
+pub use rbtree::RbTreeMap;
+
+pub mod rbtree;

src/core/rbtree.rs renamed to src/collections/rbtree.rs

@@ -1,13 +1,11 @@
 mod buffer;
 mod pool;
-pub mod rbtree;
 pub mod slab;
 mod status;
 mod string;
 
 pub use buffer::*;
 pub use pool::*;
-pub use rbtree::RbTreeMap;
 pub use slab::SlabPool;
 pub use status::*;
 pub use string::*;

src/core/mod.rs

@@ -207,9 +207,8 @@ mod _alloc {
 
     use super::*;
 
-    use crate::allocator::collections::TryReserveError;
-    use crate::allocator::vec::Vec;
     use crate::allocator::{self, Allocator};
+    use crate::collections::{TryReserveError, Vec};
 
     /// Owned byte string type with Allocator support.
     ///

src/core/string.rs

@@ -43,6 +43,7 @@ extern crate std;
 pub mod allocator;
 #[cfg(feature = "async")]
 pub mod async_;
+pub mod collections;
 
 /// The core module.
 ///