cmp.rs: simplify by .ok_or

oech3 · web-flow · commit b553e0372f1e · 2026-06-10T02:30:50.000+09:00
diff --git a/src/cmp.rs b/src/cmp.rs
@@ -71,9 +71,7 @@ fn is_stdout_dev_null() -> bool {
 }
 
 pub fn parse_params<I: Iterator<Item = OsString>>(mut opts: Peekable<I>) -> Result<Params, String> {
-    let Some(executable) = opts.next() else {
-        return Err("Usage: <exe> <from> <to>".to_string());
-    };
+    let executable = opts.next().ok_or("Usage: <exe> <from> <to>".to_string())?;
     let executable_str = executable.to_string_lossy().to_string();
 
     let parse_skip = |param: &str, skip_desc: &str| -> Result<SkipU64, String> {

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,7 @@ fn is_stdout_dev_null() -> bool {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`pub fn parse_params<I: Iterator<Item = OsString>>(mut opts: Peekable<I>) -> Result<Params, String> {`
`74`		`- let Some(executable) = opts.next() else {`
`75`		`- return Err("Usage: <exe> <from> <to>".to_string());`
`76`		`- };`
	`74`	`+ let executable = opts.next().ok_or("Usage: <exe> <from> <to>".to_string())?;`
`77`	`75`	`let executable_str = executable.to_string_lossy().to_string();`
`78`	`76`
`79`	`77`	`let parse_skip = \|param: &str, skip_desc: &str\| -> Result<SkipU64, String> {`