Skip to content

Commit 224b93e

Browse files
committed
numfmt: inline next_field_index into split_next_field
Remove the trivial single-use helper and simplify split_next_field into a compact 4-line function.
1 parent 3fdd942 commit 224b93e

1 file changed

Lines changed: 4 additions & 11 deletions

File tree

src/uu/numfmt/src/format.rs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -228,19 +228,12 @@ fn apply_grouping(s: &str) -> String {
228228
grouped
229229
}
230230

231-
fn next_field_index(s: &str) -> usize {
232-
s.find(char::is_whitespace).unwrap_or(s.len())
233-
}
234-
235231
fn split_next_field<'a>(s: &'a str) -> (&'a str, &'a str, &'a str) {
236232
let prefix_len = s.find(|c: char| !c.is_whitespace()).unwrap_or(s.len());
237-
let prefix = &s[..prefix_len];
238-
let field_start = prefix_len;
239-
let field_len = next_field_index(&s[field_start..]);
240-
let field_end = field_start + field_len;
241-
let field = &s[field_start..field_end];
242-
let rest = &s[field_end..];
243-
(prefix, field, rest)
233+
let field_end = s[prefix_len..]
234+
.find(char::is_whitespace)
235+
.map_or(s.len(), |i| prefix_len + i);
236+
(&s[..prefix_len], &s[prefix_len..field_end], &s[field_end..])
244237
}
245238

246239
/// When an explicit whitespace unit separator is set (e.g. `--unit-separator=" "`),

0 commit comments

Comments
 (0)