Refactor check_nix_file to use to_problem closure

NixOS · Mar 24, 2024 · d32d4cf · d32d4cf
1 parent 7eaa754
commit d32d4cf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/src/eval.rs b/src/eval.rs
@@ -352,7 +352,7 @@ fn by_name_override(
     location: Location,
     relative_location_file: RelativePathBuf,
 ) -> validation::Validation<ratchet::RatchetState<ratchet::ManualDefinition>> {
-    let to_problem = |kind| -> NixpkgsProblem {
+    let to_problem = |kind| {
         NixpkgsProblem::ByNameOverrideProblem(ByNameOverrideError {
             package_name: attribute_name.to_owned(),
             file: relative_location_file,

diff --git a/src/references.rs b/src/references.rs
@@ -130,34 +130,35 @@ fn check_nix_file(
                 return Success(());
             };
 
+            let to_problem = |kind| {
+                NixpkgsProblem::NixFileProblem(NixFileError {
+                    relative_package_dir: relative_package_dir.to_owned(),
+                    subpath: subpath.to_owned(),
+                    line: nix_file.line_index.line(node.text_range().start().into()),
+                    text: node.text().to_string(),
+                    kind,
+                })
+            };
+
             use crate::nix_file::ResolvedPath;
 
-            let error_or_none = match nix_file.static_resolve_path(path, absolute_package_dir) {
-                ResolvedPath::Interpolated => Some(NixFileErrorKind::PathInterpolation),
-                ResolvedPath::SearchPath => Some(NixFileErrorKind::SearchPath),
-                ResolvedPath::Outside => Some(NixFileErrorKind::OutsidePathReference),
+            match nix_file.static_resolve_path(path, absolute_package_dir) {
+                ResolvedPath::Interpolated => {
+                    to_problem(NixFileErrorKind::PathInterpolation).into()
+                }
+                ResolvedPath::SearchPath => to_problem(NixFileErrorKind::SearchPath).into(),
+                ResolvedPath::Outside => to_problem(NixFileErrorKind::OutsidePathReference).into(),
                 ResolvedPath::Unresolvable(e) => {
-                    Some(NixFileErrorKind::UnresolvablePathReference {
+                    to_problem(NixFileErrorKind::UnresolvablePathReference {
                         io_error: e.to_string(),
                     })
+                    .into()
                 }
                 ResolvedPath::Within(..) => {
                     // No need to handle the case of it being inside the directory, since we scan through the
                     // entire directory recursively anyways
-                    None
+                    Success(())
                 }
-            };
-            if let Some(kind) = error_or_none {
-                NixpkgsProblem::NixFileProblem(NixFileError {
-                    relative_package_dir: relative_package_dir.to_owned(),
-                    subpath: subpath.to_owned(),
-                    line: nix_file.line_index.line(node.text_range().start().into()),
-                    text: node.text().to_string(),
-                    kind,
-                })
-                .into()
-            } else {
-                Success(())
             }
         }),
     ))