Skip to content

Commit 0390607

Browse files
committed
Remove abort feature
1 parent 4a38542 commit 0390607

File tree

5 files changed

+4
-18
lines changed

5 files changed

+4
-18
lines changed

.circleci/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1168,8 +1168,7 @@ jobs:
11681168
- run:
11691169
name: Clippy linting on std (all feature flags)
11701170
working_directory: ~/project/packages/std
1171-
# change to --all-features once `abort` is removed
1172-
command: cargo clippy --all-targets --tests --features staking,stargate,cosmwasm_2_2 -- -D warnings
1171+
command: cargo clippy --all-targets --tests --all-features -- -D warnings
11731172
- run:
11741173
name: Clippy linting on vm (no feature flags)
11751174
working_directory: ~/project/packages/vm

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"rust-analyzer.cargo.features": [
3-
"abort",
43
"stargate",
54
"staking",
65
"cosmwasm_2_1"

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,15 @@ and this project adheres to
5757
([#2237])
5858
- cosmwasm-std: Remove previously deprecated `cosmwast_std::testing::mock_info`.
5959
Use `cosmwasm_std::testing::message_info` instead. ([#2393])
60+
- cosmwasm-std: Remove abort feature. ([#2141])
6061

6162
## Fixed
6263

6364
- cosmwasm-schema: The schema export now doesn't overwrite existing
6465
`additionalProperties` values anymore ([#2310])
6566
- cosmwasm-vm: Fix CWA-2025-002.
6667

68+
[#2141]: https://github.com/CosmWasm/cosmwasm/issues/2141
6769
[#2155]: https://github.com/CosmWasm/cosmwasm/issues/2155
6870
[#2156]: https://github.com/CosmWasm/cosmwasm/issues/2156
6971
[#2201]: https://github.com/CosmWasm/cosmwasm/issues/2201

packages/std/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@ license = "Apache-2.0"
99
readme = "README.md"
1010

1111
[package.metadata.docs.rs]
12-
features = ["abort", "cosmwasm_2_2", "staking", "stargate", "ibc2"]
12+
features = ["cosmwasm_2_2", "staking", "stargate", "ibc2"]
1313

1414
[features]
1515
default = ["iterator", "std"]
16-
# abort used to enable the panic handler that hands a nice error message back to the host.
17-
# The feature is now deprecated and the panic handler is always enabled.
18-
abort = []
1916
std = []
2017
# iterator allows us to iterate over all DB items in a given range
2118
# optional as some merkle stores (like tries) don't support this

packages/std/src/lib.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,6 @@ pub use crate::timestamp::Timestamp;
116116
pub use crate::traits::{Api, HashFunction, Querier, QuerierResult, QuerierWrapper, Storage};
117117
pub use crate::types::{BlockInfo, ContractInfo, Env, MessageInfo, MigrateInfo, TransactionInfo};
118118

119-
#[cfg(feature = "abort")]
120-
mod _warning {
121-
#[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"]
122-
struct CompileWarning;
123-
124-
#[allow(dead_code, path_statements)]
125-
fn trigger_warning() {
126-
CompileWarning;
127-
}
128-
}
129-
130119
// Exposed in wasm build only
131120
#[cfg(target_arch = "wasm32")]
132121
mod exports;

0 commit comments

Comments
 (0)