Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-14 23:32:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

echo: use controlflow instead of bool

Browse source
This commit is contained in:
Terts Diepraam 2023-10-03 12:10:20 +02:00
parent 45487d47b8
commit a107374c82
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/uu/echo/src/echo.rs
View file

@ -6,6 +6,7 @@
use clap::{crate_version, Arg, ArgAction, Command}; use clap::{crate_version, Arg, ArgAction, Command};
use std::io::{self, Write}; use std::io::{self, Write};
use std::iter::Peekable; use std::iter::Peekable;
use std::ops::ControlFlow;
use std::str::Chars; use std::str::Chars;
use uucore::error::{FromIo, UResult}; use uucore::error::{FromIo, UResult};
use uucore::{format_usage, help_about, help_section, help_usage}; use uucore::{format_usage, help_about, help_section, help_usage};
@ -62,7 +63,7 @@ fn parse_code(input: &mut Peekable<Chars>, base: Base) -> Option<char> {
Some(ret.into()) Some(ret.into())
} }
fn print_escaped(input: &str, mut output: impl Write) -> io::Result<bool> { fn print_escaped(input: &str, mut output: impl Write) -> io::Result<ControlFlow<()>> {
let mut iter = input.chars().peekable(); let mut iter = input.chars().peekable();
while let Some(c) = iter.next() { while let Some(c) = iter.next() {
if c != '\\' { if c != '\\' {
@ -85,7 +86,7 @@ fn print_escaped(input: &str, mut output: impl Write) -> io::Result<bool> {
'\\' => '\\', '\\' => '\\',
'a' => '\x07', 'a' => '\x07',
'b' => '\x08', 'b' => '\x08',
'c' => return Ok(true), 'c' => return Ok(ControlFlow::Break(())),
'e' => '\x1b', 'e' => '\x1b',
'f' => '\x0c', 'f' => '\x0c',
'n' => '\n', 'n' => '\n',
@ -112,7 +113,7 @@ fn print_escaped(input: &str, mut output: impl Write) -> io::Result<bool> {
} }
} }
Ok(false) Ok(ControlFlow::Continue(()))
} }
#[uucore::main] #[uucore::main]
@ -173,8 +174,7 @@ fn execute(no_newline: bool, escaped: bool, free: &[String]) -> io::Result<()> {
write!(output, " ")?; write!(output, " ")?;
} }
if escaped { if escaped {
let should_stop = print_escaped(input, &mut output)?; if print_escaped(input, &mut output)?.is_break() {
if should_stop {
break; break;
} }
} else { } else {