From 4e0025cb17b68074b580844c67f2965ce737e184 Mon Sep 17 00:00:00 2001
From: Alex Lyon <arcterus@mail.com>
Date: Thu, 21 Feb 2019 05:10:12 -0800
Subject: [PATCH] base32, base64, uucore: merge base32/base64 code

---
 src/uucore/encoding.rs | 4 ++--
 src/uucore/macros.rs   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/uucore/encoding.rs b/src/uucore/encoding.rs
index ca0e2eeb7..b5b233e4d 100644
--- a/src/uucore/encoding.rs
+++ b/src/uucore/encoding.rs
@@ -104,9 +104,9 @@ impl<R: Read> Data<R> {
 }
 
 // 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();
-    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<()> {
diff --git a/src/uucore/macros.rs b/src/uucore/macros.rs
index 03decc92e..28046f2c8 100644
--- a/src/uucore/macros.rs
+++ b/src/uucore/macros.rs
@@ -11,6 +11,7 @@
 macro_rules! executable(
     () => ({
         let module = module_path!();
+        let module = module.split("::").next().unwrap_or(module);
         if &module[0..3] == "uu_" {
             &module[3..]
         } else {