Skip to content

Commit 2a9e7c9

Browse files
authored
Merge pull request #6906 from sylvestre/base-wrap
base32/base64: handle two corner cases
2 parents 09e65ee + 93dfc93 commit 2a9e7c9

File tree

6 files changed

+145
-540
lines changed

6 files changed

+145
-540
lines changed

Cargo.lock

Lines changed: 2 additions & 81 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/uu/base32/Cargo.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# spell-checker:ignore proptest
2-
31
[package]
42
name = "uu_base32"
53
version = "0.0.28"
@@ -22,9 +20,6 @@ path = "src/base32.rs"
2220
clap = { workspace = true }
2321
uucore = { workspace = true, features = ["encoding"] }
2422

25-
[dev-dependencies]
26-
proptest = "1.5.0"
27-
2823
[[bin]]
2924
name = "base32"
3025
path = "src/main.rs"

src/uu/base32/src/base32.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
pub mod base_common;
77

8+
use base_common::ReadSeek;
89
use clap::Command;
910
use uucore::{encoding::Format, error::UResult, help_about, help_usage};
1011

@@ -17,7 +18,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
1718

1819
let config = base_common::parse_base_cmd_args(args, ABOUT, USAGE)?;
1920

20-
let mut input = base_common::get_input(&config)?;
21+
let mut input: Box<dyn ReadSeek> = base_common::get_input(&config)?;
2122

2223
base_common::handle_input(&mut input, format, config)
2324
}

0 commit comments

Comments
 (0)