Tweak style for new WithAnsi code

djc · djc · commit ddf9426b7044 · 2025-06-28T16:02:55.000+02:00
diff --git a/src/ansi.rs b/src/ansi.rs
@@ -206,18 +206,19 @@ pub fn strip_ansi_codes(s: &str) -> Cow<str> {
 pub struct WithoutAnsi<'a> {
     str: &'a str,
 }
+
 impl<'a> WithoutAnsi<'a> {
     pub fn new(str: &'a str) -> Self {
         Self { str }
     }
 }
+
 impl Display for WithoutAnsi<'_> {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-        for str in
-            AnsiCodeIterator::new(self.str)
-                .filter_map(|(str, is_ansi)| if is_ansi { None } else { Some(str) })
-        {
-            f.write_str(str)?;
+        for (str, is_ansi) in AnsiCodeIterator::new(self.str) {
+            if !is_ansi {
+                f.write_str(str)?;
+            }
         }
         Ok(())
     }

Original file line number	Diff line number	Diff line change
`@@ -206,18 +206,19 @@ pub fn strip_ansi_codes(s: &str) -> Cow<str> {`
`206`	`206`	`pub struct WithoutAnsi<'a> {`
`207`	`207`	`str: &'a str,`
`208`	`208`	`}`
	`209`	`+`
`209`	`210`	`impl<'a> WithoutAnsi<'a> {`
`210`	`211`	`pub fn new(str: &'a str) -> Self {`
`211`	`212`	`Self { str }`
`212`	`213`	`}`
`213`	`214`	`}`
	`215`	`+`
`214`	`216`	`impl Display for WithoutAnsi<'_> {`
`215`	`217`	`fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {`
`216`		`- for str in`
`217`		`- AnsiCodeIterator::new(self.str)`
`218`		`- .filter_map(\|(str, is_ansi)\| if is_ansi { None } else { Some(str) })`
`219`		`- {`
`220`		`- f.write_str(str)?;`
	`218`	`+ for (str, is_ansi) in AnsiCodeIterator::new(self.str) {`
	`219`	`+ if !is_ansi {`
	`220`	`+ f.write_str(str)?;`
	`221`	`+ }`
`221`	`222`	`}`
`222`	`223`	`Ok(())`
`223`	`224`	`}`