Revert "Update Rust CI version"

This reverts commit 98b2de2.

(cherry picked from commit f04587a)

# Conflicts:
#	.circleci/config.yml
#	CHANGELOG.md
#	Cargo.lock
#	Cargo.toml
#	contracts/burner/Cargo.lock
#	contracts/crypto-verify/Cargo.lock
#	contracts/cyberpunk/Cargo.lock
#	contracts/empty/Cargo.lock
#	contracts/floaty/Cargo.lock
#	contracts/hackatom/Cargo.lock
#	contracts/ibc-callbacks/Cargo.lock
#	contracts/ibc-reflect-send/Cargo.lock
#	contracts/ibc-reflect/Cargo.lock
#	contracts/queue/Cargo.lock
#	contracts/reflect/Cargo.lock
#	contracts/staking/Cargo.lock
#	contracts/virus/Cargo.lock
#	packages/check/Cargo.toml
#	packages/crypto/Cargo.toml
#	packages/go-gen/Cargo.toml
#	packages/schema/Cargo.toml
#	packages/std/Cargo.toml
#	packages/std/src/math/signed_decimal_256.rs
#	packages/vm/Cargo.toml
#	packages/vm/src/calls.rs
#	packages/vm/src/imports.rs
#	packages/vm/src/modules/file_system_cache.rs

.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
@@ -1142,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

@@ -49,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"