From a718852ad4da3e34f2f888d1904f7493c06cd97c Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sat, 18 Nov 2023 18:39:53 -0800 Subject: [PATCH] Fix a typo and suppress an annoying clippy lint --- fish-rust/src/io.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fish-rust/src/io.rs b/fish-rust/src/io.rs index b51042869..ad33e5f71 100644 --- a/fish-rust/src/io.rs +++ b/fish-rust/src/io.rs @@ -664,6 +664,7 @@ impl IoChain { /// Attempt to resolve a list of redirection specs to IOs, appending to 'this'. /// \return true on success, false on error, in which case an error will have been printed. + #[allow(clippy::collapsible_else_if)] pub fn append_from_specs(&mut self, specs: &RedirectionSpecList, pwd: &wstr) -> bool { let mut have_error = false; for spec in specs { @@ -679,7 +680,7 @@ impl IoChain { } } _ => { - // We have a path-based redireciton. Resolve it to a file. + // We have a path-based redirection. Resolve it to a file. // Mark it as CLO_EXEC because we don't want it to be open in any child. let path = path_apply_working_directory(&spec.target, pwd); let oflags = spec.oflags();