change ~ make all sub-crates independent

src/uu/arch/Cargo.toml

@@ -1,18 +1,17 @@
 [package]
-name = "arch"
+name = "uu_arch"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_arch"
 path = "src/arch.rs"
 
 [dependencies]
 platform-info = "0.0.1"
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "arch"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/arch/src/arch.rs

@@ -1,5 +1,3 @@
-#![crate_name = "uu_arch"]
-
 // This file is part of the uutils coreutils package.
 //
 // (c) Smigle00 <smigle00@gmail.com>
@@ -7,7 +5,6 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
-//
 
 extern crate platform_info;
 #[macro_use]

src/uu/arch/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_arch); // spell-checker:ignore procs uucore

src/uu/base32/Cargo.toml

@@ -1,19 +1,18 @@
 [package]
-name = "base32"
+name = "uu_base32"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_base32"
 path = "src/base32.rs"
 
 [dependencies]
-uucore = { version = "0.0.2", features = ["encoding"] }
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary", features = ["encoding"] }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 ## optional
 clippy = { version = "0.0.212", optional = true }
 
 [[bin]]
 name = "base32"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/base32/src/base32.rs

@@ -4,15 +4,11 @@
 //
 // For the full copyright and license information, please view the LICENSE file
 // that was distributed with this source code.
-//
-
-#![crate_name = "uu_base32"]
 
 #[macro_use]
 extern crate uucore;
 use uucore::encoding::Format;
 
-#[path = "../../base64/src/base_common.rs"]
 mod base_common;
 
 static SYNTAX: &str = "[OPTION]... [FILE]";

src/uu/base32/src/base_common.rs

@@ -0,0 +1,93 @@
+// This file is part of the uutils coreutils package.
+//
+// (c) Jordy Dickinson <jordy.dickinson@gmail.com>
+// (c) Jian Zeng <anonymousknight96@gmail.com>
+// (c) Alex Lyon <arcterus@mail.com>
+//
+// For the full copyright and license information, please view the LICENSE file
+// that was distributed with this source code.
+
+use uucore;
+use uucore::encoding::{wrap_print, Data, Format};
+
+use std::fs::File;
+use std::io::{stdin, BufReader, Read};
+use std::path::Path;
+
+pub fn execute(
+    args: Vec<String>,
+    syntax: &str,
+    summary: &str,
+    long_help: &str,
+    format: Format,
+) -> i32 {
+    let matches = new_coreopts!(syntax, summary, long_help)
+        .optflag("d", "decode", "decode data")
+        .optflag(
+            "i",
+            "ignore-garbage",
+            "when decoding, ignore non-alphabetic characters",
+        )
+        .optopt(
+            "w",
+            "wrap",
+            "wrap encoded lines after COLS character (default 76, 0 to disable wrapping)",
+            "COLS",
+        )
+        .parse(args);
+
+    let line_wrap = matches.opt_str("wrap").map(|s| match s.parse() {
+        Ok(n) => n,
+        Err(e) => {
+            crash!(1, "invalid wrap size: ‘{}’: {}", s, e);
+        }
+    });
+    let ignore_garbage = matches.opt_present("ignore-garbage");
+    let decode = matches.opt_present("decode");
+
+    if matches.free.len() > 1 {
+        disp_err!("extra operand ‘{}’", matches.free[0]);
+        return 1;
+    }
+
+    if matches.free.is_empty() || &matches.free[0][..] == "-" {
+        let stdin_raw = stdin();
+        handle_input(
+            &mut stdin_raw.lock(),
+            format,
+            line_wrap,
+            ignore_garbage,
+            decode,
+        );
+    } else {
+        let path = Path::new(matches.free[0].as_str());
+        let file_buf = safe_unwrap!(File::open(&path));
+        let mut input = BufReader::new(file_buf);
+        handle_input(&mut input, format, line_wrap, ignore_garbage, decode);
+    };
+
+    0
+}
+
+fn handle_input<R: Read>(
+    input: &mut R,
+    format: Format,
+    line_wrap: Option<usize>,
+    ignore_garbage: bool,
+    decode: bool,
+) {
+    let mut data = Data::new(input, format).ignore_garbage(ignore_garbage);
+    if let Some(wrap) = line_wrap {
+        data = data.line_wrap(wrap);
+    }
+
+    if !decode {
+        let encoded = data.encode();
+        wrap_print(&data, encoded);
+    } else {
+        match data.decode() {
+            Ok(s) => print!("{}", String::from_utf8(s).unwrap()),
+            Err(_) => crash!(1, "invalid input"),
+        }
+    }
+}

src/uu/base32/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_base32); // spell-checker:ignore procs uucore

src/uu/base64/Cargo.toml

@@ -1,17 +1,16 @@
 [package]
-name = "base64"
+name = "uu_base64"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_base64"
 path = "src/base64.rs"
 
 [dependencies]
-uucore = { version = "0.0.2", features = ["encoding"] }
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary", features = ["encoding"] }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "base64"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/base64/src/base64.rs

@@ -1,5 +1,3 @@
-#![crate_name = "uu_base64"]
-
 // This file is part of the uutils coreutils package.
 //
 // (c) Jordy Dickinson <jordy.dickinson@gmail.com>

src/uu/base64/src/base_common.rs

@@ -6,7 +6,6 @@
 //
 // For the full copyright and license information, please view the LICENSE file
 // that was distributed with this source code.
-//
 
 use uucore;
 use uucore::encoding::{wrap_print, Data, Format};

src/uu/base64/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_base64); // spell-checker:ignore procs uucore

src/uu/basename/Cargo.toml

@@ -1,17 +1,16 @@
 [package]
-name = "basename"
+name = "uu_basename"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_basename"
 path = "src/basename.rs"
 
 [dependencies]
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "basename"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/basename/src/basename.rs

@@ -1,13 +1,9 @@
-#![crate_name = "uu_basename"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Jimmy Lu <jimmy.lu.2011@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+// This file is part of the uutils coreutils package.
+//
+// (c) Jimmy Lu <jimmy.lu.2011@gmail.com>
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
 
 #[macro_use]
 extern crate uucore;

src/uu/basename/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_basename); // spell-checker:ignore procs uucore

src/uu/cat/Cargo.toml

@@ -1,21 +1,20 @@
 [package]
-name = "cat"
+name = "uu_cat"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_cat"
 path = "src/cat.rs"
 
 [dependencies]
 quick-error = "1.2.3"
-uucore = { version = "0.0.2", features = ["fs"] }
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary", features=["fs"] }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [target.'cfg(unix)'.dependencies]
 unix_socket = "0.5.0"
 
 [[bin]]
 name = "cat"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/cat/src/cat.rs

@@ -1,5 +1,3 @@
-#![crate_name = "uu_cat"]
-
 // This file is part of the uutils coreutils package.
 //
 // (c) Jordi Boggiano <j.boggiano@seld.be>
@@ -8,7 +6,6 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
-//
 
 #[macro_use]
 extern crate quick_error;

src/uu/cat/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_cat); // spell-checker:ignore procs uucore

src/uu/chgrp/Cargo.toml

@@ -1,18 +1,17 @@
 [package]
-name = "chgrp"
+name = "uu_chgrp"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_chgrp"
 path = "src/chgrp.rs"
 
 [dependencies]
-uucore = { version = "0.0.2", features = ["entries", "fs"] }
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary", features=["entries", "fs"] }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 walkdir = "2.2.8"
 
 [[bin]]
 name = "chgrp"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/chgrp/src/chgrp.rs

@@ -1,12 +1,9 @@
-#![crate_name = "uu_chgrp"]
-
 // This file is part of the uutils coreutils package.
 //
 // (c) Jian Zeng <anonymousknight96@gmail.com>
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
-//
 
 #[macro_use]
 extern crate uucore;

src/uu/chgrp/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_chgrp); // spell-checker:ignore procs uucore

src/uu/chmod/Cargo.toml

@@ -1,19 +1,18 @@
 [package]
-name = "chmod"
+name = "uu_chmod"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_chmod"
 path = "src/chmod.rs"
 
 [dependencies]
 libc = "0.2.42"
-uucore = { version = "0.0.2", features = ["mode"] }
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary", features=["mode"] }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 walker = "1.0.0"
 
 [[bin]]
 name = "chmod"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/chmod/src/chmod.rs

@@ -1,13 +1,9 @@
-#![crate_name = "uu_chmod"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Alex Lyon <arcterus@mail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+// This file is part of the uutils coreutils package.
+//
+// (c) Alex Lyon <arcterus@mail.com>
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
 
 #[cfg(unix)]
 extern crate libc;

src/uu/chmod/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_chmod); // spell-checker:ignore procs uucore

src/uu/chown/Cargo.toml

@@ -1,17 +1,16 @@
 [package]
-name = "chown"
+name = "uu_chown"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_chown"
 path = "src/chown.rs"
 
 [dependencies]
 glob = "0.3.0"
-uucore = { version = "0.0.2", features = ["entries", "fs"] }
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary", features=["entries", "fs"] }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 walkdir = "2.2"
 
 [dependencies.clippy]
@@ -20,4 +19,4 @@ optional = true
 
 [[bin]]
 name = "chown"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/chown/src/chown.rs

@@ -1,11 +1,9 @@
-#![crate_name = "uu_chown"]
 // This file is part of the uutils coreutils package.
 //
 // (c) Jian Zeng <anonymousknight96@gmail.com>
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
-//
 #![cfg_attr(feature = "clippy", feature(plugin))]
 #![cfg_attr(feature = "clippy", plugin(clippy))]
 

src/uu/chown/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_chown); // spell-checker:ignore procs uucore

src/uu/chroot/Cargo.toml

@@ -1,18 +1,17 @@
 [package]
-name = "chroot"
+name = "uu_chroot"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_chroot"
 path = "src/chroot.rs"
 
 [dependencies]
 getopts = "0.2.18"
-uucore = { version = "0.0.2", features = ["entries"] }
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary", features=["entries"] }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "chroot"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/chroot/src/chroot.rs

@@ -1,14 +1,10 @@
-#![crate_name = "uu_chroot"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Vsevolod Velichko <torkvemada@sorokdva.net>
- * (c) Jian Zeng <anonymousknight96 AT gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+// This file is part of the uutils coreutils package.
+//
+// (c) Vsevolod Velichko <torkvemada@sorokdva.net>
+// (c) Jian Zeng <anonymousknight96 AT gmail.com>
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
 
 extern crate getopts;
 

src/uu/chroot/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_chroot); // spell-checker:ignore procs uucore

src/uu/cksum/Cargo.toml

@@ -1,17 +1,17 @@
 [package]
-name = "cksum"
+name = "uu_cksum"
 version = "0.0.1"
 authors = []
 license = "MIT"
 
 [lib]
-name = "uu_cksum"
 path = "src/cksum.rs"
 
 [dependencies]
 libc = "0.2.42"
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "cksum"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/cksum/build.rs

@@ -15,12 +15,7 @@ use std::path::Path;
 
 const CRC_TABLE_LEN: usize = 256;
 
-#[path = "../../common/mkmain.rs"]
-mod mkmain;
-
 fn main() {
-    mkmain::main();
-
     let out_dir = env::var("OUT_DIR").unwrap();
 
     let mut table = Vec::with_capacity(CRC_TABLE_LEN);

src/uu/cksum/src/cksum.rs

@@ -1,13 +1,9 @@
-#![crate_name = "uu_cksum"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Michael Gehring <mg@ebfe.org>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+// This file is part of the uutils coreutils package.
+//
+// (c) Michael Gehring <mg@ebfe.org>
+//
+//  For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
 
 #[macro_use]
 extern crate uucore;

src/uu/cksum/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_cksum); // spell-checker:ignore procs uucore

src/uu/comm/Cargo.toml

@@ -1,19 +1,18 @@
 [package]
-name = "comm"
+name = "uu_comm"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_comm"
 path = "src/comm.rs"
 
 [dependencies]
 getopts = "0.2.18"
 libc = "0.2.42"
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "comm"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/comm/src/comm.rs

@@ -1,13 +1,9 @@
-#![crate_name = "uu_comm"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Michael Gehring <mg@ebfe.org>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+// This file is part of the uutils coreutils package.
+//
+// (c) Michael Gehring <mg@ebfe.org>
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
 
 extern crate getopts;
 

src/uu/comm/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_comm); // spell-checker:ignore procs uucore

src/uu/cp/Cargo.toml

@@ -1,15 +1,13 @@
 [package]
-name = "cp"
+name = "uu_cp"
 version = "0.0.1"
 authors = [
-  "Jordy Dickinson <jordy.dickinson@gmail.com>",
-  "Joshua S. Miller <jsmiller@uchicago.edu>",
+    "Jordy Dickinson <jordy.dickinson@gmail.com>",
+    "Joshua S. Miller <jsmiller@uchicago.edu>",
 ]
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_cp"
 path = "src/cp.rs"
 
 [dependencies]
@@ -17,7 +15,8 @@ clap = "2.32"
 filetime = "0.2"
 libc = "0.2.42"
 quick-error = "1.2.3"
-uucore = { version = "0.0.2", features = ["fs"] }
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary", features=["fs"] }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 walkdir = "2.2.8"
 
 [target.'cfg(target_os = "linux")'.dependencies]
@@ -32,4 +31,4 @@ xattr="0.2.1"
 
 [[bin]]
 name = "cp"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/cp/src/cp.rs

@@ -1,15 +1,12 @@
-#![crate_name = "uu_cp"]
 #![allow(clippy::missing_safety_doc)]
 
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Jordy Dickinson <jordy.dickinson@gmail.com>
- * (c) Joshua S. Miller <jsmiller@uchicago.edu>
- *
- * For the full copyright and license information, please view the LICENSE file
- * that was distributed with this source code.
- */
+// This file is part of the uutils coreutils package.
+//
+// (c) Jordy Dickinson <jordy.dickinson@gmail.com>
+// (c) Joshua S. Miller <jsmiller@uchicago.edu>
+//
+// For the full copyright and license information, please view the LICENSE file
+// that was distributed with this source code.
 
 extern crate clap;
 extern crate filetime;

src/uu/cp/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_cp); // spell-checker:ignore procs uucore

src/uu/cut/Cargo.toml

@@ -1,17 +1,16 @@
 [package]
-name = "cut"
+name = "uu_cut"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_cut"
 path = "src/cut.rs"
 
 [dependencies]
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "cut"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/cut/src/cut.rs

@@ -1,13 +1,9 @@
-#![crate_name = "uu_cut"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Rolf Morel <rolfmorel@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+// This file is part of the uutils coreutils package.
+//
+// (c) Rolf Morel <rolfmorel@gmail.com>
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
 
 #[macro_use]
 extern crate uucore;

src/uu/cut/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_cut); // spell-checker:ignore procs uucore

src/uu/date/Cargo.toml

@@ -1,19 +1,18 @@
 [package]
-name = "date"
+name = "uu_date"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_date"
 path = "src/date.rs"
 
 [dependencies]
 chrono = "0.4.4"
 clap = "2.32"
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "date"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/date/src/date.rs

@@ -1,14 +1,10 @@
-#![crate_name = "uu_date"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Anthony Deschamps <anthony.j.deschamps@gmail.com>
- * (c) Sylvestre Ledru <sylvestre@debian.org>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+// This file is part of the uutils coreutils package.
+//
+// (c) Anthony Deschamps <anthony.j.deschamps@gmail.com>
+// (c) Sylvestre Ledru <sylvestre@debian.org>
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
 
 extern crate chrono;
 

src/uu/date/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_date); // spell-checker:ignore procs uucore

src/uu/df/Cargo.toml

@@ -1,19 +1,18 @@
 [package]
-name = "df"
+name = "uu_df"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_df"
 path = "src/df.rs"
 
 [dependencies]
 clap = "2.32"
 libc = "0.2"
 number_prefix = "0.2"
-uucore = "0.0.1"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 kernel32-sys = "0.2"
@@ -21,4 +20,4 @@ winapi = { version = "0.3", features = ["handleapi", "winerror"] }
 
 [[bin]]
 name = "df"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/df/src/df.rs

@@ -1,14 +1,10 @@
-#![crate_name = "uu_df"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Fangxu Hu <framlog@gmail.com>
- * (c) Sylvestre Ledru <sylvestre@debian.org>
- *
- * For the full copyright and license information, please view the LICENSE file
- * that was distributed with this source code.
- */
+// This file is part of the uutils coreutils package.
+//
+// (c) Fangxu Hu <framlog@gmail.com>
+// (c) Sylvestre Ledru <sylvestre@debian.org>
+//
+// For the full copyright and license information, please view the LICENSE file
+// that was distributed with this source code.
 
 extern crate clap;
 extern crate libc;

src/uu/df/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_df); // spell-checker:ignore procs uucore

src/uu/dircolors/Cargo.toml

@@ -1,18 +1,17 @@
 [package]
-name = "dircolors"
+name = "uu_dircolors"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_dircolors"
 path = "src/dircolors.rs"
 
 [dependencies]
 glob = "0.3.0"
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "dircolors"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/dircolors/src/dircolors.rs

@@ -1,12 +1,9 @@
-#![crate_name = "uu_dircolors"]
-
 // This file is part of the uutils coreutils package.
 //
 // (c) Jian Zeng <anonymousknight96@gmail.com>
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
-//
 
 extern crate glob;
 

src/uu/dircolors/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_dircolors); // spell-checker:ignore procs uucore

src/uu/dirname/Cargo.toml

@@ -1,18 +1,17 @@
 [package]
-name = "dirname"
+name = "uu_dirname"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_dirname"
 path = "src/dirname.rs"
 
 [dependencies]
 libc = "0.2.42"
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "dirname"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/dirname/src/dirname.rs

@@ -1,13 +1,9 @@
-#![crate_name = "uu_dirname"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Derek Chiang <derekchiang93@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+// This file is part of the uutils coreutils package.
+//
+// (c) Derek Chiang <derekchiang93@gmail.com>
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
 
 #[macro_use]
 extern crate uucore;

src/uu/dirname/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_dirname); // spell-checker:ignore procs uucore

src/uu/du/Cargo.toml

@@ -1,18 +1,17 @@
 [package]
-name = "du"
+name = "uu_du"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_du"
 path = "src/du.rs"
 
 [dependencies]
 time = "0.1.40"
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "du"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/du/src/du.rs

@@ -1,13 +1,9 @@
-#![crate_name = "uu_du"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Derek Chiang <derekchiang93@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+// This file is part of the uutils coreutils package.
+//
+// (c) Derek Chiang <derekchiang93@gmail.com>
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
 
 extern crate time;
 

src/uu/du/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_du); // spell-checker:ignore procs uucore

src/uu/echo/Cargo.toml

@@ -1,17 +1,16 @@
 [package]
-name = "echo"
+name = "uu_echo"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_echo"
 path = "src/echo.rs"
 
 [dependencies]
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "echo"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/echo/src/echo.rs

@@ -1,14 +1,10 @@
-#![crate_name = "uu_echo"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Derek Chiang <derekchiang93@gmail.com>
- * (c) Christopher Brown <ccbrown112@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+// This file is part of the uutils coreutils package.
+//
+// (c) Derek Chiang <derekchiang93@gmail.com>
+// (c) Christopher Brown <ccbrown112@gmail.com>
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
 
 #[macro_use]
 extern crate uucore;

src/uu/echo/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_echo); // spell-checker:ignore procs uucore

src/uu/env/Cargo.toml

@@ -1,22 +1,21 @@
 [package]
-name = "env"
+name = "uu_env"
 version = "0.0.1"
 authors = ["uutils developers"]
 description = "Set each NAME to VALUE in the environment and run COMMAND"
 license = "MIT"
-build = "../../common/mkmain.rs"
 edition = "2018"
 
 [lib]
-name = "uu_env"
 path = "src/env.rs"
 
 [dependencies]
 clap = "2.33"
 libc = "0.2.42"
 rust-ini = "0.13.0"
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "env"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/env/src/env.rs

@@ -1,12 +1,9 @@
-#![crate_name = "uu_env"]
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+// This file is part of the uutils coreutils package.
+//
+// (c) Jordi Boggiano <j.boggiano@seld.be>
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
 
 /* last synced with: env (GNU coreutils) 8.13 */
 

src/uu/env/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_env); // spell-checker:ignore procs uucore

src/uu/expand/Cargo.toml

@@ -1,19 +1,18 @@
 [package]
-name = "expand"
+name = "uu_expand"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_expand"
 path = "src/expand.rs"
 
 [dependencies]
 getopts = "0.2.18"
 unicode-width = "0.1.5"
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "expand"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/expand/src/expand.rs

@@ -1,15 +1,11 @@
-#![crate_name = "uu_expand"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Virgile Andreani <virgile.andreani@anbuco.fr>
- * (c) kwantam <kwantam@gmail.com>
- *     20150428 updated to work with both UTF-8 and non-UTF-8 encodings
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+// This file is part of the uutils coreutils package.
+//
+// (c) Virgile Andreani <virgile.andreani@anbuco.fr>
+// (c) kwantam <kwantam@gmail.com>
+//     * 2015-04-28 ~ updated to work with both UTF-8 and non-UTF-8 encodings
+//
+// For the full copyright and license information, please view the LICENSE
+// file that was distributed with this source code.
 
 extern crate getopts;
 extern crate unicode_width;

src/uu/expand/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_expand); // spell-checker:ignore procs uucore

src/uu/expr/Cargo.toml

@@ -1,19 +1,18 @@
 [package]
-name = "expr"
+name = "uu_expr"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_expr"
 path = "src/expr.rs"
 
 [dependencies]
 libc = "0.2.42"
 onig = "~4.3.2"
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "expr"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/expr/src/expr.rs

@@ -1,13 +1,9 @@
-#![crate_name = "uu_expr"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Roman Gafiyatullin <r.gafiyatullin@me.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+//* This file is part of the uutils coreutils package.
+//*
+//* (c) Roman Gafiyatullin <r.gafiyatullin@me.com>
+//*
+//* For the full copyright and license information, please view the LICENSE
+//* file that was distributed with this source code.
 
 extern crate onig;
 #[macro_use]

src/uu/expr/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_expr); // spell-checker:ignore procs uucore

src/uu/expr/src/syntax_tree.rs

@@ -1,11 +1,9 @@
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Roman Gafiyatullin <r.gafiyatullin@me.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+//* This file is part of the uutils coreutils package.
+//*
+//* (c) Roman Gafiyatullin <r.gafiyatullin@me.com>
+//*
+//* For the full copyright and license information, please view the LICENSE
+//* file that was distributed with this source code.
 
 //!
 //! Here we employ shunting-yard algorithm for building AST from tokens according to operators' precedence and associativeness.

src/uu/expr/src/tokens.rs

@@ -1,11 +1,9 @@
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Roman Gafiyatullin <r.gafiyatullin@me.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+//* This file is part of the uutils coreutils package.
+//*
+//* (c) Roman Gafiyatullin <r.gafiyatullin@me.com>
+//*
+//* For the full copyright and license information, please view the LICENSE
+//* file that was distributed with this source code.
 
 //!
 //! The following tokens are present in the expr grammar:

src/uu/factor/Cargo.toml

@@ -1,17 +1,17 @@
 [package]
-name = "factor"
+name = "uu_factor"
 version = "0.0.1"
 authors = []
 license = "MIT"
 
 [lib]
-name = "uu_factor"
 path = "src/factor.rs"
 
 [dependencies]
 rand = "0.5"
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "factor"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/factor/build.rs

@@ -1,11 +1,9 @@
-/*
-* This file is part of the uutils coreutils package.
-*
-* (c) kwantam <kwantam@gmail.com>
-*
-* For the full copyright and license information, please view the LICENSE file
-* that was distributed with this source code.
-*/
+// * This file is part of the uutils coreutils package.
+// *
+// * (c) kwantam <kwantam@gmail.com>
+// *
+// * For the full copyright and license information, please view the LICENSE file
+// * that was distributed with this source code.
 
 //! Generate a table of the multiplicative inverses of p_i mod 2^64
 //! for the first 1027 odd primes (all 13 bit and smaller primes).
@@ -34,9 +32,6 @@ mod numeric;
 
 mod sieve;
 
-#[path = "../../common/mkmain.rs"]
-mod mkmain;
-
 // extended Euclid algorithm
 // precondition: a does not divide 2^64
 fn inv_mod_u64(a: u64) -> Option<u64> {
@@ -74,8 +69,6 @@ fn inv_mod_u64(a: u64) -> Option<u64> {
 
 #[cfg_attr(test, allow(dead_code))]
 fn main() {
-    mkmain::main();
-
     let out_dir = env::var("OUT_DIR").unwrap();
     let mut file = File::create(&Path::new(&out_dir).join("prime_table.rs")).unwrap();
 

src/uu/factor/sieve.rs

@@ -1,11 +1,9 @@
-/*
-* This file is part of the uutils coreutils package.
-*
-* (c) kwantam <kwantam@gmail.com>
-*
-* For the full copyright and license information, please view the LICENSE file
-* that was distributed with this source code.
-*/
+// * This file is part of the uutils coreutils package.
+// *
+// * (c) kwantam <kwantam@gmail.com>
+// *
+// * For the full copyright and license information, please view the LICENSE file
+// * that was distributed with this source code.
 
 use std::iter::{Chain, Cycle, Map};
 use std::slice::Iter;

src/uu/factor/src/factor.rs

@@ -1,17 +1,13 @@
-#![crate_name = "uu_factor"]
-
-/*
-* This file is part of the uutils coreutils package.
-*
-* (c) T. Jameson Little <t.jameson.little@gmail.com>
-* (c) Wiktor Kuropatwa <wiktor.kuropatwa@gmail.com>
-*     20150223 added Pollard rho method implementation
-* (c) kwantam <kwantam@gmail.com>
-*     20150429 sped up trial division by adding table of prime inverses
-*
-* For the full copyright and license information, please view the LICENSE file
-* that was distributed with this source code.
-*/
+// * This file is part of the uutils coreutils package.
+// *
+// * (c) T. Jameson Little <t.jameson.little@gmail.com>
+// * (c) Wiktor Kuropatwa <wiktor.kuropatwa@gmail.com>
+// *     * 2015-02-23 ~ added Pollard rho method implementation
+// * (c) kwantam <kwantam@gmail.com>
+// *     * 2015-04-29 ~ sped up trial division by adding table of prime inverses
+// *
+// * For the full copyright and license information, please view the LICENSE file
+// * that was distributed with this source code.
 
 extern crate rand;
 

src/uu/factor/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_factor); // spell-checker:ignore procs uucore

src/uu/factor/src/numeric.rs

@@ -1,13 +1,11 @@
-/*
-* This file is part of the uutils coreutils package.
-*
-* (c) Wiktor Kuropatwa <wiktor.kuropatwa@gmail.com>
-* (c) kwantam <kwantam@gmail.com>
-*     20150507 added big_ routines to prevent overflow when num > 2^63
-*
-* For the full copyright and license information, please view the LICENSE file
-* that was distributed with this source code.
-*/
+// * This file is part of the uutils coreutils package.
+// *
+// * (c) Wiktor Kuropatwa <wiktor.kuropatwa@gmail.com>
+// * (c) kwantam <kwantam@gmail.com>
+// *     * 20150507 ~ added big_ routines to prevent overflow when num > 2^63
+// *
+// * For the full copyright and license information, please view the LICENSE file
+// * that was distributed with this source code.
 
 use std::mem::swap;
 use std::num::Wrapping;

src/uu/false/Cargo.toml

@@ -1,17 +1,16 @@
 [package]
-name = "false"
+name = "uu_false"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_false"
 path = "src/false.rs"
 
 [dependencies]
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "false"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/false/src/false.rs

@@ -1,13 +1,9 @@
-#![crate_name = "uu_false"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+//  * This file is part of the uutils coreutils package.
+//  *
+//  * (c) Jordi Boggiano <j.boggiano@seld.be>
+//  *
+//  * For the full copyright and license information, please view the LICENSE
+//  * file that was distributed with this source code.
 
 pub fn uumain(_: Vec<String>) -> i32 {
     1

src/uu/false/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_false); // spell-checker:ignore procs uucore

src/uu/fmt/Cargo.toml

@@ -1,19 +1,18 @@
 [package]
-name = "fmt"
+name = "uu_fmt"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_fmt"
 path = "src/fmt.rs"
 
 [dependencies]
 libc = "0.2.42"
 unicode-width = "0.1.5"
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "fmt"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/fmt/src/fmt.rs

@@ -1,13 +1,9 @@
-#![crate_name = "uu_fmt"]
-
-/*
- * This file is part of `fmt` from the uutils coreutils package.
- *
- * (c) kwantam <kwantam@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+//  * This file is part of `fmt` from the uutils coreutils package.
+//  *
+//  * (c) kwantam <kwantam@gmail.com>
+//  *
+//  * For the full copyright and license information, please view the LICENSE
+//  * file that was distributed with this source code.
 
 extern crate unicode_width;
 

src/uu/fmt/src/linebreak.rs

@@ -1,11 +1,9 @@
-/*
- * This file is part of `fmt` from the uutils coreutils package.
- *
- * (c) kwantam <kwantam@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+//  * This file is part of `fmt` from the uutils coreutils package.
+//  *
+//  * (c) kwantam <kwantam@gmail.com>
+//  *
+//  * For the full copyright and license information, please view the LICENSE
+//  * file that was distributed with this source code.
 
 use parasplit::{ParaWords, Paragraph, WordInfo};
 use std::cmp;

src/uu/fmt/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_fmt); // spell-checker:ignore procs uucore

src/uu/fmt/src/parasplit.rs

@@ -1,11 +1,9 @@
-/*
- * This file is part of `fmt` from the uutils coreutils package.
- *
- * (c) kwantam <kwantam@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+//  * This file is part of `fmt` from the uutils coreutils package.
+//  *
+//  * (c) kwantam <kwantam@gmail.com>
+//  *
+//  * For the full copyright and license information, please view the LICENSE
+//  * file that was distributed with this source code.
 
 use std::io::{BufRead, Lines};
 use std::iter::Peekable;

src/uu/fold/Cargo.toml

@@ -1,17 +1,16 @@
 [package]
-name = "fold"
+name = "uu_fold"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_fold"
 path = "src/fold.rs"
 
 [dependencies]
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "fold"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/fold/src/fold.rs

@@ -1,13 +1,9 @@
-#![crate_name = "uu_fold"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Alex Lyon <arcterus@mail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+//  * This file is part of the uutils coreutils package.
+//  *
+//  * (c) Alex Lyon <arcterus@mail.com>
+//  *
+//  * For the full copyright and license information, please view the LICENSE
+//  * file that was distributed with this source code.
 
 #[macro_use]
 extern crate uucore;

src/uu/fold/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_fold); // spell-checker:ignore procs uucore

src/uu/groups/Cargo.toml

@@ -1,17 +1,16 @@
 [package]
-name = "groups"
+name = "uu_groups"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_groups"
 path = "src/groups.rs"
 
 [dependencies]
-uucore = { version = "0.0.2", features = ["entries"] }
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary", features=["entries"] }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "groups"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/groups/src/groups.rs

@@ -1,5 +1,3 @@
-#![crate_name = "uu_groups"]
-
 // This file is part of the uutils coreutils package.
 //
 // (c) Alan Andrade <alan.andradec@gmail.com>
@@ -7,8 +5,6 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
-//
-//
 
 #[macro_use]
 extern crate uucore;

src/uu/groups/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_groups); // spell-checker:ignore procs uucore

src/uu/hashsum/Cargo.toml

@@ -1,12 +1,10 @@
 [package]
-name = "hashsum"
+name = "uu_hashsum"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_hashsum"
 path = "src/hashsum.rs"
 
 [dependencies]
@@ -20,8 +18,9 @@ regex-syntax = "0.6.7"
 sha1 = "0.6.0"
 sha2 = "0.6.0"
 sha3 = "0.6.0"
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "hashsum"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/hashsum/src/hashsum.rs

@@ -1,15 +1,11 @@
-#![crate_name = "uu_hashsum"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Alex Lyon <arcterus@mail.com>
- * (c) Vsevolod Velichko <torkvemada@sorokdva.net>
- * (c) Gil Cottle <gcottle@redtown.org>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
+//  * This file is part of the uutils coreutils package.
+//  *
+//  * (c) Alex Lyon <arcterus@mail.com>
+//  * (c) Vsevolod Velichko <torkvemada@sorokdva.net>
+//  * (c) Gil Cottle <gcottle@redtown.org>
+//  *
+//  * For the full copyright and license information, please view the LICENSE
+//  * file that was distributed with this source code.
 
 extern crate getopts;
 extern crate hex;

src/uu/hashsum/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_hashsum); // spell-checker:ignore procs uucore

src/uu/head/Cargo.toml

@@ -1,18 +1,17 @@
 [package]
-name = "head"
+name = "uu_head"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_head"
 path = "src/head.rs"
 
 [dependencies]
 libc = "0.2.42"
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "head"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/head/src/head.rs

@@ -1,15 +1,11 @@
-#![crate_name = "uu_head"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Alan Andrade <alan.andradec@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * Synced with: https://raw.github.com/avsm/src/master/usr.bin/head/head.c
- */
+//  * This file is part of the uutils coreutils package.
+//  *
+//  * (c) Alan Andrade <alan.andradec@gmail.com>
+//  *
+//  * For the full copyright and license information, please view the LICENSE
+//  * file that was distributed with this source code.
+//  *
+//  * Synced with: https://raw.github.com/avsm/src/master/usr.bin/head/head.c
 
 #[macro_use]
 extern crate uucore;

src/uu/head/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_head); // spell-checker:ignore procs uucore

src/uu/hostid/Cargo.toml

@@ -1,18 +1,17 @@
 [package]
-name = "hostid"
+name = "uu_hostid"
 version = "0.0.1"
 authors = []
 license = "MIT"
-build = "../../common/mkmain.rs"
 
 [lib]
-name = "uu_hostid"
 path = "src/hostid.rs"
 
 [dependencies]
 libc = "0.2.42"
-uucore = "0.0.2"
+uucore = { version="0.0.3", package="uucore", git="https://github.com/uutils/uucore.git", branch="canary" }
+uucore_procs = { version="0.0.3", package="uucore_procs", git="https://github.com/uutils/uucore.git", branch="canary" }
 
 [[bin]]
 name = "hostid"
-path = "../../common/uumain.rs"
+path = "src/main.rs"

src/uu/hostid/src/hostid.rs

@@ -1,13 +1,9 @@
-#![crate_name = "uu_hostid"]
-
-/*
- * This file is part of the uutils coreutils package.
- *
- * (c) Maciej Dziardziel <fiedzia@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE file
- * that was distributed with this source code.
- */
+//  * This file is part of the uutils coreutils package.
+//  *
+//  * (c) Maciej Dziardziel <fiedzia@gmail.com>
+//  *
+//  * For the full copyright and license information, please view the LICENSE file
+//  * that was distributed with this source code.
 
 extern crate libc;
 

src/uu/hostid/src/main.rs

@@ -0,0 +1 @@
+uucore_procs::main!(uu_hostid); // spell-checker:ignore procs uucore