Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-17 02:08:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

base32, base64, uucore: merge base32/base64 code

Browse source
This commit is contained in:
Alex Lyon 2019-02-21 05:10:12 -08:00 committed by Roy Ivy III
parent 6600993c3e
commit 4e0025cb17
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/uucore/encoding.rs
View file

@ -104,9 +104,9 @@ impl<R: Read> Data<R> {
} }
// NOTE: this will likely be phased out at some point // NOTE: this will likely be phased out at some point
pub fn wrap_print(line_wrap: usize, res: String) { pub fn wrap_print<R: Read>(data: &Data<R>, res: String) {
let stdout = io::stdout(); let stdout = io::stdout();
wrap_write(stdout.lock(), line_wrap, res).unwrap(); wrap_write(stdout.lock(), data.line_wrap, res).unwrap();
} }
pub fn wrap_write<W: Write>(mut writer: W, line_wrap: usize, res: String) -> io::Result<()> { pub fn wrap_write<W: Write>(mut writer: W, line_wrap: usize, res: String) -> io::Result<()> {

1
src/uucore/macros.rs
View file

@ -11,6 +11,7 @@
macro_rules! executable( macro_rules! executable(
() => ({ () => ({
let module = module_path!(); let module = module_path!();
let module = module.split("::").next().unwrap_or(module);
if &module[0..3] == "uu_" { if &module[0..3] == "uu_" {
&module[3..] &module[3..]
} else { } else {