Merge pull request #2410 from CosmWasm/rm-abort-feature

Remove abort feature

Author: webmaster128

.circleci/config.yml

@@ -1168,8 +1168,7 @@ jobs:
       - run:
           name: Clippy linting on std (all feature flags)
           working_directory: ~/project/packages/std
-          # change to --all-features once `abort` is removed
-          command: cargo clippy --all-targets --tests --features staking,stargate,cosmwasm_2_2 -- -D warnings
+          command: cargo clippy --all-targets --tests --all-features -- -D warnings
       - run:
           name: Clippy linting on vm (no feature flags)
           working_directory: ~/project/packages/vm

.vscode/settings.json

@@ -1,6 +1,5 @@
 {
   "rust-analyzer.cargo.features": [
-    "abort",
     "stargate",
     "staking",
     "cosmwasm_2_1"

CHANGELOG.md

@@ -57,13 +57,15 @@ and this project adheres to
   ([#2237])
 - cosmwasm-std: Remove previously deprecated `cosmwast_std::testing::mock_info`.
   Use `cosmwasm_std::testing::message_info` instead. ([#2393])
+- cosmwasm-std: Remove abort feature. ([#2141])
 
 ## Fixed
 
 - cosmwasm-schema: The schema export now doesn't overwrite existing
   `additionalProperties` values anymore ([#2310])
 - cosmwasm-vm: Fix CWA-2025-002.
 
+[#2141]: https://github.com/CosmWasm/cosmwasm/issues/2141
 [#2155]: https://github.com/CosmWasm/cosmwasm/issues/2155
 [#2156]: https://github.com/CosmWasm/cosmwasm/issues/2156
 [#2201]: https://github.com/CosmWasm/cosmwasm/issues/2201

packages/std/Cargo.toml

@@ -9,13 +9,10 @@ license = "Apache-2.0"
 readme = "README.md"
 
 [package.metadata.docs.rs]
-features = ["abort", "cosmwasm_2_2", "staking", "stargate", "ibc2"]
+features = ["cosmwasm_2_2", "staking", "stargate", "ibc2"]
 
 [features]
 default = ["iterator", "std"]
-# abort used to enable the panic handler that hands a nice error message back to the host.
-# The feature is now deprecated and the panic handler is always enabled.
-abort = []
 std = []
 # iterator allows us to iterate over all DB items in a given range
 # optional as some merkle stores (like tries) don't support this

packages/std/src/lib.rs

@@ -116,17 +116,6 @@ pub use crate::timestamp::Timestamp;
 pub use crate::traits::{Api, HashFunction, Querier, QuerierResult, QuerierWrapper, Storage};
 pub use crate::types::{BlockInfo, ContractInfo, Env, MessageInfo, MigrateInfo, TransactionInfo};
 
-#[cfg(feature = "abort")]
-mod _warning {
-    #[must_use = "cosmwasm-std feature `abort` is deprecated and will be removed in the next major release. You can just remove the feature as this functionality is now the default"]
-    struct CompileWarning;
-
-    #[allow(dead_code, path_statements)]
-    fn trigger_warning() {
-        CompileWarning;
-    }
-}
-
 // Exposed in wasm build only
 #[cfg(target_arch = "wasm32")]
 mod exports;