chore: clarify version cache lock (foundry-rs#160)

idk if this changes anything, make the lock a separate variable

Author: DaniPopes

crates/compilers/src/artifact_output/mod.rs

@@ -276,9 +276,8 @@ impl<T> Artifacts<T> {
     pub fn artifacts<O: ArtifactOutput<Artifact = T>>(
         &self,
     ) -> impl Iterator<Item = (ArtifactId, &T)> + '_ {
-        self.0.iter().flat_map(|(file, contract_artifacts)| {
+        self.0.iter().flat_map(|(source, contract_artifacts)| {
             contract_artifacts.iter().flat_map(move |(_contract_name, artifacts)| {
-                let source = file.clone();
                 artifacts.iter().filter_map(move |artifact| {
                     O::contract_name(&artifact.file).map(|name| {
                         (
@@ -302,9 +301,9 @@ impl<T> Artifacts<T> {
     pub fn into_artifacts<O: ArtifactOutput<Artifact = T>>(
         self,
     ) -> impl Iterator<Item = (ArtifactId, T)> {
-        self.0.into_iter().flat_map(|(file, contract_artifacts)| {
+        self.0.into_iter().flat_map(|(source, contract_artifacts)| {
             contract_artifacts.into_iter().flat_map(move |(_contract_name, artifacts)| {
-                let source = file.clone();
+                let source = source.clone();
                 artifacts.into_iter().filter_map(move |artifact| {
                     O::contract_name(&artifact.file).map(|name| {
                         (

crates/compilers/src/compilers/mod.rs

@@ -279,7 +279,11 @@ pub(crate) fn cache_version(
     f: impl FnOnce(&Path) -> Result<Version>,
 ) -> Result<Version> {
     static VERSION_CACHE: OnceLock<Mutex<HashMap<PathBuf, Version>>> = OnceLock::new();
-    Ok(match VERSION_CACHE.get_or_init(|| Mutex::new(HashMap::new())).lock().unwrap().entry(path) {
+    let mut lock = VERSION_CACHE
+        .get_or_init(|| Mutex::new(HashMap::new()))
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner);
+    Ok(match lock.entry(path) {
         std::collections::hash_map::Entry::Occupied(entry) => entry.into_mut(),
         std::collections::hash_map::Entry::Vacant(entry) => {
             let value = f(entry.key())?;