Merge pull request #42 from axodotdev/guppy_rexport

Reexport guppy type we expose
axodotdev · Oct 30, 2023 · dcb9532 · dcb9532
2 parents 93286c1 + dfcd5c0
commit dcb9532
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,7 +33,7 @@ axocli = { version = "0.1.0", optional = true }
 camino = "1.1.4"
 console = "0.15.5"
 miette = "5.6.0"
-guppy = { version = "0.15.2", optional = true }
+guppy = { version = "0.17.1", optional = true }
 tracing = "0.1.37"
 oro-common = { version = "0.3.14", optional = true }
 serde_json = "1.0.94"

diff --git a/src/lib.rs b/src/lib.rs
@@ -13,6 +13,9 @@ use camino::{Utf8Path, Utf8PathBuf};
 use errors::{AxoprojectError, Result};
 use tracing::info;
 
+#[cfg(feature = "cargo-projects")]
+pub use guppy::PackageId;
+
 pub mod changelog;
 pub mod errors;
 #[cfg(feature = "npm-projects")]
@@ -281,7 +284,7 @@ pub struct PackageInfo {
     pub cargo_metadata_table: Option<serde_json::Value>,
     /// A unique id used by Cargo to refer to the package
     #[cfg(feature = "cargo-projects")]
-    pub cargo_package_id: Option<guppy::PackageId>,
+    pub cargo_package_id: Option<PackageId>,
 }
 
 impl PackageInfo {
@@ -536,7 +539,7 @@ pub fn find_file(
             .unwrap_or(true);
 
         if improperly_nested {
-            return Err(AxoassetError::SearchFailed {
+            Err(AxoassetError::SearchFailed {
                 start_dir: start_dir.to_owned(),
                 desired_filename: name.to_owned(),
             })?;