Skip to content

Commit 7f413c3

Browse files
committed
strftime: yield None early
1 parent 9d5dfe1 commit 7f413c3

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

src/format/strftime.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -431,12 +431,9 @@ impl<'a> StrftimeItems<'a> {
431431
use Item::{Literal, Space};
432432
use Numeric::*;
433433

434-
match remainder.chars().next() {
435-
// we are done
436-
None => None,
437-
434+
match remainder.chars().next()? {
438435
// the next item is a specifier
439-
Some('%') => {
436+
'%' => {
440437
let original = remainder;
441438
remainder = &remainder[1..];
442439
let mut error_len = 0;
@@ -664,7 +661,7 @@ impl<'a> StrftimeItems<'a> {
664661
}
665662

666663
// the next item is space
667-
Some(c) if c.is_whitespace() => {
664+
c if c.is_whitespace() => {
668665
// `%` is not a whitespace, so `c != '%'` is redundant
669666
let nextspec =
670667
remainder.find(|c: char| !c.is_whitespace()).unwrap_or(remainder.len());

0 commit comments

Comments
 (0)