fix: small refactors

Signed-off-by: Andrew Steurer <94206073+asteurer@users.noreply.github.com>

Author: asteurer

src/bindings.rs

@@ -1,4 +1,4 @@
-use crate::common::parse_wit;
+use crate::common::{make_path_absolute, parse_wit};
 use anyhow::Result;
 use std::path::{Path, PathBuf};
 
@@ -29,13 +29,7 @@ pub fn generate_bindings(
     .generate(&resolve, world, &mut files)?;
 
     let output_path = match output {
-        Some(p) => {
-            if p.is_relative() {
-                std::env::current_dir()?.join(p)
-            } else {
-                p.to_path_buf()
-            }
-        }
+        Some(p) => make_path_absolute(&p.to_path_buf())?,
         None => PathBuf::from("."),
     };
 

src/common.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use wit_parser::{PackageId, Resolve, WorldId};
 
 pub fn parse_wit(
@@ -39,3 +39,12 @@ pub fn parse_wit(
     let world = resolve.select_world(&main_packages, world)?;
     Ok((resolve, world))
 }
+
+// Converts a relative path to an absolute path.
+pub fn make_path_absolute(p: &PathBuf) -> Result<PathBuf> {
+    if p.is_relative() {
+        Ok(std::env::current_dir()?.join(p))
+    } else {
+        Ok(p.to_owned())
+    }
+}

src/componentize.rs

@@ -1,4 +1,4 @@
-use crate::common::parse_wit;
+use crate::common::{make_path_absolute, parse_wit};
 use anyhow::{Context, Result, anyhow};
 use std::{path::PathBuf, process::Command};
 
@@ -91,26 +91,14 @@ pub fn build_wasm_core_module(
     go_path: Option<PathBuf>,
 ) -> Result<PathBuf> {
     let go = match &go_path {
-        Some(p) => {
-            if p.is_relative() {
-                std::env::current_dir()?.join(p)
-            } else {
-                p.to_path_buf()
-            }
-        }
+        Some(p) => make_path_absolute(p)?,
         None => PathBuf::from("go"),
     };
 
     check_go_version(&go)?;
 
     let out_path_buf = match &out {
-        Some(p) => {
-            if p.is_relative() {
-                std::env::current_dir()?.join(p)
-            } else {
-                p.to_path_buf()
-            }
-        }
+        Some(p) => make_path_absolute(p)?,
         None => std::env::current_dir()?.join("main.wasm"),
     };
 
@@ -121,9 +109,8 @@ pub fn build_wasm_core_module(
     }
 
     let out_path = out_path_buf
-        .into_os_string()
-        .into_string()
-        .map_err(|_| anyhow!("Output path is not valid unicode"))?;
+        .to_str()
+        .ok_or_else(|| anyhow!("Output path is not valid unicode"))?;
 
     let module_path = match &go_module {
         Some(p) => {
@@ -144,7 +131,7 @@ pub fn build_wasm_core_module(
             "-buildmode=c-shared",
             "-ldflags=-checklinkname=0",
             "-o",
-            &out_path,
+            out_path,
         ])
         .env("GOOS", "wasip1")
         .env("GOARCH", "wasm")