cleanup

Author: Grant Wuerker

crates/common/src/urlext.rs

@@ -1,3 +1,4 @@
+use camino::Utf8PathBuf;
 use url::Url;
 
 #[derive(Debug)]
@@ -51,6 +52,13 @@ impl UrlExt for Url {
     }
 }
 
+pub fn canonical_url(path: &Utf8PathBuf) -> Result<Url, ()> {
+    Ok(
+        Url::from_directory_path(path.canonicalize_utf8().map_err(|_| ())?.as_str())
+            .map_err(|_| ())?,
+    )
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

crates/driver/src/lib.rs

@@ -4,7 +4,7 @@ pub mod files;
 
 use camino::Utf8PathBuf;
 
-use common::InputDb;
+use common::{urlext::canonical_url, InputDb};
 pub use db::DriverDataBase;
 
 use common::{
@@ -24,15 +24,14 @@ pub fn setup_workspace(
     path: &Utf8PathBuf,
 ) -> (DriverDataBase, Workspace, Vec<WorkspaceSetupDiagnostics>) {
     let mut db = DriverDataBase::default();
+    let ingot_url = canonical_url(path).unwrap();
     let workspace = db.workspace();
     let node_handler = InputNodeHandler {
         db: &mut db,
         workspace,
     };
     let mut ingot_graph_resolver = ingot_graph_resolver(node_handler);
-    let _graph = ingot_graph_resolver
-        .transient_resolve(&Url::from_directory_path(&path.canonicalize_utf8().unwrap()).unwrap())
-        .unwrap();
+    let _graph = ingot_graph_resolver.transient_resolve(&ingot_url).unwrap();
 
     let diagnostics = ingot_graph_resolver
         .take_diagnostics()

crates/fe/src/check.rs

@@ -1,4 +1,5 @@
 use camino::Utf8PathBuf;
+use common::urlext::canonical_url;
 use url::Url;
 
 pub fn check(path: &Utf8PathBuf) {
@@ -9,14 +10,8 @@ pub fn check(path: &Utf8PathBuf) {
     }
 
     let ingot = workspace
-        .containing_ingot(
-            &db,
-            &Url::from_file_path(path.canonicalize_utf8().unwrap().join("fe.toml")).unwrap(),
-            // &Url::from_directory_path(path.canonicalize_utf8().unwrap())
-            //     .unwrap()
-            //     .directory()
-            //     .unwrap(),
-        )
+        // should probably get url from setup
+        .containing_ingot(&db, &canonical_url(path).unwrap())
         .unwrap();
     let diags = db.run_on_ingot(ingot);
     diags.emit(&db);

crates/fe/src/tree.rs

@@ -1,7 +1,10 @@
 use std::collections::{HashMap, HashSet};
 
 use camino::Utf8PathBuf;
-use common::config::{Config, IngotArguments};
+use common::{
+    config::{Config, IngotArguments},
+    urlext::canonical_url,
+};
 use resolver::{
     graph::{petgraph, DiGraph, NodeIndex},
     ingot::basic_ingot_graph_resolver,
@@ -12,16 +15,13 @@ use url::Url;
 
 pub fn print_tree(path: &Utf8PathBuf) {
     let mut graph_resolver = basic_ingot_graph_resolver();
-    let c_path = &path.canonicalize_utf8().unwrap();
-    println!("{c_path}");
-    let ingot_graph = graph_resolver
-        .transient_resolve(&Url::from_directory_path(c_path.as_str()).unwrap())
-        .unwrap();
+    let ingot_url = canonical_url(path).unwrap();
+    let ingot_graph = graph_resolver.transient_resolve(&ingot_url).unwrap();
     print!(
         "{}",
         print_tree_impl(
             &ingot_graph,
-            &Url::from_directory_path(c_path.as_str()).unwrap(),
+            &ingot_url,
             &graph_resolver.node_handler.configs
         )
     );