Skip to content

Commit

Permalink
Code review
Browse files Browse the repository at this point in the history
  • Loading branch information
ax0 committed Mar 24, 2023
1 parent abb6133 commit 385d146
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions crates/nargo/src/resolver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ impl<'a> Resolver<'a> {
let crate_id = driver.create_local_crate(entry_path, crate_type);

let mut resolver = Resolver::with_driver(&mut driver);
resolver.resolve_manifest(crate_id, manifest, manifest_path.parent().unwrap())?;
let pkg_root = manifest_path.parent().expect("Every manifest path has a parent.");
resolver.resolve_manifest(crate_id, manifest, pkg_root)?;

add_std_lib(&mut driver);
Ok(driver)
Expand Down Expand Up @@ -128,7 +129,7 @@ impl<'a> Resolver<'a> {
return Err(DependencyResolutionError::RemoteDepWithLocalDep { dependency_path });
}
let mut new_res = Resolver::with_driver(self.driver);
new_res.resolve_manifest(crate_id, dep_meta.manifest, pkg_root)?;
new_res.resolve_manifest(crate_id, dep_meta.manifest, &dependency_path)?;
}
Ok(())
}
Expand Down

0 comments on commit 385d146

Please sign in to comment.