Added canonicalization for load_paths

myFavShrimp · Aug 2, 2023 · f474322 · f474322
1 parent 9fd6e0b
commit f474322
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/lib/turf_internals/src/settings.rs b/lib/turf_internals/src/settings.rs
@@ -2,6 +2,8 @@ use std::path::PathBuf;
 
 use serde::Deserialize;
 
+use crate::path::canonicalize;
+
 #[derive(Deserialize, Debug, Default, Clone)]
 pub struct Settings {
     pub(crate) debug: Option<bool>,
@@ -15,13 +17,22 @@ impl Settings {
     pub fn debug_enabled(&self) -> bool {
         self.debug.unwrap_or(false)
     }
+
+    pub fn canonicalized_load_paths(&self) -> Vec<PathBuf> {
+        self.load_paths
+            .clone()
+            .unwrap_or(Default::default())
+            .into_iter()
+            .map(canonicalize)
+            .collect()
+    }
 }
 
 impl<'a> From<Settings> for grass::Options<'a> {
     fn from(val: Settings) -> Self {
         grass::Options::default()
             .style(grass::OutputStyle::Expanded)
-            .load_paths(&val.load_paths.unwrap_or(Default::default()))
+            .load_paths(&val.canonicalized_load_paths())
     }
 }
 

diff --git a/tests/load_settings_from_cargo_manifest/Cargo.toml b/tests/load_settings_from_cargo_manifest/Cargo.toml
@@ -14,5 +14,5 @@ path = "../../lib/turf"
 path = "../../lib/turf_internals"
 
 [package.metadata.turf]
-load_paths = ["variables"]
+load_paths = ["../variables"]
 minify = false