From 788ece1fdbbc191a88dddb5d071428e57adc8018 Mon Sep 17 00:00:00 2001 From: Robin Avery Date: Fri, 1 Mar 2024 14:01:21 -0500 Subject: [PATCH] Call `resolve_paths` in slightly fewer cases --- objdiff-cli/src/cmd/diff.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/objdiff-cli/src/cmd/diff.rs b/objdiff-cli/src/cmd/diff.rs index 725fc5a..ec15f35 100644 --- a/objdiff-cli/src/cmd/diff.rs +++ b/objdiff-cli/src/cmd/diff.rs @@ -78,9 +78,8 @@ pub fn run(args: Args) -> Result<()> { PathBuf::from_str(u).ok().and_then(|p| fs::canonicalize(p).ok()); let Some(object) = project_config.objects.iter_mut().find_map(|obj| { - resolve_paths(obj); - if obj.name.as_deref() == Some(u) { + resolve_paths(obj); return Some(obj); } @@ -88,6 +87,8 @@ pub fn run(args: Args) -> Result<()> { return None; }; + resolve_paths(obj); + if [&obj.base_path, &obj.target_path] .into_iter() .filter_map(|p| p.as_ref().and_then(|p| p.canonicalize().ok()))