Skip to content

fix: don't stackoverflow when inputs.*.follows = "" #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dtomvan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: don't stackoverflow when inputs.*.follows = "" #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/flake_lock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,11 @@ impl LockFile {
}

pub fn follow_path(&self, path: impl IntoIterator<Item = impl AsRef<str>>) -> Option<String> {
path.into_iter().try_fold(self.root.clone(), |index, name| {
let mut iter = path.into_iter().peekable();
if iter.peek().is_none() {
return None;
}
iter.try_fold(self.root.clone(), |index, name| {
self.resolve_edge(&*self.get_node(index)?.get_edge(name)?)
})
}
Expand Down
22 changes: 16 additions & 6 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,19 @@ fn substitute_node_inputs_with_root_inputs(lock: &LockFile, node: &Node, indexed
elogln!("-", :yellow "'{edge_name}'", "now follows", :green "'{edge}'", :dimmed "(was '{old}')");
}
} else {
elogln!(
:bold (:cyan "No suitable replacement for", :yellow "'{edge_name}'"),
:dimmed "(" :dimmed :italic ("'" (lock.resolve_edge(&edge).unwrap()) "'") :dimmed ")"
);
if let Some(resolved_edge) = lock.resolve_edge(&edge) {
elogln!(
:bold (:cyan "No suitable replacement for", :yellow "'{edge_name}'"),
:dimmed "(" :dimmed :italic ("'" (resolved_edge) "'") :dimmed ")"
);
} else {
elogln!(
"-",
(:yellow :italic "'{edge_name}'"),
"does not resolve to anything",
:dimmed "(probably because", (:dimmed :italic "follows = \"\"") :dimmed ")"
);
}
}
}
}
Expand All @@ -255,8 +264,9 @@ fn recurse_inputs(lock: &LockFile, index: String, op: &mut impl FnMut(String)) {
let node = lock.get_node(&index).unwrap();
op(index);
for (_, edge) in node.iter_edges() {
let index = lock.resolve_edge(&edge).unwrap();
recurse_inputs(lock, index, op);
if let Some(index) = lock.resolve_edge(&edge) {
recurse_inputs(lock, index, op);
}
}
}

Expand Down