Skip to content

Commit a937aa5

Browse files
committed
uucore: Move extendedbigdecimal to its own feature
This will be needed later on so that we can split format and parse features.
1 parent 97fb15b commit a937aa5

File tree

10 files changed

+31
-14
lines changed

10 files changed

+31
-14
lines changed

src/uu/seq/Cargo.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# spell-checker:ignore bigdecimal cfgs
1+
# spell-checker:ignore bigdecimal cfgs extendedbigdecimal
22
[package]
33
name = "uu_seq"
44
version = "0.0.30"
@@ -23,7 +23,11 @@ clap = { workspace = true }
2323
num-bigint = { workspace = true }
2424
num-traits = { workspace = true }
2525
thiserror = { workspace = true }
26-
uucore = { workspace = true, features = ["format", "quoting-style"] }
26+
uucore = { workspace = true, features = [
27+
"extendedbigdecimal",
28+
"format",
29+
"quoting-style",
30+
] }
2731

2832
[[bin]]
2933
name = "seq"

src/uu/seq/src/number.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// spell-checker:ignore extendedbigdecimal
66
use num_traits::Zero;
77

8-
use uucore::format::ExtendedBigDecimal;
8+
use uucore::extendedbigdecimal::ExtendedBigDecimal;
99

1010
/// A number with a specified number of integer and fractional digits.
1111
///

src/uu/seq/src/numberparse.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use std::str::FromStr;
1212
use uucore::format::num_parser::{ExtendedParser, ExtendedParserError};
1313

1414
use crate::number::PreciseNumber;
15-
use uucore::format::ExtendedBigDecimal;
15+
use uucore::extendedbigdecimal::ExtendedBigDecimal;
1616

1717
/// An error returned when parsing a number fails.
1818
#[derive(Debug, PartialEq, Eq)]
@@ -126,7 +126,7 @@ impl FromStr for PreciseNumber {
126126
#[cfg(test)]
127127
mod tests {
128128
use bigdecimal::BigDecimal;
129-
use uucore::format::ExtendedBigDecimal;
129+
use uucore::extendedbigdecimal::ExtendedBigDecimal;
130130

131131
use crate::number::PreciseNumber;
132132
use crate::numberparse::ParseNumberError;

src/uu/seq/src/seq.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ use clap::{Arg, ArgAction, Command};
1010
use num_traits::Zero;
1111

1212
use uucore::error::{FromIo, UResult};
13+
use uucore::extendedbigdecimal::ExtendedBigDecimal;
1314
use uucore::format::num_format::FloatVariant;
14-
use uucore::format::{ExtendedBigDecimal, Format, num_format};
15+
use uucore::format::{Format, num_format};
1516
use uucore::{format_usage, help_about, help_usage};
1617

1718
mod error;

src/uucore/Cargo.toml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# spell-checker:ignore (features) bigdecimal zerocopy
1+
# spell-checker:ignore (features) bigdecimal zerocopy extendedbigdecimal
22

33
[package]
44
name = "uucore"
@@ -92,11 +92,18 @@ colors = []
9292
checksum = ["data-encoding", "thiserror", "sum"]
9393
encoding = ["data-encoding", "data-encoding-macro", "z85"]
9494
entries = ["libc"]
95+
extendedbigdecimal = ["bigdecimal", "num-traits"]
9596
fs = ["dunce", "libc", "winapi-util", "windows-sys"]
9697
fsext = ["libc", "windows-sys"]
9798
fsxattr = ["xattr"]
9899
lines = []
99-
format = ["bigdecimal", "itertools", "num-traits", "quoting-style"]
100+
format = [
101+
"bigdecimal",
102+
"extendedbigdecimal",
103+
"itertools",
104+
"num-traits",
105+
"quoting-style",
106+
]
100107
mode = ["libc"]
101108
perms = ["entries", "libc", "walkdir"]
102109
buf-copy = []

src/uucore/src/lib/features.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// For the full copyright and license information, please view the LICENSE
44
// file that was distributed with this source code.
55
// features ~ feature-gated modules (core/bundler file)
6+
//
7+
// spell-checker:ignore (features) extendedbigdecimal
68

79
#[cfg(feature = "backup-control")]
810
pub mod backup_control;
@@ -16,6 +18,8 @@ pub mod colors;
1618
pub mod custom_tz_fmt;
1719
#[cfg(feature = "encoding")]
1820
pub mod encoding;
21+
#[cfg(feature = "extendedbigdecimal")]
22+
pub mod extendedbigdecimal;
1923
#[cfg(feature = "format")]
2024
pub mod format;
2125
#[cfg(feature = "fs")]

src/uucore/src/lib/features/format/extendedbigdecimal.rs renamed to src/uucore/src/lib/features/extendedbigdecimal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ mod tests {
235235
use bigdecimal::BigDecimal;
236236
use num_traits::Zero;
237237

238-
use crate::format::extendedbigdecimal::ExtendedBigDecimal;
238+
use crate::extendedbigdecimal::ExtendedBigDecimal;
239239

240240
#[test]
241241
fn test_addition_infinity() {

src/uucore/src/lib/features/format/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,13 @@
3333
3434
mod argument;
3535
mod escape;
36-
pub mod extendedbigdecimal;
3736
pub mod human;
3837
pub mod num_format;
3938
pub mod num_parser;
4039
mod spec;
4140

41+
use crate::extendedbigdecimal::ExtendedBigDecimal;
4242
pub use argument::*;
43-
pub use extendedbigdecimal::ExtendedBigDecimal;
4443
pub use spec::Spec;
4544
use std::{
4645
error::Error,

src/uucore/src/lib/features/format/num_parser.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use num_traits::Signed;
1515
use num_traits::ToPrimitive;
1616
use num_traits::Zero;
1717

18-
use crate::format::extendedbigdecimal::ExtendedBigDecimal;
18+
use crate::extendedbigdecimal::ExtendedBigDecimal;
1919

2020
/// Base for number parsing
2121
#[derive(Clone, Copy, PartialEq)]
@@ -486,7 +486,7 @@ mod tests {
486486

487487
use bigdecimal::BigDecimal;
488488

489-
use crate::format::ExtendedBigDecimal;
489+
use crate::extendedbigdecimal::ExtendedBigDecimal;
490490

491491
use super::{ExtendedParser, ExtendedParserError};
492492

src/uucore/src/lib/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//! library ~ (core/bundler file)
66
// #![deny(missing_docs)] //TODO: enable this
77
//
8-
// spell-checker:ignore sigaction SIGBUS SIGSEGV
8+
// spell-checker:ignore sigaction SIGBUS SIGSEGV extendedbigdecimal
99

1010
// * feature-gated external crates (re-shared as public internal modules)
1111
#[cfg(feature = "libc")]
@@ -50,6 +50,8 @@ pub use crate::features::colors;
5050
pub use crate::features::custom_tz_fmt;
5151
#[cfg(feature = "encoding")]
5252
pub use crate::features::encoding;
53+
#[cfg(feature = "extendedbigdecimal")]
54+
pub use crate::features::extendedbigdecimal;
5355
#[cfg(feature = "format")]
5456
pub use crate::features::format;
5557
#[cfg(feature = "fs")]

0 commit comments

Comments
 (0)