Skip to content

Commit

Permalink
chore!: bump msrv to 1.81 (#1568)
Browse files Browse the repository at this point in the history
  • Loading branch information
segfault-magnet authored Jan 7, 2025
1 parent 6e1b2c9 commit bacf2a1
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:
FUEL_CORE_VERSION: 0.40.0
FUEL_CORE_PATCH_BRANCH: ""
FUEL_CORE_PATCH_REVISION: ""
RUST_VERSION: 1.79.0
RUST_VERSION: 1.81.0
FORC_VERSION: 0.66.5
FORC_PATCH_BRANCH: ""
FORC_PATCH_REVISION: ""
Expand Down
4 changes: 1 addition & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ homepage = "https://fuel.network/"
readme = "README.md"
license = "Apache-2.0"
repository = "https://github.com/FuelLabs/fuels-rs"
rust-version = "1.79.0"
rust-version = "1.81.0"
version = "0.66.10"

[workspace.dependencies]
Expand Down Expand Up @@ -86,8 +86,6 @@ zeroize = "1.7.0"
octocrab = { version = "0.39", default-features = false }
dotenv = { version = "0.15", default-features = false }
toml = { version = "0.8", default-features = false }
async-graphql = { version = "=7.0.11", default-features = false }
async-graphql-derive = { version = "=7.0.11", default-features = false }

# Dependencies from the `fuel-core` repository:
fuel-core = { version = "0.40.1", default-features = false, features = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,7 @@ mod tests {
// then
let expected_code = quote! {
#[allow(clippy::too_many_arguments)]
#[allow(clippy::disallowed_names)]
#[no_implicit_prelude]
pub mod some_shared_lib {
use ::core::{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ impl GeneratedCode {
let code = generated_code.code();
quote! {
#[allow(clippy::too_many_arguments)]
#[allow(clippy::disallowed_names)]
#[no_implicit_prelude]
pub mod #mod_name {
#prelude
Expand Down Expand Up @@ -175,6 +176,7 @@ mod tests {
// then
let expected_code = quote! {
#[allow(clippy::too_many_arguments)]
#[allow(clippy::disallowed_names)]
#[no_implicit_prelude]
pub mod a_mod {
use ::core::{
Expand Down Expand Up @@ -248,19 +250,22 @@ mod tests {
let expected_code = quote! {
struct TopLevelStruct;
#[allow(clippy::too_many_arguments)]
#[allow(clippy::disallowed_names)]
#[no_implicit_prelude]
pub mod common_mod {
#prelude

struct SomeStruct2;
#[allow(clippy::too_many_arguments)]
#[allow(clippy::disallowed_names)]
#[no_implicit_prelude]
pub mod deeper_mod {
#prelude
struct SomeStruct1;
}
}
#[allow(clippy::too_many_arguments)]
#[allow(clippy::disallowed_names)]
#[no_implicit_prelude]
pub mod different_mod {
#prelude
Expand Down
16 changes: 1 addition & 15 deletions packages/fuels-test-helpers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ repository = { workspace = true }
rust-version = { workspace = true }
description = "Fuel Rust SDK test helpers."

[package.metadata.cargo-machete]
ignored = ["async-graphql", "async-graphql-derive"]

[dependencies]
fuel-core = { workspace = true, default-features = false, features = [
"test-helpers",
Expand All @@ -33,20 +30,9 @@ rand = { workspace = true, default-features = false }
tempfile = { workspace = true, default-features = false }
tokio = { workspace = true, default-features = false }
which = { workspace = true, default-features = false }
# fuel-core uses these deps. We need to list them here so that we can pin them
# to =7.0.11 even though fuel-core can accepts 7.0.11 onwards. 7.0.12 bumped the
# MSRV and broke the sdk build for users using anything less than Rust 1.81.
#
# Until the SDK MSRV reaches 1.81 we need to freeze these packages to 7.0.11
async-graphql = { workspace = true, optional = true }
async-graphql-derive = { workspace = true, optional = true }

[features]
default = ["fuels-accounts", "std"]
std = ["fuels-accounts?/std", "fuels-core/std", "fuel-core-chain-config/std"]
fuel-core-lib = [
"dep:fuel-core",
"dep:async-graphql",
"dep:async-graphql-derive",
]
fuel-core-lib = ["dep:fuel-core"]
rocksdb = ["fuel-core?/rocksdb"]

0 comments on commit bacf2a1

Please sign in to comment.