From e5f6be7db4a0c2756cad0a7c8186a5a180873f7a Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Mon, 8 Sep 2025 09:48:01 +0200 Subject: [PATCH] strftime: move error() method below caller --- src/format/strftime.rs | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/format/strftime.rs b/src/format/strftime.rs index 1f2e3ee3..660abb6f 100644 --- a/src/format/strftime.rs +++ b/src/format/strftime.rs @@ -426,22 +426,6 @@ impl<'a> StrftimeItems<'a> { .collect() } - fn error<'b>( - &mut self, - original: &'b str, - error_len: &mut usize, - ch: Option, - ) -> (&'b str, Item<'b>) { - if !self.lenient { - return (&original[*error_len..], Item::Error); - } - - if let Some(c) = ch { - *error_len -= c.len_utf8(); - } - (&original[*error_len..], Item::Literal(&original[..*error_len])) - } - fn parse_next_item(&mut self, mut remainder: &'a str) -> Option<(&'a str, Item<'a>)> { use InternalInternal::*; use Item::{Literal, Space}; @@ -732,6 +716,22 @@ impl<'a> StrftimeItems<'a> { } } + fn error<'b>( + &mut self, + original: &'b str, + error_len: &mut usize, + ch: Option, + ) -> (&'b str, Item<'b>) { + if !self.lenient { + return (&original[*error_len..], Item::Error); + } + + if let Some(c) = ch { + *error_len -= c.len_utf8(); + } + (&original[*error_len..], Item::Literal(&original[..*error_len])) + } + #[cfg(feature = "unstable-locales")] fn switch_to_locale_str( &mut self,