diff --git a/src/uu/dd/Cargo.toml b/src/uu/dd/Cargo.toml index 0a69ae374..aa19dc760 100644 --- a/src/uu/dd/Cargo.toml +++ b/src/uu/dd/Cargo.toml @@ -18,7 +18,7 @@ path = "src/dd.rs" clap = { workspace = true } gcd = { workspace = true } libc = { workspace = true } -uucore = { workspace = true, features = ["memo"] } +uucore = { workspace = true, features = ["format"] } [target.'cfg(any(target_os = "linux"))'.dependencies] nix = { workspace = true, features = ["fs"] } diff --git a/src/uu/dd/src/progress.rs b/src/uu/dd/src/progress.rs index a9d29ff63..674d90984 100644 --- a/src/uu/dd/src/progress.rs +++ b/src/uu/dd/src/progress.rs @@ -14,7 +14,7 @@ use std::sync::mpsc; use std::time::Duration; use uucore::error::UResult; -use uucore::memo::sprintf; +use uucore::format::sprintf; use crate::numbers::{to_magnitude_and_suffix, SuffixType}; diff --git a/src/uu/printf/Cargo.toml b/src/uu/printf/Cargo.toml index eefcf33c0..9acd2c78c 100644 --- a/src/uu/printf/Cargo.toml +++ b/src/uu/printf/Cargo.toml @@ -16,7 +16,7 @@ path = "src/printf.rs" [dependencies] clap = { workspace = true } -uucore = { workspace = true, features = ["memo"] } +uucore = { workspace = true, features = ["format"] } [[bin]] name = "printf" diff --git a/src/uu/printf/src/printf.rs b/src/uu/printf/src/printf.rs index bf79369cc..042e0932e 100644 --- a/src/uu/printf/src/printf.rs +++ b/src/uu/printf/src/printf.rs @@ -4,7 +4,7 @@ use clap::{crate_version, Arg, ArgAction, Command}; use uucore::error::{UResult, UUsageError}; -use uucore::memo::printf; +use uucore::format::printf; use uucore::{format_usage, help_about, help_section, help_usage}; const VERSION: &str = "version"; diff --git a/src/uu/seq/Cargo.toml b/src/uu/seq/Cargo.toml index 2646d3609..41b42ef83 100644 --- a/src/uu/seq/Cargo.toml +++ b/src/uu/seq/Cargo.toml @@ -20,7 +20,7 @@ bigdecimal = { workspace = true } clap = { workspace = true } num-bigint = { workspace = true } num-traits = { workspace = true } -uucore = { workspace = true, features = ["memo"] } +uucore = { workspace = true, features = ["format"] } [[bin]] name = "seq" diff --git a/src/uu/seq/src/seq.rs b/src/uu/seq/src/seq.rs index 2e55efa4a..0dd65fc3f 100644 --- a/src/uu/seq/src/seq.rs +++ b/src/uu/seq/src/seq.rs @@ -4,15 +4,12 @@ // * file that was distributed with this source code. // spell-checker:ignore (ToDO) istr chiter argptr ilen extendedbigdecimal extendedbigint numberparse use std::io::{stdout, ErrorKind, Write}; -use std::process::exit; use clap::{crate_version, Arg, ArgAction, Command}; use num_traits::Zero; -use uucore::error::FromIo; use uucore::error::UResult; -use uucore::memo::printf; -use uucore::show; +use uucore::format::printf; use uucore::{format_usage, help_about, help_usage}; mod error; @@ -251,7 +248,7 @@ fn print_seq( pad: bool, padding: usize, format: Option<&str>, -) -> std::io::Result<()> { +) -> UResult<()> { let stdout = stdout(); let mut stdout = stdout.lock(); let (first, increment, last) = range; @@ -277,10 +274,7 @@ fn print_seq( match format { Some(f) => { let s = format!("{value}"); - if let Err(x) = printf(f, &[s]) { - show!(x); - exit(1); - } + printf(f, &[s])?; } None => write_value_float( &mut stdout, @@ -322,7 +316,7 @@ fn print_seq_integers( pad: bool, padding: usize, format: Option<&str>, -) -> std::io::Result<()> { +) -> UResult<()> { let stdout = stdout(); let mut stdout = stdout.lock(); let (first, increment, last) = range; @@ -342,10 +336,7 @@ fn print_seq_integers( match format { Some(f) => { let s = format!("{value}"); - if let Err(x) = printf(f, &[s]) { - show!(x); - exit(1); - } + printf(f, &[s])?; } None => write_value_int(&mut stdout, &value, padding, pad, is_first_iteration)?, }