Skip to content

Commit 2effc06

Browse files
committed
chore: bump 1.83
1 parent e4c5c8e commit 2effc06

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
24-
rust: ["stable", "1.81"]
24+
rust: ["stable", "1.83"]
2525
flags: ["", "--all-features"]
2626
exclude:
2727
# Skip because some features have higher MSRV.
28-
- rust: "1.81" # MSRV
28+
- rust: "1.83" # MSRV
2929
flags: "--all-features"
3030
steps:
3131
- uses: actions/checkout@v4

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ resolver = "2"
55
[workspace.package]
66
authors = ["Foundry Maintainers"]
77
version = "0.12.3"
8-
rust-version = "1.81"
8+
rust-version = "1.83"
99
readme = "README.md"
1010
license = "MIT OR Apache-2.0"
1111
repository = "https://github.com/foundry-rs/compilers"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ When updating this, also update:
2626

2727
Foundry Compilers will keep a rolling MSRV (minimum supported rust version) policy of **at
2828
least** 6 months. When increasing the MSRV, the new Rust version must have been
29-
released at least six months ago. The current MSRV is 1.81.0.
29+
released at least six months ago. The current MSRV is 1.83.0.
3030

3131
Note that the MSRV is not increased automatically, and only as part of a minor
3232
release.

clippy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
msrv = "1.81"
1+
msrv = "1.83"

crates/compilers/src/compilers/solc/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ impl<V: Ord + Copy> Restriction<V> {
201201
///
202202
/// If given None, only returns true if no restrictions are set
203203
pub fn satisfies(&self, value: Option<V>) -> bool {
204-
self.min.map_or(true, |min| value.is_some_and(|v| v >= min))
205-
&& self.max.map_or(true, |max| value.is_some_and(|v| v <= max))
204+
self.min.is_none_or(|min| value.is_some_and(|v| v >= min))
205+
&& self.max.is_none_or(|max| value.is_some_and(|v| v <= max))
206206
}
207207

208208
/// Combines two restrictions into a new one
@@ -346,7 +346,7 @@ impl CompilerSettings for SolcSettings {
346346
// Ensure that we either don't have min optimizer runs set or that the optimizer is enabled
347347
satisfies &= optimizer_runs
348348
.min
349-
.map_or(true, |min| min == 0 || self.optimizer.enabled.unwrap_or_default());
349+
.is_none_or(|min| min == 0 || self.optimizer.enabled.unwrap_or_default());
350350

351351
satisfies
352352
}

crates/compilers/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ impl<T: ArtifactOutput, C: Compiler> Project<C, T> {
403403
{
404404
let mut contracts = self.collect_contract_names()?;
405405

406-
if contracts.get(target_name).map_or(true, |paths| paths.is_empty()) {
406+
if contracts.get(target_name).is_none_or(|paths| paths.is_empty()) {
407407
return Err(SolcError::msg(format!("No contract found with the name `{target_name}`")));
408408
}
409409
let mut paths = contracts.remove(target_name).unwrap();

0 commit comments

Comments
 (0)