fix: Error const reference without default features (#960)

near · Nov 10, 2022 · 55020df · 55020df
1 parent 10b0dea
commit 55020df
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 33 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -52,6 +52,9 @@ jobs:
           toolchain: stable
       - uses: Swatinem/rust-cache@v1
       - run: cargo check -p near-sdk --features unstable,legacy
+      - run: cargo check -p near-sdk --no-default-features
+      - run: cargo check -p near-sdk --no-default-features --features legacy
+      - run: cargo check -p near-sdk --no-default-features --features unstable
       - run: cargo check -p near-contract-standards
   audit:
     name: Audit

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## [Unreleased]
 
+## [4.1.1] - 2022-11-10
+
+### Fixed
+- Fixed invalid import from "legacy" feature flag from stabilized collection. [PR 960](https://github.com/near/near-sdk-rs/pull/960)
+
 ## [4.1.0] - 2022-11-09
 
 ### Added
@@ -367,7 +372,8 @@ impl StatusMessage {
 * Add account check to `get_balance` in fungible token https://github.com/near/near-sdk-rs/pull/175
 * In fungible token remove account from storage if its balance is 0 https://github.com/near/near-sdk-rs/pull/179
 
-[Unreleased]: https://github.com/near/near-sdk-rs/compare/4.1.0...HEAD
+[Unreleased]: https://github.com/near/near-sdk-rs/compare/4.1.1...HEAD
+[4.1.1]: https://github.com/near/near-sdk-rs/compare/4.1.0...4.1.1
 [4.1.0]: https://github.com/near/near-sdk-rs/compare/4.0.0-pre.3...4.1.0
 [4.1.0-pre.3]: https://github.com/near/near-sdk-rs/compare/4.0.0-pre.2...4.1.0-pre.3
 [4.1.0-pre.2]: https://github.com/near/near-sdk-rs/compare/4.0.0-pre.1...4.1.0-pre.2

diff --git a/examples/adder/Cargo.lock b/examples/adder/Cargo.lock
diff --git a/examples/callback-results/Cargo.lock b/examples/callback-results/Cargo.lock
diff --git a/examples/cross-contract-calls/Cargo.lock b/examples/cross-contract-calls/Cargo.lock
diff --git a/examples/factory-contract/Cargo.lock b/examples/factory-contract/Cargo.lock
diff --git a/examples/fungible-token/Cargo.lock b/examples/fungible-token/Cargo.lock
diff --git a/examples/lockable-fungible-token/Cargo.lock b/examples/lockable-fungible-token/Cargo.lock
diff --git a/examples/mission-control/Cargo.lock b/examples/mission-control/Cargo.lock
diff --git a/examples/non-fungible-token/Cargo.lock b/examples/non-fungible-token/Cargo.lock
diff --git a/examples/status-message-collections/Cargo.lock b/examples/status-message-collections/Cargo.lock
diff --git a/examples/status-message/Cargo.lock b/examples/status-message/Cargo.lock
diff --git a/examples/test-contract/Cargo.lock b/examples/test-contract/Cargo.lock
diff --git a/examples/versioned/Cargo.lock b/examples/versioned/Cargo.lock
diff --git a/near-contract-standards/Cargo.toml b/near-contract-standards/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "near-contract-standards"
-version = "4.1.0"
+version = "4.1.1"
 authors = ["Near Inc <[email protected]>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -13,7 +13,7 @@ NEAR smart contracts standard library.
 """
 
 [dependencies]
-near-sdk = { path = "../near-sdk", version = "=4.1.0", default-features = false, features = ["legacy"] }
+near-sdk = { path = "../near-sdk", version = "~4.1.1", default-features = false, features = ["legacy"] }
 serde = "1"
 serde_json = "1"
 schemars = "0.8"

diff --git a/near-sdk-macros/Cargo.toml b/near-sdk-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "near-sdk-macros"
-version = "4.1.0"
+version = "4.1.1"
 authors = ["Near Inc <[email protected]>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"

diff --git a/near-sdk/Cargo.toml b/near-sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "near-sdk"
-version = "4.1.0"
+version = "4.1.1"
 authors = ["Near Inc <[email protected]>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -21,7 +21,7 @@ required-features = ["abi", "unstable"]
 # Provide near_bidgen macros.
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-near-sdk-macros = { path = "../near-sdk-macros", version = "=4.1.0" }
+near-sdk-macros = { path = "../near-sdk-macros", version = "~4.1.1" }
 near-sys = { path = "../sys", version = "0.2" }
 base64 = "0.13"
 borsh = { version = "0.9", features = ["const-generics"] }

diff --git a/near-sdk/src/store/lazy/mod.rs b/near-sdk/src/store/lazy/mod.rs
@@ -9,8 +9,8 @@ mod impls;
 use borsh::{BorshDeserialize, BorshSerialize};
 use once_cell::unsync::OnceCell;
 
-use crate::collections::ERR_INCONSISTENT_STATE;
 use crate::env;
+use crate::store::ERR_INCONSISTENT_STATE;
 use crate::utils::{CacheEntry, EntryState};
 use crate::IntoStorageKey;