Fix lints (*very large* PR)

.travis.yml

@@ -14,6 +14,7 @@ env:
 
 matrix:
   allow_failures:
+    - rust: beta
     - rust: nightly
   fast_finish: true
   include:

Cargo.toml

@@ -39,6 +39,15 @@ unix = [
   "generic"
 ]
 windows = ["generic"]
+windows_legacy = [
+  "arch",
+  "nproc",
+  "sync",
+  "touch",
+  "whoami",
+
+  "redox_generic"
+  ]
 # Feature "fuchsia" contains the exclusive list of utilities
 # that can be compiled and run on Fuchsia. Should be built
 # with --no-default-features when selecting this feature.

Makefile.toml

@@ -0,0 +1,91 @@
+[config]
+default_to_workspace = false
+
+[config.modify_core_tasks]
+namespace = "core"
+
+[env]
+CARGO_MAKE_CARGO_BUILD_TEST_FLAGS = { source = "${CARGO_MAKE_RUST_TARGET_OS}", default_value = "", mapping = { "linux" = "--no-default-features --features unix", "windows" = "--no-default-features --features windows" } }
+
+[tasks.default]
+description = "Build and Test"
+category = "[project]"
+dependencies = [
+	"build",
+    "test-terse",
+]
+
+[tasks.build]
+description = "Build"
+category = "[project]"
+dependencies = [
+	"core::pre-build",
+    "core::build",
+    "core::post-build",
+]
+
+[tasks.format]
+description = "Format"
+category = "[project]"
+dependencies = [
+	"action.format",
+]
+
+[tasks.help]
+description = "Help"
+category = "[project]"
+command = "cargo"
+args = [ "make", "--list-all-steps" ]
+
+[tasks.lint]
+description = "Lint report"
+category = "[project]"
+dependencies = [
+	"action-clippy",
+	"action-fmt_report",
+]
+
+[tasks.test]
+description = "Test"
+category = "[project]"
+dependencies = [
+	"core::pre-test",
+    "core::test",
+    "core::post-test",
+]
+
+[tasks.test-terse]
+description = "Test (with terse/summary output)"
+category = "[project]"
+dependencies = [
+	"core::pre-test",
+    "action-test_quiet",
+    "core::post-test",
+]
+
+### actions
+
+[tasks.action-clippy]
+description = "`cargo clippy` lint report"
+command = "cargo"
+args = ["clippy", "@@split(CARGO_MAKE_CARGO_BUILD_TEST_FLAGS, )"]
+
+[tasks.action-format]
+description = "`cargo fmt`"
+command = "cargo"
+args = ["fmt"]
+
+[tasks.action-fmt]
+description = "`cargo fmt`"
+command = "cargo"
+args = ["fmt"]
+
+[tasks.action-fmt_report]
+description = "`cargo fmt` lint report"
+command = "cargo"
+args = ["fmt", "--", "--check"]
+
+[tasks.action-test_quiet]
+description = "Test (in `--quiet` mode)"
+command = "cargo"
+args = ["test", "--quiet", "@@split(CARGO_MAKE_CARGO_BUILD_TEST_FLAGS, )"]

build.rs

@@ -16,7 +16,7 @@ pub fn main() {
         if val == "1" && key.starts_with(feature_prefix) {
             let krate = key[feature_prefix.len()..].to_lowercase();
             match krate.as_ref() {
-                "default" | "unix" | "redox" | "redox_generic" | "fuchsia" | "generic" | "windows"
+                "default" | "unix" | "redox" | "redox_generic" | "fuchsia" | "generic" | "windows" | "windows_legacy"
                 | "nightly" | "test_unimplemented" => continue,
                 _ => {}
             }

src/cat/cat.rs

@@ -38,9 +38,9 @@ static LONG_HELP: &str = "";
 
 #[derive(PartialEq)]
 enum NumberingMode {
-    NumberNone,
-    NumberNonEmpty,
-    NumberAll,
+    None,
+    NonEmpty,
+    All,
 }
 
 quick_error! {
@@ -147,11 +147,11 @@ pub fn uumain(args: Vec<String>) -> i32 {
         .parse(args);
 
     let number_mode = if matches.opt_present("b") {
-        NumberingMode::NumberNonEmpty
+        NumberingMode::NonEmpty
     } else if matches.opt_present("n") {
-        NumberingMode::NumberAll
+        NumberingMode::All
     } else {
-        NumberingMode::NumberNone
+        NumberingMode::None
     };
 
     let show_nonprint = matches.opts_present(&[
@@ -169,7 +169,7 @@ pub fn uumain(args: Vec<String>) -> i32 {
     }
 
     let can_write_fast = !(show_tabs || show_nonprint || show_ends || squeeze_blank
-        || number_mode != NumberingMode::NumberNone);
+        || number_mode != NumberingMode::None);
 
     let success = if can_write_fast {
         write_fast(files).is_ok()
@@ -357,7 +357,7 @@ fn write_file_lines(file: &str, options: &OutputOptions, state: &mut OutputState
             if in_buf[pos] == b'\n' {
                 if !state.at_line_start || !options.squeeze_blank || !one_blank_kept {
                     one_blank_kept = true;
-                    if state.at_line_start && options.number == NumberingMode::NumberAll {
+                    if state.at_line_start && options.number == NumberingMode::All {
                         write!(&mut writer, "{0:6}\t", state.line_number)?;
                         state.line_number += 1;
                     }
@@ -371,7 +371,7 @@ fn write_file_lines(file: &str, options: &OutputOptions, state: &mut OutputState
                 continue;
             }
             one_blank_kept = false;
-            if state.at_line_start && options.number != NumberingMode::NumberNone {
+            if state.at_line_start && options.number != NumberingMode::None {
                 write!(&mut writer, "{0:6}\t", state.line_number)?;
                 state.line_number += 1;
             }
@@ -452,11 +452,11 @@ fn write_nonprint_to_end<W: Write>(in_buf: &[u8], writer: &mut W, tab: &[u8]) ->
         }
         match byte {
             9 => writer.write_all(tab),
-            0...8 | 10...31 => writer.write_all(&[b'^', byte + 64]),
-            32...126 => writer.write_all(&[byte]),
+            0..=8 | 10..=31 => writer.write_all(&[b'^', byte + 64]),
+            32..=126 => writer.write_all(&[byte]),
             127 => writer.write_all(&[b'^', byte - 64]),
-            128...159 => writer.write_all(&[b'M', b'-', b'^', byte - 64]),
-            160...254 => writer.write_all(&[b'M', b'-', byte - 128]),
+            128..=159 => writer.write_all(&[b'M', b'-', b'^', byte - 64]),
+            160..=254 => writer.write_all(&[b'M', b'-', byte - 128]),
             _ => writer.write_all(&[b'M', b'-', b'^', 63]),
         }.unwrap();
         count += 1;

src/chmod/chmod.rs

@@ -106,7 +106,7 @@ fn sanitize_input(args: &mut Vec<String>) -> Option<String> {
         }
         if let Some(second) = args[i].chars().nth(1) {
             match second {
-                'r' | 'w' | 'x' | 'X' | 's' | 't' | 'u' | 'g' | 'o' | '0'...'7' => {
+                'r' | 'w' | 'x' | 'X' | 's' | 't' | 'u' | 'g' | 'o' | '0'..='7' => {
                     return Some(args.remove(i));
                 }
                 _ => {}

src/chown/chown.rs

@@ -395,8 +395,8 @@ impl Chowner {
     fn wrap_chown<P: AsRef<Path>>(&self, path: P, meta: &Metadata, follow: bool) -> i32 {
         use self::Verbosity::*;
         let mut ret = 0;
-        let dest_uid = self.dest_uid.unwrap_or(meta.uid());
-        let dest_gid = self.dest_gid.unwrap_or(meta.gid());
+        let dest_uid = self.dest_uid.unwrap_or_else(|| meta.uid());
+        let dest_gid = self.dest_gid.unwrap_or_else(|| meta.gid());
         let path = path.as_ref();
         if let Err(e) = self.chown(path, dest_uid, dest_gid, follow) {
             match self.verbosity {

src/cksum/build.rs

@@ -30,7 +30,7 @@ fn main() {
     let file = File::create(&Path::new(&out_dir).join("crc_table.rs")).unwrap();
     write!(
         &file,
-        "const CRC_TABLE: [u32; {}] = {:?};",
+        "#[allow(clippy::unreadable_literal)]\nconst CRC_TABLE: [u32; {}] = {:?};",
         CRC_TABLE_LEN, table
     ).unwrap();
 }

src/cksum/cksum.rs

@@ -14,8 +14,6 @@ extern crate uucore;
 
 use std::fs::File;
 use std::io::{self, stdin, BufReader, Read};
-#[cfg(not(windows))]
-use std::mem;
 use std::path::Path;
 
 include!(concat!(env!("OUT_DIR"), "/crc_table.rs"));
@@ -39,16 +37,10 @@ fn crc_final(mut crc: u32, mut length: usize) -> u32 {
     !crc
 }
 
-#[cfg(windows)]
 fn init_byte_array() -> Vec<u8> {
     vec![0; 1024 * 1024]
 }
 
-#[cfg(not(windows))]
-fn init_byte_array() -> [u8; 1024 * 1024] {
-    unsafe { mem::uninitialized() }
-}
-
 #[inline]
 fn cksum(fname: &str) -> io::Result<(u32, usize)> {
     let mut crc = 0u32;

src/comm/comm.rs

@@ -26,7 +26,7 @@ static LONG_HELP: &str = "";
 fn mkdelim(col: usize, opts: &getopts::Matches) -> String {
     let mut s = String::new();
     let delim = match opts.opt_str("output-delimiter") {
-        Some(d) => d.clone(),
+        Some(d) => d,
         None => "\t".to_owned(),
     };