Merge pull request #2777 from jfinkels/uucore-printf

uucore: move printf::memo module to uucore

Cargo.lock

@@ -3250,6 +3250,7 @@ dependencies = [
  "data-encoding-macro",
  "dns-lookup",
  "dunce",
+ "itertools 0.8.2",
  "lazy_static",
  "libc",
  "nix 0.23.1",

src/uu/printf/Cargo.toml

@@ -20,7 +20,7 @@ path = "src/printf.rs"
 [dependencies]
 clap = { version = "3.0", features = ["wrap_help", "cargo"] }
 itertools = "0.8.0"
-uucore = { version=">=0.0.11", package="uucore", path="../../uucore" }
+uucore = { version=">=0.0.11", package="uucore", path="../../uucore", features=["memo"] }
 uucore_procs = { version=">=0.0.8", package="uucore_procs", path="../../uucore_procs" }
 
 [[bin]]

src/uu/printf/src/cli.rs

@@ -1,23 +0,0 @@
-//! stdio convenience fns
-
-// spell-checker:ignore (ToDO) bslice
-
-use std::io::{stdout, Write};
-
-pub const EXIT_OK: i32 = 0;
-pub const EXIT_ERR: i32 = 1;
-
-// by default stdout only flushes
-// to console when a newline is passed.
-pub fn flush_char(c: char) {
-    print!("{}", c);
-    let _ = stdout().flush();
-}
-pub fn flush_str(s: &str) {
-    print!("{}", s);
-    let _ = stdout().flush();
-}
-pub fn flush_bytes(bslice: &[u8]) {
-    let _ = stdout().write(bslice);
-    let _ = stdout().flush();
-}

src/uu/printf/src/mod.rs

@@ -1,3 +1 @@
 mod cli;
-mod memo;
-mod tokenize;

src/uu/printf/src/printf.rs

@@ -4,12 +4,9 @@
 
 use clap::{crate_version, App, Arg};
 use uucore::error::{UResult, UUsageError};
+use uucore::memo;
 use uucore::InvalidEncodingHandling;
 
-mod cli;
-mod memo;
-mod tokenize;
-
 const VERSION: &str = "version";
 const HELP: &str = "help";
 static LONGHELP_LEAD: &str = "printf

src/uucore/Cargo.toml

@@ -21,6 +21,7 @@ dns-lookup = { version="1.0.5", optional=true }
 dunce = "1.0.0"
 wild = "2.0"
 # * optional
+itertools = { version="0.8", optional=true }
 thiserror = { version="1.0", optional=true }
 time = { version="<= 0.1.43", optional=true }
 # * "problem" dependencies (pinned)
@@ -53,6 +54,7 @@ encoding = ["data-encoding", "data-encoding-macro", "z85", "thiserror"]
 entries = ["libc"]
 fs = ["libc", "nix", "winapi-util"]
 fsext = ["libc", "time"]
+memo = ["itertools"]
 mode = ["libc"]
 perms = ["libc", "walkdir"]
 process = ["libc"]

src/uucore/src/lib/features.rs

@@ -6,8 +6,12 @@ pub mod encoding;
 pub mod fs;
 #[cfg(feature = "fsext")]
 pub mod fsext;
+#[cfg(feature = "memo")]
+pub mod memo;
 #[cfg(feature = "ringbuffer")]
 pub mod ringbuffer;
+#[cfg(feature = "memo")]
+mod tokenize;
 
 // * (platform-specific) feature-gated modules
 // ** non-windows (i.e. Unix + Fuchsia)

src/uucore/src/lib/features/memo.rs

@@ -5,15 +5,14 @@
 //! 2. feeds remaining arguments into function
 //! that prints tokens.
 
+use crate::display::Quotable;
+use crate::features::tokenize::sub::Sub;
+use crate::features::tokenize::token::{Token, Tokenizer};
+use crate::features::tokenize::unescaped_text::UnescapedText;
+use crate::show_warning;
 use itertools::put_back_n;
 use std::iter::Peekable;
 use std::slice::Iter;
-use uucore::display::Quotable;
-use uucore::show_warning;
-
-use crate::tokenize::sub::Sub;
-use crate::tokenize::token::{Token, Tokenizer};
-use crate::tokenize::unescaped_text::UnescapedText;
 
 pub struct Memo {
     tokens: Vec<Box<dyn Token>>,

src/uucore/src/lib/features/tokenize/num_format/formatter.rs

@@ -1,9 +1,9 @@
 //! Primitives used by num_format and sub_modules.
 //! never dealt with above (e.g. Sub Tokenizer never uses these)
 
+use crate::{display::Quotable, show_error};
 use itertools::{put_back_n, PutBackN};
 use std::str::Chars;
-use uucore::{display::Quotable, show_error};
 
 use super::format_field::FormatField;
 

src/uucore/src/lib/features/tokenize/num_format/formatters/base_conv/mod.rs

@@ -32,17 +32,20 @@ pub fn arrnum_int_mult(arr_num: &[u8], basenum: u8, base_ten_int_fact: u8) -> Ve
     ret
 }
 
+#[allow(dead_code)]
 pub struct Remainder<'a> {
     pub position: usize,
     pub replace: Vec<u8>,
     pub arr_num: &'a Vec<u8>,
 }
 
+#[allow(dead_code)]
 pub struct DivOut<'a> {
     pub quotient: u8,
     pub remainder: Remainder<'a>,
 }
 
+#[allow(dead_code)]
 pub fn arrnum_int_div_step(
     rem_in: Remainder,
     radix_in: u8,
@@ -141,6 +144,7 @@ pub fn base_conv_vec(src: &[u8], radix_src: u8, radix_dest: u8) -> Vec<u8> {
     result
 }
 
+#[allow(dead_code)]
 pub fn unsigned_to_arrnum(src: u16) -> Vec<u8> {
     let mut result: Vec<u8> = Vec::new();
     let mut src_tmp: u16 = src;

src/uucore/src/lib/features/tokenize/num_format/formatters/cninetyninehexfloatf.rs

@@ -9,6 +9,7 @@ use super::base_conv::RadixDef;
 use super::float_common::{primitive_to_str_common, FloatAnalysis};
 
 pub struct CninetyNineHexFloatf {
+    #[allow(dead_code)]
     as_num: f64,
 }
 impl CninetyNineHexFloatf {
@@ -91,6 +92,7 @@ fn get_primitive_hex(
     }
 }
 
+#[allow(dead_code)]
 fn to_hex(src: &str, before_decimal: bool) -> String {
     let radix_ten = base_conv::RadixTen;
     let radix_hex = base_conv::RadixHex;

src/uucore/src/lib/features/tokenize/num_format/num_format.rs

@@ -7,8 +7,8 @@
 use std::env;
 use std::vec::Vec;
 
-use uucore::display::Quotable;
-use uucore::{show_error, show_warning};
+use crate::display::Quotable;
+use crate::{show_error, show_warning};
 
 use super::format_field::{FieldType, FormatField};
 use super::formatter::{Base, FormatPrimitive, Formatter, InitialPrefix};

src/uucore/src/lib/features/tokenize/sub.rs

@@ -5,23 +5,24 @@
 //! it is created by Sub's implementation of the Tokenizer trait
 //! Subs which have numeric field chars make use of the num_format
 //! submodule
+use crate::show_error;
 use itertools::{put_back_n, PutBackN};
 use std::iter::Peekable;
 use std::process::exit;
 use std::slice::Iter;
 use std::str::Chars;
-use uucore::show_error;
 // use std::collections::HashSet;
 
 use super::num_format::format_field::{FieldType, FormatField};
 use super::num_format::num_format;
 use super::token;
 use super::unescaped_text::UnescapedText;
-use crate::cli;
+
+const EXIT_ERR: i32 = 1;
 
 fn err_conv(sofar: &str) {
     show_error!("%{}: invalid conversion specification", sofar);
-    exit(cli::EXIT_ERR);
+    exit(EXIT_ERR);
 }
 
 fn convert_asterisk_arg_int(asterisk_arg: &str) -> isize {
@@ -80,7 +81,7 @@ impl Sub {
             _ => {
                 // should be unreachable.
                 println!("Invalid field type");
-                exit(cli::EXIT_ERR);
+                exit(EXIT_ERR);
             }
         };
         Sub {

src/uucore/src/lib/features/tokenize/unescaped_text.rs

@@ -3,10 +3,11 @@
 //! and escaped character literals (of allowed escapes),
 //! into an unescaped text byte array
 
-// spell-checker:ignore (ToDO) retval hexchars octals printf's bvec vals coreutil addchar eval bytecode
+// spell-checker:ignore (ToDO) retval hexchars octals printf's bvec vals coreutil addchar eval bytecode bslice
 
 use itertools::PutBackN;
 use std::char::from_u32;
+use std::io::{stdout, Write};
 use std::iter::Peekable;
 use std::process::exit;
 use std::slice::Iter;
@@ -14,7 +15,25 @@ use std::str::Chars;
 
 use super::token;
 
-use crate::cli;
+const EXIT_OK: i32 = 0;
+const EXIT_ERR: i32 = 1;
+
+// by default stdout only flushes
+// to console when a newline is passed.
+fn flush_char(c: char) {
+    print!("{}", c);
+    let _ = stdout().flush();
+}
+
+fn flush_str(s: &str) {
+    print!("{}", s);
+    let _ = stdout().flush();
+}
+
+fn flush_bytes(bslice: &[u8]) {
+    let _ = stdout().write(bslice);
+    let _ = stdout().flush();
+}
 
 pub struct UnescapedText(Vec<u8>);
 impl UnescapedText {
@@ -53,7 +72,7 @@ impl UnescapedText {
         if found < min_chars {
             // only ever expected for hex
             println!("missing hexadecimal number in escape"); //todo stderr
-            exit(cli::EXIT_ERR);
+            exit(EXIT_ERR);
         }
         retval
     }
@@ -76,7 +95,7 @@ impl UnescapedText {
         );
         if (val < 159 && (val != 36 && val != 64 && val != 96)) || (val > 55296 && val < 57343) {
             println!("{}", err_msg); //todo stderr
-            exit(cli::EXIT_ERR);
+            exit(EXIT_ERR);
         }
     }
     // pass an iterator that succeeds an '/',
@@ -117,7 +136,7 @@ impl UnescapedText {
                     let val = (UnescapedText::base_to_u32(min_len, max_len, base, it) % 256) as u8;
                     byte_vec.push(val);
                     let bvec = [val];
-                    cli::flush_bytes(&bvec);
+                    flush_bytes(&bvec);
                 } else {
                     byte_vec.push(ch as u8);
                 }
@@ -145,7 +164,7 @@ impl UnescapedText {
                     'f' => '\x0C',
                     // escape character
                     'e' => '\x1B',
-                    'c' => exit(cli::EXIT_OK),
+                    'c' => exit(EXIT_OK),
                     'u' | 'U' => {
                         let len = match e {
                             'u' => 4,
@@ -165,7 +184,7 @@ impl UnescapedText {
                     }
                 };
                 s.push(ch);
-                cli::flush_str(&s);
+                flush_str(&s);
                 byte_vec.extend(s.bytes());
             }
         };
@@ -193,7 +212,7 @@ impl UnescapedText {
                         // lazy branch eval
                         // remember this fn could be called
                         // many times in a single exec through %b
-                        cli::flush_char(ch);
+                        flush_char(ch);
                         tmp_str.push(ch);
                     }
                     '\\' => {
@@ -213,7 +232,7 @@ impl UnescapedText {
                     x if x == '%' && !subs_mode => {
                         if let Some(follow) = it.next() {
                             if follow == '%' {
-                                cli::flush_char(ch);
+                                flush_char(ch);
                                 tmp_str.push(ch);
                             } else {
                                 it.put_back(follow);
@@ -226,7 +245,7 @@ impl UnescapedText {
                         }
                     }
                     _ => {
-                        cli::flush_char(ch);
+                        flush_char(ch);
                         tmp_str.push(ch);
                     }
                 }
@@ -252,6 +271,6 @@ impl token::Tokenizer for UnescapedText {
 }
 impl token::Token for UnescapedText {
     fn print(&self, _: &mut Peekable<Iter<String>>) {
-        cli::flush_bytes(&self.0[..]);
+        flush_bytes(&self.0[..]);
     }
 }

src/uucore/src/lib/lib.rs

@@ -36,6 +36,8 @@ pub use crate::features::encoding;
 pub use crate::features::fs;
 #[cfg(feature = "fsext")]
 pub use crate::features::fsext;
+#[cfg(feature = "memo")]
+pub use crate::features::memo;
 #[cfg(feature = "ringbuffer")]
 pub use crate::features::ringbuffer;