no_std support

Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "cw-storage-plus"
-version = "1.0.1"
+version = "1.0.2"
 authors = ["Ethan Frey <[email protected]>"]
 edition = "2021"
 description = "Enhanced storage engines"
@@ -14,18 +14,19 @@ homepage = "https://cosmwasm.com"
 all-features = true # include macro feature when building docs
 
 [features]
-default = ["iterator"]
+default = ["iterator", "std"]
 iterator = ["cosmwasm-std/iterator"]
 macro = ["cw-storage-macro"]
+std = ["cosmwasm-std/std", "schemars"]
 
 [lib]
 # See https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options
 bench = false
 
 [dependencies]
-cosmwasm-std = { version = "1.1.6", default-features = false }
-schemars = "0.8.3"
-serde = { version = "1.0", default-features = false, features = ["derive"] }
+cosmwasm-std = { git = "https://github.com/dzmitry-lahoda-forks/cosmwasm.git", rev = "1277597cbf380a8d04dbe676d9cb344ca31634b6", default-features = false }
+schemars = { version = "0.8.3", optional = true}
+serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] }
 cw-storage-macro = { version = "1.0.0", optional = true, path = "macros" }
 
 [dev-dependencies]

rust-toolchain.toml

@@ -0,0 +1,11 @@
+[toolchain]
+channel = "nightly-2022-11-17"
+components = [
+  "rust-src",
+  "cargo",
+]
+targets = [
+  "wasm32-unknown-unknown",
+  # that is the way to test that it checks and builds againt no_std target
+  "thumbv7em-none-eabi"
+  ]

shell.nix

@@ -0,0 +1,24 @@
+{ pkgs ? import <nixpkgs> { overlays = [ (import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/refs/heads/stable.zip")) ]; } }:
+let
+  rust-as-on-ci = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
+  features = " --features iterator";
+  package="cw-storage-plus";
+  check-no-std = pkgs.writeShellApplication rec {
+    name = "check-no-std";
+    runtimeInputs = [ rust-as-on-ci ];
+    text = ''
+      cargo build --no-default-features --target thumbv7em-none-eabi --package ${package} ${features}
+    '';
+  };
+  check-std = pkgs.writeShellApplication rec {
+    name = "check-std";
+    runtimeInputs = [ rust-as-on-ci ];
+    text = ''
+      cargo build --target wasm32-unknown-unknown ${features},std --package ${package}
+      cargo build ${features},std --package ${package}
+    '';
+  };
+in
+pkgs.mkShell {
+  nativeBuildInputs = [ rust-as-on-ci check-no-std check-std];
+}

src/bound.rs

@@ -1,7 +1,8 @@
 #![cfg(feature = "iterator")]
 
+use crate::no_std::marker::PhantomData;
+use crate::no_std::prelude::*;
 use cosmwasm_std::Addr;
-use std::marker::PhantomData;
 
 use crate::de::KeyDeserialize;
 use crate::{Prefixer, PrimaryKey};

src/de.rs

@@ -1,6 +1,6 @@
-use std::array::TryFromSliceError;
-use std::convert::TryInto;
-
+use crate::no_std::array::TryFromSliceError;
+use crate::no_std::convert::TryInto;
+use crate::no_std::prelude::*;
 use cosmwasm_std::{Addr, StdError, StdResult};
 
 use crate::int_key::IntKey;
@@ -199,6 +199,7 @@ impl<T: KeyDeserialize, U: KeyDeserialize, V: KeyDeserialize> KeyDeserialize for
 #[cfg(test)]
 mod test {
     use super::*;
+    use crate::no_std::prelude::*;
     use crate::PrimaryKey;
 
     const BYTES: &[u8] = b"Hello";