Merge pull request #1343 from YBoy-git/collection_tools_no_std_fix

READY : (collection_tools) : no_std fix

module/core/collection_tools/Readme.md

@@ -120,7 +120,7 @@ While strict macros require you to have all members of the same type, more relax
 
 For example:
 ```rust
-# #[ cfg( all( feature = "enabled", feature = "collection_into_constructors" ) ) ]
+# #[ cfg( all( feature = "enabled", feature = "collection_into_constructors", any( not( feature = "no_std" ), feature = "use_alloc" ) ) ) ]
 # {
 use std::borrow::Cow;
 let vec : Vec< String > = collection_tools::into_vec!( "&str", "String".to_string(), Cow::from( "Cow" ) );

module/core/collection_tools/src/lib.rs

@@ -4,6 +4,7 @@
 #![ doc( html_root_url = "https://docs.rs/collection_tools/latest/collection_tools/" ) ]
 #![ doc = include_str!( concat!( env!( "CARGO_MANIFEST_DIR" ), "/", "Readme.md" ) ) ]
 
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
 extern crate alloc;
 
 // qqq : make subdirectory for each container -- done
@@ -12,7 +13,10 @@ extern crate alloc;
 
 /// Module containing all collection macros
 #[ cfg( feature = "enabled" ) ]
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
 mod collections;
+#[ cfg( feature = "enabled" ) ]
+#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
 pub use collections::*;
 
 /// Namespace with dependencies.

module/core/collection_tools/tests/inc/bmap.rs

@@ -1,6 +1,5 @@
 use super::*;
 
-#[ cfg( any( feature = "use_alloc", not( feature = "no_std" ) ) ) ]
 #[ test ]
 fn reexport()
 {
@@ -13,8 +12,8 @@ fn reexport()
 
 }
 
-#[ test ]
 #[ cfg( feature = "collection_constructors" ) ]
+#[ test ]
 fn constructor()
 {
 
@@ -51,7 +50,6 @@ fn into_constructor()
 
 }
 
-#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
 #[ test ]
 fn iters()
 {

module/core/collection_tools/tests/inc/bset.rs

@@ -1,6 +1,5 @@
 use super::*;
 
-#[ cfg( any( feature = "use_alloc", not( feature = "no_std" ) ) ) ]
 #[ test ]
 fn reexport()
 {
@@ -12,8 +11,8 @@ fn reexport()
 
 }
 
-#[ test ]
 #[ cfg( feature = "collection_constructors" ) ]
+#[ test ]
 fn constructor()
 {
 
@@ -31,8 +30,8 @@ fn constructor()
 
 }
 
-#[ test ]
 #[ cfg( feature = "collection_into_constructors" ) ]
+#[ test ]
 fn into_constructor()
 {
 
@@ -50,7 +49,6 @@ fn into_constructor()
 
 }
 
-#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
 #[ test ]
 fn iters()
 {

module/core/collection_tools/tests/inc/heap.rs

@@ -1,6 +1,5 @@
 use super::*;
 
-#[ cfg( any( feature = "use_alloc", not( feature = "no_std" ) ) ) ]
 #[ test ]
 fn reexport()
 {
@@ -13,8 +12,8 @@ fn reexport()
 
 }
 
-#[ test ]
 #[ cfg( feature = "collection_constructors" ) ]
+#[ test ]
 fn constructor()
 {
 
@@ -32,8 +31,8 @@ fn constructor()
 
 }
 
-#[ test ]
 #[ cfg( feature = "collection_into_constructors" ) ]
+#[ test ]
 fn into_constructor()
 {
 
@@ -51,7 +50,6 @@ fn into_constructor()
 
 }
 
-#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
 #[ test ]
 fn iters()
 {

module/core/collection_tools/tests/inc/hmap.rs

@@ -1,6 +1,5 @@
 use super::*;
 
-#[ cfg( any( feature = "use_alloc", not( feature = "no_std" ) ) ) ]
 #[ test ]
 fn reexport()
 {
@@ -21,8 +20,8 @@ fn reexport()
 
 }
 
-#[ test ]
 #[ cfg( feature = "collection_constructors" ) ]
+#[ test ]
 fn constructor()
 {
 
@@ -41,8 +40,8 @@ fn constructor()
 
 }
 
-#[ test ]
 #[ cfg( feature = "collection_into_constructors" ) ]
+#[ test ]
 fn into_constructor()
 {
 
@@ -61,7 +60,6 @@ fn into_constructor()
 
 }
 
-#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
 #[ test ]
 fn iters()
 {

module/core/collection_tools/tests/inc/hset.rs

@@ -1,6 +1,5 @@
 use super::*;
 
-#[ cfg( any( feature = "use_alloc", not( feature = "no_std" ) ) ) ]
 #[ test ]
 fn reexport()
 {
@@ -19,8 +18,8 @@ fn reexport()
 
 }
 
-#[ test ]
 #[ cfg( feature = "collection_constructors" ) ]
+#[ test ]
 fn constructor()
 {
 
@@ -38,8 +37,8 @@ fn constructor()
 
 }
 
-#[ test ]
 #[ cfg( feature = "collection_into_constructors" ) ]
+#[ test ]
 fn into_constructor()
 {
 
@@ -57,7 +56,6 @@ fn into_constructor()
 
 }
 
-#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
 #[ test ]
 fn iters()
 {

module/core/collection_tools/tests/inc/list.rs

@@ -1,6 +1,5 @@
 use super::*;
 
-#[ cfg( any( feature = "use_alloc", not( feature = "no_std" ) ) ) ]
 #[ test ]
 fn reexport()
 {
@@ -12,8 +11,8 @@ fn reexport()
 
 }
 
-#[ test ]
 #[ cfg( feature = "collection_constructors" ) ]
+#[ test ]
 fn constructor()
 {
 
@@ -50,7 +49,6 @@ fn into_constructor()
 
 }
 
-#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
 #[ test ]
 fn iters()
 {

module/core/collection_tools/tests/inc/vec.rs

@@ -1,6 +1,5 @@
 use super::*;
 
-#[ cfg( any( feature = "use_alloc", not( feature = "no_std" ) ) ) ]
 #[ test ]
 fn reexport()
 {
@@ -64,7 +63,6 @@ fn into_constructor()
 }
 
 // qqq : implement similar test for all containers -- done
-#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
 #[ test ]
 fn iters()
 {

module/core/collection_tools/tests/inc/vecd.rs

@@ -1,6 +1,5 @@
 use super::*;
 
-#[ cfg( any( feature = "use_alloc", not( feature = "no_std" ) ) ) ]
 #[ test ]
 fn reexport()
 {
@@ -50,7 +49,6 @@ fn into_constructor()
 
 }
 
-#[ cfg( any( not( feature = "no_std" ), feature = "use_alloc" ) ) ]
 #[ test ]
 fn iters()
 {

module/core/collection_tools/tests/tests.rs

@@ -10,4 +10,5 @@ use test_tools::exposed::*;
 use ::collection_tools as the_module;
 
 #[ cfg( feature = "enabled" ) ]
+#[ cfg( any( feature = "use_alloc", not( feature = "no_std" ) ) ) ]
 mod inc;