Merge pull request #1976 from CosmWasm/fail-without-std

Throw compiler error if std feature is not enabled
CosmWasm · Dec 20, 2023 · d912030 · d912030
2 parents 35c5470 + fb01967
commit d912030
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -344,15 +344,15 @@ jobs:
       - run:
           name: Build library for native target (no features)
           working_directory: ~/project/packages/std
-          command: cargo build --locked --no-default-features
+          command: cargo build --locked --no-default-features --features std
       - run:
           name: Build library for wasm target (no features)
           working_directory: ~/project/packages/std
-          command: cargo wasm --locked --no-default-features
+          command: cargo wasm --locked --no-default-features --features std
       - run:
           name: Run unit tests (no features)
           working_directory: ~/project/packages/std
-          command: cargo test --locked --no-default-features
+          command: cargo test --locked --no-default-features --features std
       - run:
           name: Build library for native target (all features)
           working_directory: ~/project/packages/std

diff --git a/contracts/cyberpunk/Cargo.toml b/contracts/cyberpunk/Cargo.toml
@@ -28,7 +28,7 @@ cranelift = ["cosmwasm-vm/cranelift"]
 
 [dependencies]
 cosmwasm-schema = { path = "../../packages/schema" }
-cosmwasm-std = { path = "../../packages/std", default-features = false, features = ["abort", "cosmwasm_1_3"] }
+cosmwasm-std = { path = "../../packages/std", default-features = false, features = ["std", "abort", "cosmwasm_1_3"] }
 rust-argon2 = "0.8"
 thiserror = "1.0.26"
 

diff --git a/contracts/hackatom/Cargo.toml b/contracts/hackatom/Cargo.toml
@@ -30,7 +30,7 @@ cranelift = ["cosmwasm-vm/cranelift"]
 
 [dependencies]
 cosmwasm-schema = { path = "../../packages/schema" }
-cosmwasm-std = { path = "../../packages/std", default-features = false, features = ["abort"] }
+cosmwasm-std = { path = "../../packages/std", default-features = false, features = ["std", "abort"] }
 schemars = "0.8.3"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 sha2 = "0.10"

diff --git a/contracts/reflect/Cargo.toml b/contracts/reflect/Cargo.toml
@@ -31,7 +31,7 @@ cranelift = ["cosmwasm-vm/cranelift"]
 
 [dependencies]
 cosmwasm-schema = { path = "../../packages/schema" }
-cosmwasm-std = { path = "../../packages/std", default-features = false, features = ["staking", "stargate", "cosmwasm_1_4"] }
+cosmwasm-std = { path = "../../packages/std", default-features = false, features = ["std", "staking", "stargate", "cosmwasm_1_4"] }
 schemars = "0.8.3"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 thiserror = "1.0.26"

diff --git a/contracts/staking/Cargo.toml b/contracts/staking/Cargo.toml
@@ -30,7 +30,7 @@ cranelift = ["cosmwasm-vm/cranelift"]
 
 [dependencies]
 cosmwasm-schema = { path = "../../packages/schema" }
-cosmwasm-std = { path = "../../packages/std", default-features = false, features = ["staking"] }
+cosmwasm-std = { path = "../../packages/std", default-features = false, features = ["std", "staking"] }
 schemars = "0.8.3"
 serde = { version = "1.0.103", default-features = false, features = ["derive"] }
 snafu = "0.6.6"

diff --git a/devtools/check_workspace.sh b/devtools/check_workspace.sh
@@ -9,11 +9,11 @@ cargo fmt
   cd packages/std
   # default, min, all
   cargo check
-  cargo check --no-default-features
-  cargo check --features abort,iterator,staking,stargate,cosmwasm_1_2
+  cargo check --no-default-features --features std
+  cargo check --features std,abort,iterator,staking,stargate,cosmwasm_1_2
   cargo wasm-debug
-  cargo wasm-debug --features iterator,staking,stargate
-  cargo clippy --all-targets --features iterator,staking,stargate -- -D warnings
+  cargo wasm-debug --features std,iterator,staking,stargate
+  cargo clippy --all-targets --features std,iterator,staking,stargate -- -D warnings
 )
 (cd packages/schema && cargo build && cargo clippy --all-targets -- -D warnings)
 (cd packages/schema-derive && cargo build && cargo clippy --all-targets -- -D warnings)

diff --git a/packages/std/src/lib.rs b/packages/std/src/lib.rs
@@ -1,5 +1,12 @@
 extern crate alloc;
 
+#[cfg(not(feature = "std"))]
+core::compile_error!(
+    r#"Please enable `cosmwasm-std`'s `std` feature, as we might move existing functionality to that feature in the future.
+Builds without the std feature are currently not expected to work. If you need no_std support see #1484.
+"#
+);
+
 // Exposed on all platforms
 
 mod addresses;

diff --git a/packages/vm/Cargo.toml b/packages/vm/Cargo.toml
@@ -31,7 +31,7 @@ clru = "0.6.1"
 crc32fast = "1.3.2"
 bech32 = "0.9.1"
 # Uses the path when built locally; uses the given version from crates.io when published
-cosmwasm-std = { path = "../std", version = "1.5.0", default-features = false }
+cosmwasm-std = { path = "../std", version = "1.5.0", default-features = false, features = ["std"] }
 cosmwasm-crypto = { path = "../crypto", version = "1.5.0" }
 derivative = "2"
 hex = "0.4"