Skip to content

Commit ed823d2

Browse files
authored
Bump minimal required rust version to 1.87.0 (#3613)
<!-- Reference any GitHub issues resolved by this PR --> Closes # ## Introduced changes <!-- A brief description of the changes --> - ## Checklist <!-- Make sure all of these are complete --> - [ ] Linked relevant issue - [ ] Updated relevant documentation - [ ] Added relevant tests - [ ] Performed self-review of the code - [ ] Added changes to `CHANGELOG.md`
1 parent b409921 commit ed823d2

30 files changed

+46
-43
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Forge
1111

12+
#### Changed
13+
14+
- If using a Scarb version before `2.10.0` or not using `allow-prebuild-plugins`, the minimal required rust version to run `snforge` is now `1.87.0`
15+
1216
### Cast
1317

1418
#### Fixed

crates/forge/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ mod warn;
3535

3636
pub const CAIRO_EDITION: &str = "2024_07";
3737

38-
const MINIMAL_RUST_VERSION: Version = Version::new(1, 80, 1);
38+
const MINIMAL_RUST_VERSION: Version = Version::new(1, 87, 0);
3939
const MINIMAL_SCARB_VERSION: Version = Version::new(2, 9, 1);
4040
const MINIMAL_RECOMMENDED_SCARB_VERSION: Version = Version::new(2, 9, 4);
4141
const MINIMAL_SCARB_VERSION_PREBUILT_PLUGIN: Version = Version::new(2, 10, 0);

crates/snforge-scarb-plugin/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[package]
22
name = "snforge_scarb_plugin"
33
version = "0.47.0"
4-
edition = "2021"
4+
edition = "2024"
55
publish = false
6-
rust-version = "1.80.1"
6+
rust-version = "1.87.0"
77

88
[lib]
99
crate-type = ["rlib", "cdylib"]

crates/snforge-scarb-plugin/src/args.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use crate::attributes::{AttributeInfo, ErrorExt};
33
use cairo_lang_macro::Diagnostic;
44
use cairo_lang_parser::utils::SimpleParserDatabase;
55
use cairo_lang_syntax::node::{
6-
ast::{ArgClause, Expr, OptionArgListParenthesized},
76
Terminal,
7+
ast::{ArgClause, Expr, OptionArgListParenthesized},
88
};
99
use smol_str::SmolStr;
1010
use std::collections::HashMap;

crates/snforge-scarb-plugin/src/attributes/available_gas.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::{
66
config_statement::extend_with_config_cheatcodes,
77
types::{Number, ParseFromExpr},
88
};
9-
use cairo_lang_macro::{quote, Diagnostic, Diagnostics, ProcMacroResult, Severity, TokenStream};
9+
use cairo_lang_macro::{Diagnostic, Diagnostics, ProcMacroResult, Severity, TokenStream, quote};
1010
use cairo_lang_parser::utils::SimpleParserDatabase;
1111

1212
pub struct AvailableGasCollector;

crates/snforge-scarb-plugin/src/attributes/disable_predeployed_contracts.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::{
33
args::Arguments, attributes::AttributeCollector,
44
config_statement::extend_with_config_cheatcodes,
55
};
6-
use cairo_lang_macro::{quote, Diagnostic, Diagnostics, ProcMacroResult, TokenStream};
6+
use cairo_lang_macro::{Diagnostic, Diagnostics, ProcMacroResult, TokenStream, quote};
77
use cairo_lang_parser::utils::SimpleParserDatabase;
88

99
pub struct PredeployedContractsCollector;

crates/snforge-scarb-plugin/src/attributes/fork.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::{
77
config_statement::extend_with_config_cheatcodes,
88
types::ParseFromExpr,
99
};
10-
use cairo_lang_macro::{quote, Diagnostic, Diagnostics, ProcMacroResult, Severity, TokenStream};
10+
use cairo_lang_macro::{Diagnostic, Diagnostics, ProcMacroResult, Severity, TokenStream, quote};
1111
use cairo_lang_parser::utils::SimpleParserDatabase;
1212
use url::Url;
1313

crates/snforge-scarb-plugin/src/attributes/fork/block_id.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::{
44
cairo_expression::CairoExpression,
55
types::{Number, ParseFromExpr},
66
};
7-
use cairo_lang_macro::{quote, Diagnostic, TokenStream};
7+
use cairo_lang_macro::{Diagnostic, TokenStream, quote};
88
use cairo_lang_parser::utils::SimpleParserDatabase;
99
use cairo_lang_syntax::node::{ast::Expr, helpers::GetIdentifier};
1010

crates/snforge-scarb-plugin/src/attributes/fuzzer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ use crate::config_statement::extend_with_config_cheatcodes;
88
use crate::parse::parse;
99
use crate::types::{Number, ParseFromExpr};
1010
use crate::utils::create_single_token;
11-
use cairo_lang_macro::{quote, Diagnostic, Diagnostics, ProcMacroResult, TokenStream};
11+
use cairo_lang_macro::{Diagnostic, Diagnostics, ProcMacroResult, TokenStream, quote};
1212
use cairo_lang_parser::utils::SimpleParserDatabase;
13-
use cairo_lang_syntax::node::with_db::SyntaxNodeWithDb;
1413
use cairo_lang_syntax::node::TypedSyntaxNode;
14+
use cairo_lang_syntax::node::with_db::SyntaxNodeWithDb;
1515
use cairo_lang_utils::Upcast;
1616
use num_bigint::BigInt;
1717

crates/snforge-scarb-plugin/src/attributes/fuzzer/wrapper.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::args::Arguments;
2+
use crate::attributes::AttributeInfo;
23
use crate::attributes::internal_config_statement::InternalConfigStatementCollector;
34
use crate::attributes::test::TestCollector;
4-
use crate::attributes::AttributeInfo;
55
use crate::common::{into_proc_macro_result, with_parsed_values};
66
use crate::format_ident;
7-
use crate::utils::{create_single_token, get_statements, SyntaxNodeUtils};
8-
use cairo_lang_macro::{quote, Diagnostic, Diagnostics, ProcMacroResult, TokenStream};
7+
use crate::utils::{SyntaxNodeUtils, create_single_token, get_statements};
8+
use cairo_lang_macro::{Diagnostic, Diagnostics, ProcMacroResult, TokenStream, quote};
99
use cairo_lang_parser::utils::SimpleParserDatabase;
1010
use cairo_lang_syntax::node::ast::{FunctionWithBody, Param};
1111
use cairo_lang_syntax::node::helpers::QueryAttrs;

0 commit comments

Comments
 (0)