Revert reference-types support (backport #2311)

.circleci/config.yml

@@ -95,7 +95,11 @@ workflows:
           matrix:
             parameters:
               # Run with MSRV and some modern stable Rust
+<<<<<<< HEAD
               rust-version: ["1.74.0", "1.82.0"]
+=======
+              rust-version: ["1.74.0", "1.78.0"]
+>>>>>>> f04587a1 (Revert "Update Rust CI version")
       - benchmarking:
           requires:
             - package_vm
@@ -655,8 +659,7 @@ jobs:
 
   contract_hackatom:
     docker:
-      # We compile this contract with the upper bound to detect issues with new Rust versions early
-      - image: rust:1.82
+      - image: rust:1.74
     environment:
       RUST_BACKTRACE: 1
     working_directory: ~/cosmwasm/contracts/hackatom
@@ -668,7 +671,7 @@ jobs:
           command: rustc --version; cargo --version; rustup --version
       - restore_cache:
           keys:
-            - cargocache-v2-contract_hackatom-rust:1.82-{{ checksum "Cargo.lock" }}
+            - cargocache-v2-contract_hackatom-rust:1.74-{{ checksum "Cargo.lock" }}
       - check_contract:
           min_version: "2.2"
       - save_cache:
@@ -680,7 +683,7 @@ jobs:
             - target/wasm32-unknown-unknown/release/.fingerprint
             - target/wasm32-unknown-unknown/release/build
             - target/wasm32-unknown-unknown/release/deps
-          key: cargocache-v2-contract_hackatom-rust:1.82-{{ checksum "Cargo.lock" }}
+          key: cargocache-v2-contract_hackatom-rust:1.74-{{ checksum "Cargo.lock" }}
 
   contract_ibc_callbacks:
     docker:
@@ -1143,7 +1146,11 @@ jobs:
 
   coverage:
     docker:
+<<<<<<< HEAD
       - image: rust:1.82.0-alpine3.19
+=======
+      - image: rust:1.78.0-alpine3.19
+>>>>>>> f04587a1 (Revert "Update Rust CI version")
     environment:
       # Limit the number of parallel jobs to avoid OOM crashes during doc testing
       RUST_TEST_THREADS: 8

CHANGELOG.md

@@ -26,15 +26,12 @@ and this project adheres to
 - cosmwasm-vm: Export a new `migrate_with_info` function ([#2212])
 - cosmwasm-derive: Add support for migrate method with
   `migrate_info: MigrateInfo` argument. ([#2212])
-- cosmwasm-vm: Enable support for reference-types proposal, required since Rust
-  1.82 ([#2288])
 - cosmwasm-vm: Add `Cache::store_code`
 
 [#2118]: https://github.com/CosmWasm/cosmwasm/pull/2118
 [#2196]: https://github.com/CosmWasm/cosmwasm/pull/2196
 [#2220]: https://github.com/CosmWasm/cosmwasm/pull/2220
 [#2212]: https://github.com/CosmWasm/cosmwasm/pull/2212
-[#2288]: https://github.com/CosmWasm/cosmwasm/pull/2288
 
 ### Changed
 
@@ -52,12 +49,16 @@ and this project adheres to
   match the contract address from `mock_env`. ([#2211])
 - cosmwasm-derive: Automatically detect whether the package is a dependency or
   the primary package, only expanding entrypoints for the primary package. This
+<<<<<<< HEAD
   effectively deprecates the usage of the `library` feature pattern.
 
   Note: This feature does **NOT** interact well with workspaces due to a cargo
   bug. If you have multiple contracts in a workspace, you might still want to
   use the library feature ([#2246])
 
+=======
+  effectively deprecates the usage of the `library` feature pattern. ([#2246])
+>>>>>>> f04587a1 (Revert "Update Rust CI version")
 - cosmwasm-std: Deprecate `BankQuery::AllBalances` and `IbcQuery::ListChannels`.
   Both are inherently problematic to use because the returned entries are
   unbounded. ([#2247])

Cargo.toml

@@ -7,7 +7,11 @@ exclude = ["contracts"]
 resolver = "2"
 
 [workspace.package]
+<<<<<<< HEAD
 version = "2.2.0-rc.1"
+=======
+version = "2.2.0-rc.3"
+>>>>>>> f04587a1 (Revert "Update Rust CI version")
 
 [workspace.dependencies]
 schemars = "0.8.4"