Use iterators to clean up disown logic

src/builtins/disown.rs

@@ -80,37 +80,39 @@ pub fn disown(parser: &Parser, streams: &mut IoStreams, args: &mut [&wstr]) -> O
             retval = STATUS_CMD_ERROR;
         }
     } else {
-        let mut jobs = vec![];
-
         retval = STATUS_CMD_OK;
 
         // If one argument is not a valid pid (i.e. integer >= 0), fail without disowning anything,
         // but still print errors for all of them.
         // Non-existent jobs aren't an error, but information about them is useful.
-        // Multiple PIDs may refer to the same job; include the job only once by using a set.
+        let mut jobs: Vec<_> = args[1..]
-        for arg in &args[1..] {
+            .iter()
-            match fish_wcstoi(arg).ok().and_then(Pid::new) {
+            .filter_map(|arg| {
-                None => {
+                // Attempt to convert the argument to a PID.
-                    streams.err.append(wgettext_fmt!(
+                match fish_wcstoi(arg).ok().and_then(Pid::new) {
-                        "%ls: '%ls' is not a valid job specifier\n",
+                    None => {
-                        cmd,
+                        // Invalid identifier
-                        arg
+                        streams.err.append(wgettext_fmt!(
-                    ));
+                            "%ls: '%ls' is not a valid job specifier\n",
-                    retval = STATUS_INVALID_ARGS;
+                            cmd,
-                }
+                            arg
-                Some(pid) => {
+                        ));
-                    if let Some(j) = parser.job_get_from_pid(pid) {
+                        retval = STATUS_INVALID_ARGS;
-                        jobs.push(j);
+                        None
-                    } else {
+                    }
+                    Some(pid) => parser.job_get_from_pid(pid).or_else(|| {
+                        // Valid identifier but no such job
                         streams.err.append(wgettext_fmt!(
                             "%ls: Could not find job '%d'\n",
                             cmd,
                             pid
                         ));
-                    }
+                        None
+                    }),
                 }
-            }
+            })
-        }
+            .collect();
+
         if retval != STATUS_CMD_OK {
             return retval;
         }