sh: collapse nested if

grisenti · grisenti · commit e188d0bd1e61 · 2025-03-27T15:55:09.000+01:00
diff --git a/sh/src/wordexp/mod.rs b/sh/src/wordexp/mod.rs
@@ -62,13 +62,12 @@ fn split_generated_unquoted_literal(
                         None => break 'outer,
                     }
                 }
+            } else if let Some(c) = iter.next() {
+                next_char = c;
             } else {
-                if let Some(c) = iter.next() {
-                    next_char = c;
-                } else {
-                    break;
-                }
+                break;
             }
+
             if !accumulator.is_empty() {
                 last_word.append(accumulator, false, false);
                 accumulator = String::new();

Original file line number	Diff line number	Diff line change
`@@ -62,13 +62,12 @@ fn split_generated_unquoted_literal(`
`62`	`62`	`None => break 'outer,`
`63`	`63`	`}`
`64`	`64`	`}`
	`65`	`+ } else if let Some(c) = iter.next() {`
	`66`	`+ next_char = c;`
`65`	`67`	`} else {`
`66`		`- if let Some(c) = iter.next() {`
`67`		`- next_char = c;`
`68`		`- } else {`
`69`		`- break;`
`70`		`- }`
	`68`	`+ break;`
`71`	`69`	`}`
	`70`	`+`
`72`	`71`	`if !accumulator.is_empty() {`
`73`	`72`	`last_word.append(accumulator, false, false);`
`74`	`73`	`accumulator = String::new();`