Skip to content

Commit 1276f58

Browse files
authored
chore: bump compilers (#9554)
* chore: bump compilers * clippy
1 parent 2f698e4 commit 1276f58

File tree

3 files changed

+27
-13
lines changed

3 files changed

+27
-13
lines changed

Cargo.lock

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ foundry-linking = { path = "crates/linking" }
169169

170170
# solc & compilation utilities
171171
foundry-block-explorers = { version = "0.9.0", default-features = false }
172-
foundry-compilers = { version = "0.12.7", default-features = false }
172+
foundry-compilers = { version = "0.12.8", default-features = false }
173173
foundry-fork-db = "0.9.0"
174174
solang-parser = "=0.3.3"
175175
solar-ast = { version = "=0.1.0", default-features = false }

crates/config/src/lib.rs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -949,6 +949,7 @@ impl Config {
949949
}
950950

951951
/// Resolves globs and builds a mapping from individual source files to their restrictions
952+
#[expect(clippy::disallowed_macros)]
952953
fn restrictions(
953954
&self,
954955
paths: &ProjectPathsConfig,
@@ -977,7 +978,20 @@ impl Config {
977978
if !map.contains_key(source) {
978979
map.insert(source.clone(), res);
979980
} else {
980-
map.get_mut(source.as_path()).unwrap().merge(res);
981+
let value = map.remove(source.as_path()).unwrap();
982+
if let Some(merged) = value.clone().merge(res) {
983+
map.insert(source.clone(), merged);
984+
} else {
985+
// `sh_warn!` is a circular dependency, preventing us from using it here.
986+
eprintln!(
987+
"{}",
988+
yansi::Paint::yellow(&format!(
989+
"Failed to merge compilation restrictions for {}",
990+
source.display()
991+
))
992+
);
993+
map.insert(source.clone(), value);
994+
}
981995
}
982996
}
983997
}

0 commit comments

Comments
 (0)