rework #![no_std] support, switch on alloc

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "frunk"
 edition = "2021"
-version = "0.4.2"
+version = "0.4.3"
 authors = ["Lloyd <[email protected]>"]
 description = "Frunk provides developers with a number of functional programming tools like HList, Coproduct, Generic, LabelledGeneric, Validated, Monoid, Semigroup and friends."
 license = "MIT"
@@ -41,10 +41,15 @@ version = "0.5.0"
 serde = { version = "^1.0", optional = true, features = [ "derive" ] }
 
 [features]
-default = ["validated", "proc-macros"]
-validated = ["std"]
+default = ["validated", "proc-macros", "alloc"]
+validated = ["alloc"]
 proc-macros = ["frunk_proc_macros"]
-std = ["frunk_core/std"]
+std = ["alloc", "serde?/std"]
+alloc = ["frunk_core/alloc", "serde?/alloc"]
+
+[[example]]
+name = "paths"
+required-features = ["proc-macros"]
 
 [profile.bench]
 opt-level = 3

core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "frunk_core"
 edition = "2021"
-version = "0.4.2"
+version = "0.4.3"
 authors = ["Lloyd <[email protected]>"]
 description = "Frunk core provides developers with HList, Coproduct, LabelledGeneric and Generic"
 license = "MIT"
@@ -13,8 +13,11 @@ keywords = ["Frunk", "HList", "Generic", "Coproduct", "LabelledGeneric"]
 travis-ci = { repository = "lloydmeta/frunk" }
 
 [features]
-default = ["std"]
-std = []
+default = ["alloc"]
+alloc = ["serde?/alloc"]
+
+# deprecated -- to be removed in next major version
+std = ["alloc"]
 
 [dependencies]
 serde = { version = "^1.0", optional = true, features = [ "derive" ] }

core/src/coproduct.rs

@@ -1247,6 +1247,9 @@ mod tests {
     use super::Coproduct::*;
     use super::*;
 
+    use std::format;
+    use std::string::{String, ToString};
+
     #[test]
     fn test_coproduct_inject() {
         type I32StrBool = Coprod!(i32, &'static str, bool);
@@ -1267,7 +1270,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "std")]
     fn test_coproduct_fold_consuming() {
         type I32F32StrBool = Coprod!(i32, f32, bool);
 
@@ -1312,7 +1314,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "std")]
     fn test_coproduct_fold_non_consuming() {
         type I32F32Bool = Coprod!(i32, f32, bool);
 

core/src/hlist.rs

@@ -57,10 +57,12 @@
 
 use crate::indices::{Here, Suffixed, There};
 use crate::traits::{Func, IntoReverse, Poly, ToMut, ToRef};
+#[cfg(feature = "alloc")]
+use alloc::vec::Vec;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-use std::ops::Add;
+use core::ops::Add;
 
 /// Typeclass for HList-y behaviour
 ///
@@ -432,7 +434,7 @@ macro_rules! gen_inherent_methods {
             /// # }
             /// ```
             #[inline(always)]
-            pub fn map<F>(self,mapper: F) -> <Self as HMappable<F>>::Output
+            pub fn map<F>(self, mapper: F) -> <Self as HMappable<F>>::Output
             where Self: HMappable<F>,
             {
                 HMappable::map(self, mapper)
@@ -1433,7 +1435,7 @@ where
     }
 }
 
-#[cfg(feature = "std")]
+#[cfg(feature = "alloc")]
 #[allow(clippy::from_over_into)]
 impl<H, Tail> Into<Vec<H>> for HCons<H, Tail>
 where
@@ -1450,7 +1452,7 @@ where
     }
 }
 
-#[cfg(feature = "std")]
+#[cfg(feature = "alloc")]
 #[allow(clippy::from_over_into)]
 impl<T> Into<Vec<T>> for HNil {
     fn into(self) -> Vec<T> {
@@ -1577,6 +1579,8 @@ where
 mod tests {
     use super::*;
 
+    use alloc::vec;
+
     #[test]
     fn test_hcons() {
         let hlist1 = h_cons(1, HNil);
@@ -1909,7 +1913,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "std")]
     fn test_single_func_foldl_consuming() {
         use std::collections::HashMap;
 
@@ -1949,7 +1952,7 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "std")]
+    #[cfg(feature = "alloc")]
     fn test_into_vec() {
         let h = hlist![1, 2, 3, 4, 5];
         let as_vec: Vec<_> = h.into();

core/src/indices.rs

@@ -11,7 +11,7 @@
 //!
 //! **...yet.** `;)`
 
-use std::marker::PhantomData;
+use core::marker::PhantomData;
 
 // Largely lifted from https://github.com/Sgeo/hlist/blob/master/src/lib.rs#L30
 

core/src/labelled.rs

@@ -152,8 +152,8 @@ use crate::indices::*;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-use ::std::fmt;
-use ::std::marker::PhantomData;
+use core::fmt;
+use core::marker::PhantomData;
 
 /// A trait that converts from a type to a labelled generic representation.
 ///
@@ -733,11 +733,13 @@ impl<Key, SourceValue> Transmogrifier<SourceValue, IdentityTransMog> for Field<K
 }
 
 /// Implementations of `Transmogrifier` that allow recursion through stdlib container types.
-#[cfg(feature = "std")]
-mod std {
+#[cfg(feature = "alloc")]
+mod _alloc {
     use super::MappingIndicesWrapper;
     use super::{Field, Transmogrifier};
-    use std::collections::{LinkedList, VecDeque};
+    use alloc::boxed::Box;
+    use alloc::collections::{LinkedList, VecDeque};
+    use alloc::vec::Vec;
 
     macro_rules! transmogrify_seq {
         ($container:ident) => {
@@ -914,7 +916,8 @@ where
 mod tests {
     use super::chars::*;
     use super::*;
-    use ::std::collections::{LinkedList, VecDeque};
+    use alloc::collections::{LinkedList, VecDeque};
+    use alloc::{boxed::Box, format, vec, vec::Vec};
 
     // Set up some aliases
     #[allow(non_camel_case_types)]

core/src/lib.rs

@@ -1,4 +1,4 @@
-#![cfg_attr(not(feature = "std"), no_std)]
+#![no_std]
 #![doc(html_playground_url = "https://play.rust-lang.org/")]
 //! Frunk Core
 //!
@@ -58,8 +58,11 @@
 //!   1. [Source on Github](https://github.com/lloydmeta/frunk)
 //!   2. [Crates.io page](https://crates.io/crates/frunk)
 
-#[cfg(not(feature = "std"))]
-extern crate core as std;
+#[cfg(test)]
+extern crate std;
+
+#[cfg(feature = "alloc")]
+extern crate alloc;
 
 #[macro_use]
 mod macros;

core/src/path.rs

@@ -108,8 +108,8 @@
 use super::hlist::*;
 use super::labelled::*;
 
-use std::marker::PhantomData;
-use std::ops::Add;
+use core::marker::PhantomData;
+use core::ops::Add;
 
 #[derive(Clone, Copy, Debug)]
 pub struct Path<T>(PhantomData<T>);

laws/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "frunk_laws"
 edition = "2021"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Lloyd <[email protected]>"]
 description = "frunk_laws contains laws for algebras declared in Frunk."
 license = "MIT"
@@ -16,6 +16,7 @@ travis-ci = { repository = "lloydmeta/frunk" }
 path = ".."
 default-features = false
 version = "0.4.2"
+features = ["std"]
 
 [dependencies]
 quickcheck = "1.0.3"

laws/src/monoid_laws.rs

@@ -66,39 +66,33 @@ mod tests {
     use crate::wrapper::*;
     use frunk::semigroup::*;
     use quickcheck::quickcheck;
-    #[cfg(feature = "std")]
     use std::collections::{HashMap, HashSet};
 
     #[test]
-    #[cfg(feature = "std")]
     fn string_id_prop() {
         quickcheck(left_identity as fn(String) -> bool);
         quickcheck(right_identity as fn(String) -> bool);
     }
 
     #[test]
-    #[cfg(feature = "std")]
     fn option_id_prop() {
         quickcheck(left_identity as fn(Option<String>) -> bool);
         quickcheck(right_identity as fn(Option<String>) -> bool);
     }
 
     #[test]
-    #[cfg(feature = "std")]
     fn vec_id_prop() {
         quickcheck(left_identity as fn(Vec<String>) -> bool);
         quickcheck(right_identity as fn(Vec<String>) -> bool);
     }
 
     #[test]
-    #[cfg(feature = "std")]
     fn hashset_id_prop() {
         quickcheck(left_identity as fn(HashSet<i32>) -> bool);
         quickcheck(right_identity as fn(HashSet<i32>) -> bool);
     }
 
     #[test]
-    #[cfg(feature = "std")]
     fn hashmap_id_prop() {
         quickcheck(left_identity as fn(HashMap<i32, String>) -> bool);
         quickcheck(right_identity as fn(HashMap<i32, String>) -> bool);

laws/src/semigroup_laws.rs

@@ -42,35 +42,29 @@ mod tests {
     use super::*;
     use crate::wrapper::*;
     use quickcheck::quickcheck;
-    #[cfg(feature = "std")]
     use std::collections::{HashMap, HashSet};
 
     #[test]
-    #[cfg(feature = "std")]
     fn string_prop() {
         quickcheck(associativity as fn(String, String, String) -> bool)
     }
 
     #[test]
-    #[cfg(feature = "std")]
     fn option_prop() {
         quickcheck(associativity as fn(Option<String>, Option<String>, Option<String>) -> bool)
     }
 
     #[test]
-    #[cfg(feature = "std")]
     fn vec_prop() {
         quickcheck(associativity as fn(Vec<i8>, Vec<i8>, Vec<i8>) -> bool)
     }
 
     #[test]
-    #[cfg(feature = "std")]
     fn hashset_prop() {
         quickcheck(associativity as fn(HashSet<i8>, HashSet<i8>, HashSet<i8>) -> bool)
     }
 
     #[test]
-    #[cfg(feature = "std")]
     fn hashmap_prop() {
         quickcheck(
             associativity

src/lib.rs

@@ -1,4 +1,4 @@
-#![cfg_attr(not(feature = "std"), no_std)]
+#![no_std]
 #![doc(html_playground_url = "https://play.rust-lang.org/")]
 //! Frunk: generic functional programming toolbelt for Rust
 //!
@@ -13,7 +13,7 @@
 //!   6. Monoid
 //!
 #![cfg_attr(
-    feature = "std",
+    feature = "alloc",
     doc = r#"
 Here is a small taste of what Frunk has to offer:
 
@@ -201,8 +201,11 @@ assert_eq!(d_user.first_name, "Joe");
 //!   1. [Source on Github](https://github.com/lloydmeta/frunk)
 //!   2. [Crates.io page](https://crates.io/crates/frunk)
 
-#[cfg(not(feature = "std"))]
-extern crate core as std;
+#[cfg(feature = "alloc")]
+extern crate alloc;
+
+#[cfg(any(feature = "std", test))]
+extern crate std;
 
 pub mod monoid;
 pub mod semigroup;