uucore: Move extendedbigdecimal and parsers to 2 separate features

fuzz/Cargo.toml

@@ -15,7 +15,7 @@ tempfile = "3.15.0"
 rand = { version = "0.9.0", features = ["small_rng"] }
 similar = "2.5.0"
 
-uucore = { path = "../src/uucore/" }
+uucore = { path = "../src/uucore/", features = ["parser"] }
 uu_date = { path = "../src/uu/date/" }
 uu_test = { path = "../src/uu/test/" }
 uu_expr = { path = "../src/uu/expr/" }

fuzz/fuzz_targets/fuzz_parse_glob.rs

@@ -1,7 +1,7 @@
 #![no_main]
 
 use libfuzzer_sys::fuzz_target;
-use uucore::parse_glob;
+use uucore::parser::parse_glob;
 
 fuzz_target!(|data: &[u8]| {
     if let Ok(s) = std::str::from_utf8(data) {

fuzz/fuzz_targets/fuzz_parse_size.rs

@@ -1,7 +1,7 @@
 #![no_main]
 
 use libfuzzer_sys::fuzz_target;
-use uucore::parse_size::parse_size_u64;
+use uucore::parser::parse_size::parse_size_u64;
 
 fuzz_target!(|data: &[u8]| {
     if let Ok(s) = std::str::from_utf8(data) {

fuzz/fuzz_targets/fuzz_parse_time.rs

@@ -1,7 +1,7 @@
 #![no_main]
 
 use libfuzzer_sys::fuzz_target;
-use uucore::parse_time;
+use uucore::parser::parse_time;
 
 fuzz_target!(|data: &[u8]| {
     if let Ok(s) = std::str::from_utf8(data) {

src/uu/cp/Cargo.toml

@@ -33,6 +33,7 @@ uucore = { workspace = true, features = [
   "entries",
   "fs",
   "fsxattr",
+  "parser",
   "perms",
   "mode",
   "update-control",

src/uu/cp/src/cp.rs

@@ -40,8 +40,8 @@ use uucore::{backup_control, update_control};
 // requires these enum.
 pub use uucore::{backup_control::BackupMode, update_control::UpdateMode};
 use uucore::{
-    format_usage, help_about, help_section, help_usage, prompt_yes,
-    shortcut_value_parser::ShortcutValueParser, show_error, show_warning,
+    format_usage, help_about, help_section, help_usage,
+    parser::shortcut_value_parser::ShortcutValueParser, prompt_yes, show_error, show_warning,
 };
 
 use crate::copydir::copy_directory;

src/uu/date/Cargo.toml

@@ -20,7 +20,7 @@ path = "src/date.rs"
 [dependencies]
 chrono = { workspace = true }
 clap = { workspace = true }
-uucore = { workspace = true, features = ["custom-tz-fmt"] }
+uucore = { workspace = true, features = ["custom-tz-fmt", "parser"] }
 parse_datetime = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]

src/uu/date/src/date.rs

@@ -23,7 +23,7 @@ use uucore::{format_usage, help_about, help_usage, show};
 #[cfg(windows)]
 use windows_sys::Win32::{Foundation::SYSTEMTIME, System::SystemInformation::SetSystemTime};
 
-use uucore::shortcut_value_parser::ShortcutValueParser;
+use uucore::parser::shortcut_value_parser::ShortcutValueParser;
 
 // Options
 const DATE: &str = "date";

src/uu/dd/Cargo.toml

@@ -20,7 +20,7 @@ path = "src/dd.rs"
 clap = { workspace = true }
 gcd = { workspace = true }
 libc = { workspace = true }
-uucore = { workspace = true, features = ["format", "quoting-style"] }
+uucore = { workspace = true, features = ["format", "parser", "quoting-style"] }
 thiserror = { workspace = true }
 
 [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]

src/uu/dd/src/parseargs.rs

@@ -12,7 +12,7 @@ use crate::conversion_tables::ConversionTable;
 use thiserror::Error;
 use uucore::display::Quotable;
 use uucore::error::UError;
-use uucore::parse_size::{ParseSizeError, Parser as SizeParser};
+use uucore::parser::parse_size::{ParseSizeError, Parser as SizeParser};
 use uucore::show_warning;
 
 /// Parser Errors describe errors with parser input

src/uu/df/Cargo.toml

@@ -18,7 +18,7 @@ path = "src/df.rs"
 
 [dependencies]
 clap = { workspace = true }
-uucore = { workspace = true, features = ["libc", "fsext"] }
+uucore = { workspace = true, features = ["libc", "fsext", "parser"] }
 unicode-width = { workspace = true }
 thiserror = { workspace = true }
 

src/uu/df/src/blocks.rs

@@ -9,7 +9,7 @@ use std::{env, fmt};
 
 use uucore::{
     display::Quotable,
-    parse_size::{ParseSizeError, parse_size_u64},
+    parser::parse_size::{ParseSizeError, parse_size_u64},
 };
 
 /// The first ten powers of 1024.

src/uu/df/src/df.rs

@@ -14,7 +14,7 @@ use table::HeaderMode;
 use uucore::display::Quotable;
 use uucore::error::{UError, UResult, USimpleError};
 use uucore::fsext::{MountInfo, read_fs_list};
-use uucore::parse_size::ParseSizeError;
+use uucore::parser::parse_size::ParseSizeError;
 use uucore::{format_usage, help_about, help_section, help_usage, show};
 
 use clap::{Arg, ArgAction, ArgMatches, Command, parser::ValueSource};

src/uu/dircolors/Cargo.toml

@@ -18,7 +18,7 @@ path = "src/dircolors.rs"
 
 [dependencies]
 clap = { workspace = true }
-uucore = { workspace = true, features = ["colors"] }
+uucore = { workspace = true, features = ["colors", "parser"] }
 
 [[bin]]
 name = "dircolors"

src/uu/dircolors/src/dircolors.rs

@@ -15,7 +15,7 @@ use clap::{Arg, ArgAction, Command};
 use uucore::colors::{FILE_ATTRIBUTE_CODES, FILE_COLORS, FILE_TYPES, TERMS};
 use uucore::display::Quotable;
 use uucore::error::{UResult, USimpleError, UUsageError};
-use uucore::{format_usage, help_about, help_section, help_usage, parse_glob};
+use uucore::{format_usage, help_about, help_section, help_usage, parser::parse_glob};
 
 mod options {
     pub const BOURNE_SHELL: &str = "bourne-shell";

src/uu/du/Cargo.toml

@@ -21,7 +21,7 @@ chrono = { workspace = true }
 # For the --exclude & --exclude-from options
 glob = { workspace = true }
 clap = { workspace = true }
-uucore = { workspace = true, features = ["format"] }
+uucore = { workspace = true, features = ["format", "parser"] }
 thiserror = { workspace = true }
 
 [target.'cfg(target_os = "windows")'.dependencies]

src/uu/du/src/du.rs

@@ -27,9 +27,9 @@ use thiserror::Error;
 use uucore::display::{Quotable, print_verbatim};
 use uucore::error::{FromIo, UError, UResult, USimpleError, set_exit_code};
 use uucore::line_ending::LineEnding;
-use uucore::parse_glob;
-use uucore::parse_size::{ParseSizeError, parse_size_u64};
-use uucore::shortcut_value_parser::ShortcutValueParser;
+use uucore::parser::parse_glob;
+use uucore::parser::parse_size::{ParseSizeError, parse_size_u64};
+use uucore::parser::shortcut_value_parser::ShortcutValueParser;
 use uucore::{format_usage, help_about, help_section, help_usage, show, show_error, show_warning};
 #[cfg(windows)]
 use windows_sys::Win32::Foundation::HANDLE;

src/uu/head/Cargo.toml

@@ -20,7 +20,12 @@ path = "src/head.rs"
 clap = { workspace = true }
 memchr = { workspace = true }
 thiserror = { workspace = true }
-uucore = { workspace = true, features = ["ringbuffer", "lines", "fs"] }
+uucore = { workspace = true, features = [
+  "parser",
+  "ringbuffer",
+  "lines",
+  "fs",
+] }
 
 [[bin]]
 name = "head"

src/uu/head/src/parse.rs

@@ -4,7 +4,7 @@
 // file that was distributed with this source code.
 
 use std::ffi::OsString;
-use uucore::parse_size::{ParseSizeError, parse_size_u64};
+use uucore::parser::parse_size::{ParseSizeError, parse_size_u64};
 
 #[derive(PartialEq, Eq, Debug)]
 pub enum ParseError {

src/uu/ls/Cargo.toml

@@ -34,6 +34,7 @@ uucore = { workspace = true, features = [
   "format",
   "fs",
   "fsxattr",
+  "parser",
   "quoting-style",
   "version-cmp",
 ] }

src/uu/ls/src/ls.rs

@@ -63,11 +63,13 @@ use uucore::{
     format_usage,
     fs::display_permissions,
     os_str_as_bytes_lossy,
-    parse_size::parse_size_u64,
-    shortcut_value_parser::ShortcutValueParser,
+    parser::parse_size::parse_size_u64,
+    parser::shortcut_value_parser::ShortcutValueParser,
     version_cmp::version_cmp,
 };
-use uucore::{help_about, help_section, help_usage, parse_glob, show, show_error, show_warning};
+use uucore::{
+    help_about, help_section, help_usage, parser::parse_glob, show, show_error, show_warning,
+};
 
 mod dired;
 use dired::{DiredOutput, is_dired_arg_present};

src/uu/numfmt/Cargo.toml

@@ -18,7 +18,7 @@ path = "src/numfmt.rs"
 
 [dependencies]
 clap = { workspace = true }
-uucore = { workspace = true, features = ["ranges"] }
+uucore = { workspace = true, features = ["parser", "ranges"] }
 thiserror = { workspace = true }
 
 [[bin]]

src/uu/numfmt/src/numfmt.rs

@@ -14,8 +14,8 @@ use std::str::FromStr;
 use units::{IEC_BASES, SI_BASES};
 use uucore::display::Quotable;
 use uucore::error::UResult;
+use uucore::parser::shortcut_value_parser::ShortcutValueParser;
 use uucore::ranges::Range;
-use uucore::shortcut_value_parser::ShortcutValueParser;
 use uucore::{format_usage, help_about, help_section, help_usage, show, show_error};
 
 pub mod errors;

src/uu/od/Cargo.toml

@@ -20,7 +20,7 @@ path = "src/od.rs"
 byteorder = { workspace = true }
 clap = { workspace = true }
 half = { workspace = true }
-uucore = { workspace = true }
+uucore = { workspace = true, features = ["parser"] }
 
 [[bin]]
 name = "od"

src/uu/od/src/od.rs

@@ -43,8 +43,8 @@ use clap::ArgAction;
 use clap::{Arg, ArgMatches, Command, parser::ValueSource};
 use uucore::display::Quotable;
 use uucore::error::{UResult, USimpleError};
-use uucore::parse_size::ParseSizeError;
-use uucore::shortcut_value_parser::ShortcutValueParser;
+use uucore::parser::parse_size::ParseSizeError;
+use uucore::parser::shortcut_value_parser::ShortcutValueParser;
 use uucore::{format_usage, help_about, help_section, help_usage, show_error, show_warning};
 
 const PEEK_BUFFER_SIZE: usize = 4; // utf-8 can be 4 bytes

src/uu/od/src/parse_nrofbytes.rs

@@ -2,7 +2,7 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
-use uucore::parse_size::{ParseSizeError, parse_size_u64};
+use uucore::parser::parse_size::{ParseSizeError, parse_size_u64};
 
 pub fn parse_number_of_bytes(s: &str) -> Result<u64, ParseSizeError> {
     let mut start = 0;

src/uu/seq/Cargo.toml

@@ -1,4 +1,4 @@
-# spell-checker:ignore bigdecimal cfgs
+# spell-checker:ignore bigdecimal cfgs extendedbigdecimal
 [package]
 name = "uu_seq"
 version = "0.0.30"
@@ -23,7 +23,12 @@ clap = { workspace = true }
 num-bigint = { workspace = true }
 num-traits = { workspace = true }
 thiserror = { workspace = true }
-uucore = { workspace = true, features = ["format", "quoting-style"] }
+uucore = { workspace = true, features = [
+  "extendedbigdecimal",
+  "format",
+  "parser",
+  "quoting-style",
+] }
 
 [[bin]]
 name = "seq"

src/uu/seq/src/number.rs

@@ -5,7 +5,7 @@
 // spell-checker:ignore extendedbigdecimal
 use num_traits::Zero;
 
-use uucore::format::ExtendedBigDecimal;
+use uucore::extendedbigdecimal::ExtendedBigDecimal;
 
 /// A number with a specified number of integer and fractional digits.
 ///

src/uu/seq/src/numberparse.rs

@@ -9,10 +9,10 @@
 //! [`PreciseNumber`] struct.
 use std::str::FromStr;
 
-use uucore::format::num_parser::{ExtendedParser, ExtendedParserError};
+use uucore::parser::num_parser::{ExtendedParser, ExtendedParserError};
 
 use crate::number::PreciseNumber;
-use uucore::format::ExtendedBigDecimal;
+use uucore::extendedbigdecimal::ExtendedBigDecimal;
 
 /// An error returned when parsing a number fails.
 #[derive(Debug, PartialEq, Eq)]
@@ -126,7 +126,7 @@ impl FromStr for PreciseNumber {
 #[cfg(test)]
 mod tests {
     use bigdecimal::BigDecimal;
-    use uucore::format::ExtendedBigDecimal;
+    use uucore::extendedbigdecimal::ExtendedBigDecimal;
 
     use crate::number::PreciseNumber;
     use crate::numberparse::ParseNumberError;

src/uu/seq/src/seq.rs

@@ -10,8 +10,9 @@ use clap::{Arg, ArgAction, Command};
 use num_traits::Zero;
 
 use uucore::error::{FromIo, UResult};
+use uucore::extendedbigdecimal::ExtendedBigDecimal;
 use uucore::format::num_format::FloatVariant;
-use uucore::format::{ExtendedBigDecimal, Format, num_format};
+use uucore::format::{Format, num_format};
 use uucore::{format_usage, help_about, help_usage};
 
 mod error;

src/uu/shred/Cargo.toml

@@ -19,7 +19,7 @@ path = "src/shred.rs"
 [dependencies]
 clap = { workspace = true }
 rand = { workspace = true }
-uucore = { workspace = true }
+uucore = { workspace = true, features = ["parser"] }
 libc = { workspace = true }
 
 [[bin]]

src/uu/shred/src/shred.rs

@@ -16,8 +16,8 @@ use std::os::unix::prelude::PermissionsExt;
 use std::path::{Path, PathBuf};
 use uucore::display::Quotable;
 use uucore::error::{FromIo, UResult, USimpleError, UUsageError};
-use uucore::parse_size::parse_size_u64;
-use uucore::shortcut_value_parser::ShortcutValueParser;
+use uucore::parser::parse_size::parse_size_u64;
+use uucore::parser::shortcut_value_parser::ShortcutValueParser;
 use uucore::{format_usage, help_about, help_section, help_usage, show_error, show_if_err};
 
 const ABOUT: &str = help_about!("shred.md");

src/uu/sort/Cargo.toml

@@ -30,7 +30,7 @@ self_cell = { workspace = true }
 tempfile = { workspace = true }
 thiserror = { workspace = true }
 unicode-width = { workspace = true }
-uucore = { workspace = true, features = ["fs", "version-cmp"] }
+uucore = { workspace = true, features = ["fs", "parser", "version-cmp"] }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 nix = { workspace = true }

src/uu/sort/src/sort.rs

@@ -45,8 +45,8 @@ use uucore::display::Quotable;
 use uucore::error::strip_errno;
 use uucore::error::{UError, UResult, USimpleError, UUsageError, set_exit_code};
 use uucore::line_ending::LineEnding;
-use uucore::parse_size::{ParseSizeError, Parser};
-use uucore::shortcut_value_parser::ShortcutValueParser;
+use uucore::parser::parse_size::{ParseSizeError, Parser};
+use uucore::parser::shortcut_value_parser::ShortcutValueParser;
 use uucore::version_cmp::version_cmp;
 use uucore::{format_usage, help_about, help_section, help_usage, show_error};
 

src/uu/split/Cargo.toml

@@ -19,7 +19,7 @@ path = "src/split.rs"
 [dependencies]
 clap = { workspace = true }
 memchr = { workspace = true }
-uucore = { workspace = true, features = ["fs"] }
+uucore = { workspace = true, features = ["fs", "parser"] }
 thiserror = { workspace = true }
 
 [[bin]]

src/uu/split/src/split.rs

@@ -22,7 +22,7 @@ use std::path::Path;
 use thiserror::Error;
 use uucore::display::Quotable;
 use uucore::error::{FromIo, UIoError, UResult, USimpleError, UUsageError};
-use uucore::parse_size::parse_size_u64;
+use uucore::parser::parse_size::parse_size_u64;
 
 use uucore::uio_error;
 use uucore::{format_usage, help_about, help_section, help_usage};

src/uu/split/src/strategy.rs

@@ -10,7 +10,7 @@ use clap::{ArgMatches, parser::ValueSource};
 use thiserror::Error;
 use uucore::{
     display::Quotable,
-    parse_size::{ParseSizeError, parse_size_u64, parse_size_u64_max},
+    parser::parse_size::{ParseSizeError, parse_size_u64, parse_size_u64_max},
 };
 
 /// Sub-strategy of the [`Strategy::Number`]

src/uu/stdbuf/Cargo.toml

@@ -19,7 +19,7 @@ path = "src/stdbuf.rs"
 [dependencies]
 clap = { workspace = true }
 tempfile = { workspace = true }
-uucore = { workspace = true }
+uucore = { workspace = true, features = ["parser"] }
 
 [build-dependencies]
 libstdbuf = { version = "0.0.30", package = "uu_stdbuf_libstdbuf", path = "src/libstdbuf" }