base32, base64, uucore: merge base32/base64 code

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<()> {

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 {