diff --git a/Cargo.toml b/Cargo.toml index 8d5eb4186..08e401f7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -177,5 +177,5 @@ rand="*" tempdir="*" [[bin]] -name="uutils" -path="src/uutils/uutils.rs" +name = "uutils" +path = "src/uutils/uutils.rs" diff --git a/build.rs b/build.rs index 9ce14b5a5..7f1cd301e 100644 --- a/build.rs +++ b/build.rs @@ -12,49 +12,43 @@ 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" | "generic" => continue, - _ => {}, + "default" | "unix" | "generic" => continue, + _ => {}, } crates.push(krate.to_string()); } } crates.sort(); + let mut cf = File::create(Path::new(&out_dir).join("uutils_crates.rs")).unwrap(); let mut mf = File::create(Path::new(&out_dir).join("uutils_map.rs")).unwrap(); + mf.write_all(" type UtilityMap = HashMap<&'static str, fn(Vec) -> i32>; fn util_map() -> UtilityMap { let mut map: UtilityMap = HashMap::new();\n".as_bytes()).unwrap(); + for krate in crates { - match krate.as_ref() { - "false" | "true" => {}, - "test" => cf.write_all(format!("extern crate uu{krate};\n", krate=krate).as_bytes()).unwrap(), - _ => cf.write_all(format!("extern crate {krate} as uu{krate};\n", krate=krate).as_bytes()).unwrap(), - } + cf.write_all(format!("extern crate uu_{krate};\n", krate=krate).as_bytes()).unwrap(); match krate.as_ref() { "hashsum" => { - mf.write_all("map.insert(\"hashsum\", uuhashsum::uumain); - map.insert(\"md5sum\", uuhashsum::uumain); - map.insert(\"sha1sum\", uuhashsum::uumain); - map.insert(\"sha224sum\", uuhashsum::uumain); - map.insert(\"sha256sum\", uuhashsum::uumain); - map.insert(\"sha384sum\", uuhashsum::uumain); - map.insert(\"sha512sum\", uuhashsum::uumain);\n".as_bytes()).unwrap(); + mf.write_all("map.insert(\"hashsum\", uu_hashsum::uumain); + map.insert(\"md5sum\", uu_hashsum::uumain); + map.insert(\"sha1sum\", uu_hashsum::uumain); + map.insert(\"sha224sum\", uu_hashsum::uumain); + map.insert(\"sha256sum\", uu_hashsum::uumain); + map.insert(\"sha384sum\", uu_hashsum::uumain); + map.insert(\"sha512sum\", uu_hashsum::uumain);\n".as_bytes()).unwrap(); }, - "false" => - mf.write_all("fn uufalse(_: Vec) -> i32 { 1 } - map.insert(\"false\", uufalse as fn(Vec) -> i32);\n".as_bytes()).unwrap(), - "true" => - mf.write_all("fn uutrue(_: Vec) -> i32 { 0 } - map.insert(\"true\", uutrue as fn(Vec) -> i32);\n".as_bytes()).unwrap(), _ => - mf.write_all(format!("map.insert(\"{krate}\", uu{krate}::uumain as fn(Vec) -> i32);\n", krate= krate).as_bytes()).unwrap(), + mf.write_all(format!("map.insert(\"{krate}\", uu_{krate}::uumain);\n", krate=krate).as_bytes()).unwrap(), } } - mf.write_all("map - }\n".as_bytes()).unwrap(); + + mf.write_all("map\n}\n".as_bytes()).unwrap(); + cf.flush().unwrap(); mf.flush().unwrap(); } diff --git a/src/base64/Cargo.toml b/src/base64/Cargo.toml index 1de7788fb..0759de865 100644 --- a/src/base64/Cargo.toml +++ b/src/base64/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "base64" +name = "uu_base64" path = "base64.rs" [dependencies] @@ -14,5 +14,5 @@ rustc-serialize = "*" uucore = { path="../uucore" } [[bin]] -name="base64" -path="base64.rs" +name = "base64" +path = "main.rs" diff --git a/src/base64/base64.rs b/src/base64/base64.rs index fff3f9a6b..d08746381 100644 --- a/src/base64/base64.rs +++ b/src/base64/base64.rs @@ -1,4 +1,4 @@ -#![crate_name = "base64"] +#![crate_name = "uu_base64"] /* * This file is part of the uutils coreutils package. @@ -159,8 +159,3 @@ fn help(opts: Options) { fn version() { println!("{} {}", NAME, VERSION); } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/base64/main.rs b/src/base64/main.rs new file mode 100644 index 000000000..3b99e849a --- /dev/null +++ b/src/base64/main.rs @@ -0,0 +1,5 @@ +extern crate uu_base64; + +fn main() { + std::process::exit(uu_base64::uumain(std::env::args().collect())); +} diff --git a/src/basename/Cargo.toml b/src/basename/Cargo.toml index c4538e925..9187cb0cf 100644 --- a/src/basename/Cargo.toml +++ b/src/basename/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "basename" +name = "uu_basename" path = "basename.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="basename" -path="basename.rs" +name = "basename" +path = "main.rs" diff --git a/src/basename/basename.rs b/src/basename/basename.rs index 366299cbf..7949a64e0 100644 --- a/src/basename/basename.rs +++ b/src/basename/basename.rs @@ -1,4 +1,4 @@ -#![crate_name = "basename"] +#![crate_name = "uu_basename"] /* * This file is part of the uutils coreutils package. @@ -105,8 +105,3 @@ fn strip_suffix(name: &str, suffix: &str) -> String { name.to_string() } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/basename/main.rs b/src/basename/main.rs new file mode 100644 index 000000000..e7486c808 --- /dev/null +++ b/src/basename/main.rs @@ -0,0 +1,5 @@ +extern crate uu_basename; + +fn main() { + std::process::exit(uu_basename::uumain(std::env::args().collect())); +} diff --git a/src/cat/Cargo.toml b/src/cat/Cargo.toml index 44a3c5401..991a206de 100644 --- a/src/cat/Cargo.toml +++ b/src/cat/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "cat" +name = "uu_cat" path = "cat.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="cat" -path="cat.rs" +name = "cat" +path = "main.rs" diff --git a/src/cat/cat.rs b/src/cat/cat.rs index a1b8e79c2..0d4ff71f0 100644 --- a/src/cat/cat.rs +++ b/src/cat/cat.rs @@ -1,4 +1,4 @@ -#![crate_name = "cat"] +#![crate_name = "uu_cat"] /* * This file is part of the uutils coreutils package. @@ -339,10 +339,3 @@ impl<'a, W: Write> Drop for UnsafeWriter<'a, W> { let _ = self.flush_buf(); } } - -/* vim: set ai ts=4 sw=4 sts=4 et : */ - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/cat/main.rs b/src/cat/main.rs new file mode 100644 index 000000000..81245fef5 --- /dev/null +++ b/src/cat/main.rs @@ -0,0 +1,5 @@ +extern crate uu_cat; + +fn main() { + std::process::exit(uu_cat::uumain(std::env::args().collect())); +} diff --git a/src/chmod/Cargo.toml b/src/chmod/Cargo.toml index fee66379a..a85059a93 100644 --- a/src/chmod/Cargo.toml +++ b/src/chmod/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "chmod" +name = "uu_chmod" path = "chmod.rs" [dependencies] @@ -18,5 +18,5 @@ uucore = { path="../uucore" } walker = "*" [[bin]] -name="chmod" -path="chmod.rs" +name = "chmod" +path = "main.rs" diff --git a/src/chmod/chmod.rs b/src/chmod/chmod.rs index 6371e9ff8..f2046cd06 100644 --- a/src/chmod/chmod.rs +++ b/src/chmod/chmod.rs @@ -1,4 +1,4 @@ -#![crate_name = "chmod"] +#![crate_name = "uu_chmod"] /* * This file is part of the uutils coreutils package. @@ -319,8 +319,3 @@ fn chmod_file(file: &Path, name: &str, changes: bool, quiet: bool, verbose: bool Ok(()) } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/chmod/main.rs b/src/chmod/main.rs new file mode 100644 index 000000000..1529dfc85 --- /dev/null +++ b/src/chmod/main.rs @@ -0,0 +1,5 @@ +extern crate uu_chmod; + +fn main() { + std::process::exit(uu_chmod::uumain(std::env::args().collect())); +} diff --git a/src/chroot/Cargo.toml b/src/chroot/Cargo.toml index ffbb535a9..ab19f96bf 100644 --- a/src/chroot/Cargo.toml +++ b/src/chroot/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "chroot" +name = "uu_chroot" path = "chroot.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="chroot" -path="chroot.rs" +name = "chroot" +path = "main.rs" diff --git a/src/chroot/chroot.rs b/src/chroot/chroot.rs index 3787ff1fa..276e1603d 100644 --- a/src/chroot/chroot.rs +++ b/src/chroot/chroot.rs @@ -1,4 +1,4 @@ -#![crate_name = "chroot"] +#![crate_name = "uu_chroot"] /* * This file is part of the uutils coreutils package. @@ -216,8 +216,3 @@ If $(SHELL) is not set, /bin/sh is used.", NAME, VERSION); print!("{}", options.usage(&msg)); } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/chroot/main.rs b/src/chroot/main.rs new file mode 100644 index 000000000..61e14f718 --- /dev/null +++ b/src/chroot/main.rs @@ -0,0 +1,5 @@ +extern crate uu_chroot; + +fn main() { + std::process::exit(uu_chroot::uumain(std::env::args().collect())); +} diff --git a/src/cksum/Cargo.toml b/src/cksum/Cargo.toml index 861340183..84bddcc5d 100644 --- a/src/cksum/Cargo.toml +++ b/src/cksum/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "cksum" +name = "uu_cksum" path = "cksum.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="cksum" -path="cksum.rs" +name = "cksum" +path = "main.rs" diff --git a/src/cksum/cksum.rs b/src/cksum/cksum.rs index 4d5581a6c..5f49153a7 100644 --- a/src/cksum/cksum.rs +++ b/src/cksum/cksum.rs @@ -1,4 +1,4 @@ -#![crate_name = "cksum"] +#![crate_name = "uu_cksum"] /* * This file is part of the uutils coreutils package. @@ -128,8 +128,3 @@ Print CRC and size for each file.", NAME, VERSION); exit_code } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/cksum/main.rs b/src/cksum/main.rs new file mode 100644 index 000000000..1227ff4c1 --- /dev/null +++ b/src/cksum/main.rs @@ -0,0 +1,5 @@ +extern crate uu_cksum; + +fn main() { + std::process::exit(uu_cksum::uumain(std::env::args().collect())); +} diff --git a/src/comm/Cargo.toml b/src/comm/Cargo.toml index 3e5e77a56..a0fc8f92f 100644 --- a/src/comm/Cargo.toml +++ b/src/comm/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "comm" +name = "uu_comm" path = "comm.rs" [dependencies] @@ -12,5 +12,5 @@ getopts = "*" libc = "*" [[bin]] -name="comm" -path="comm.rs" +name = "comm" +path = "main.rs" diff --git a/src/comm/comm.rs b/src/comm/comm.rs index 75528942b..e4ff65015 100644 --- a/src/comm/comm.rs +++ b/src/comm/comm.rs @@ -1,4 +1,4 @@ -#![crate_name = "comm"] +#![crate_name = "uu_comm"] /* * This file is part of the uutils coreutils package. @@ -163,8 +163,3 @@ Compare sorted files line by line.", NAME, VERSION); 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/comm/main.rs b/src/comm/main.rs new file mode 100644 index 000000000..d99a38206 --- /dev/null +++ b/src/comm/main.rs @@ -0,0 +1,5 @@ +extern crate uu_comm; + +fn main() { + std::process::exit(uu_comm::uumain(std::env::args().collect())); +} diff --git a/src/cp/Cargo.toml b/src/cp/Cargo.toml index 6717c6c79..2e7758e49 100644 --- a/src/cp/Cargo.toml +++ b/src/cp/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "cp" +name = "uu_cp" path = "cp.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="cp" -path="cp.rs" +name = "cp" +path = "main.rs" diff --git a/src/cp/cp.rs b/src/cp/cp.rs index 08e1c9988..25a44a03e 100644 --- a/src/cp/cp.rs +++ b/src/cp/cp.rs @@ -1,4 +1,4 @@ -#![crate_name = "cp"] +#![crate_name = "uu_cp"] /* * This file is part of the uutils coreutils package. @@ -154,8 +154,3 @@ pub fn paths_refer_to_same_file(p1: &Path, p2: &Path) -> Result { Ok(pathbuf1 == pathbuf2) } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/cp/main.rs b/src/cp/main.rs new file mode 100644 index 000000000..566ec4c06 --- /dev/null +++ b/src/cp/main.rs @@ -0,0 +1,5 @@ +extern crate uu_cp; + +fn main() { + std::process::exit(uu_cp::uumain(std::env::args().collect())); +} diff --git a/src/cut/Cargo.toml b/src/cut/Cargo.toml index acccbf657..037570996 100644 --- a/src/cut/Cargo.toml +++ b/src/cut/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "cut" +name = "uu_cut" path = "cut.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="cut" -path="cut.rs" +name = "cut" +path = "main.rs" diff --git a/src/cut/cut.rs b/src/cut/cut.rs index 631f4c98f..7a9646bc4 100644 --- a/src/cut/cut.rs +++ b/src/cut/cut.rs @@ -1,4 +1,4 @@ -#![crate_name = "cut"] +#![crate_name = "uu_cut"] /* * This file is part of the uutils coreutils package. @@ -539,8 +539,3 @@ pub fn uumain(args: Vec) -> i32 { } } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/cut/main.rs b/src/cut/main.rs new file mode 100644 index 000000000..d7b690fdd --- /dev/null +++ b/src/cut/main.rs @@ -0,0 +1,5 @@ +extern crate uu_cut; + +fn main() { + std::process::exit(uu_cut::uumain(std::env::args().collect())); +} diff --git a/src/dirname/Cargo.toml b/src/dirname/Cargo.toml index 74c8ebc16..9800f0291 100644 --- a/src/dirname/Cargo.toml +++ b/src/dirname/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "dirname" +name = "uu_dirname" path = "dirname.rs" [dependencies] @@ -12,5 +12,5 @@ getopts = "*" libc = "*" [[bin]] -name="dirname" -path="dirname.rs" +name = "dirname" +path = "main.rs" diff --git a/src/dirname/dirname.rs b/src/dirname/dirname.rs index 1002db892..feb582851 100644 --- a/src/dirname/dirname.rs +++ b/src/dirname/dirname.rs @@ -1,4 +1,4 @@ -#![crate_name = "dirname"] +#![crate_name = "uu_dirname"] /* * This file is part of the uutils coreutils package. @@ -68,8 +68,3 @@ directory).", NAME, VERSION); 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/dirname/main.rs b/src/dirname/main.rs new file mode 100644 index 000000000..577d42b98 --- /dev/null +++ b/src/dirname/main.rs @@ -0,0 +1,5 @@ +extern crate uu_dirname; + +fn main() { + std::process::exit(uu_dirname::uumain(std::env::args().collect())); +} diff --git a/src/du/Cargo.toml b/src/du/Cargo.toml index 5b26212e1..a49e44ca6 100644 --- a/src/du/Cargo.toml +++ b/src/du/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "du" +name = "uu_du" path = "du.rs" [dependencies] @@ -14,5 +14,5 @@ time = "*" uucore = { path="../uucore" } [[bin]] -name="du" -path="du.rs" +name = "du" +path = "main.rs" diff --git a/src/du/du.rs b/src/du/du.rs index 83e9b91fb..b9886d530 100644 --- a/src/du/du.rs +++ b/src/du/du.rs @@ -1,4 +1,4 @@ -#![crate_name = "du"] +#![crate_name = "uu_du"] /* * This file is part of the uutils coreutils package. @@ -395,8 +395,3 @@ Try '{} --help' for more information.", s, NAME); 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/du/main.rs b/src/du/main.rs new file mode 100644 index 000000000..10cdbbe0a --- /dev/null +++ b/src/du/main.rs @@ -0,0 +1,5 @@ +extern crate uu_du; + +fn main() { + std::process::exit(uu_du::uumain(std::env::args().collect())); +} diff --git a/src/echo/Cargo.toml b/src/echo/Cargo.toml index 7e8f4f427..968492310 100644 --- a/src/echo/Cargo.toml +++ b/src/echo/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "echo" +name = "uu_echo" path = "echo.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="echo" -path="echo.rs" +name = "echo" +path = "main.rs" diff --git a/src/echo/echo.rs b/src/echo/echo.rs index b55d4f930..ee89cb61a 100644 --- a/src/echo/echo.rs +++ b/src/echo/echo.rs @@ -1,4 +1,4 @@ -#![crate_name = "echo"] +#![crate_name = "uu_echo"] /* * This file is part of the uutils coreutils package. @@ -251,8 +251,3 @@ pub fn uumain(args: Vec) -> i32 { 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/echo/main.rs b/src/echo/main.rs new file mode 100644 index 000000000..ee009d9b1 --- /dev/null +++ b/src/echo/main.rs @@ -0,0 +1,5 @@ +extern crate uu_echo; + +fn main() { + std::process::exit(uu_echo::uumain(std::env::args().collect())); +} diff --git a/src/env/Cargo.toml b/src/env/Cargo.toml index 504088efc..d3d53c2ac 100644 --- a/src/env/Cargo.toml +++ b/src/env/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "env" +name = "uu_env" path = "env.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="env" -path="env.rs" +name = "env" +path = "main.rs" diff --git a/src/env/env.rs b/src/env/env.rs index fadd3aee1..959a6c35c 100644 --- a/src/env/env.rs +++ b/src/env/env.rs @@ -1,4 +1,4 @@ -#![crate_name = "env"] +#![crate_name = "uu_env"] /* * This file is part of the uutils coreutils package. @@ -204,8 +204,3 @@ pub fn uumain(args: Vec) -> i32 { 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(env::args().collect())); -} diff --git a/src/env/main.rs b/src/env/main.rs new file mode 100644 index 000000000..d75e48ef3 --- /dev/null +++ b/src/env/main.rs @@ -0,0 +1,5 @@ +extern crate uu_env; + +fn main() { + std::process::exit(uu_env::uumain(std::env::args().collect())); +} diff --git a/src/expand/Cargo.toml b/src/expand/Cargo.toml index 0ad6f8e87..748b93168 100644 --- a/src/expand/Cargo.toml +++ b/src/expand/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "expand" +name = "uu_expand" path = "expand.rs" [dependencies] @@ -14,5 +14,5 @@ unicode-width = "*" uucore = { path="../uucore" } [[bin]] -name="expand" -path="expand.rs" +name = "expand" +path = "main.rs" diff --git a/src/expand/expand.rs b/src/expand/expand.rs index 56c9541d0..d24db30aa 100644 --- a/src/expand/expand.rs +++ b/src/expand/expand.rs @@ -1,4 +1,4 @@ -#![crate_name = "expand"] +#![crate_name = "uu_expand"] #![feature(unicode)] /* @@ -241,8 +241,3 @@ fn expand(options: Options) { } } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/expand/main.rs b/src/expand/main.rs new file mode 100644 index 000000000..e074601b1 --- /dev/null +++ b/src/expand/main.rs @@ -0,0 +1,5 @@ +extern crate uu_expand; + +fn main() { + std::process::exit(uu_expand::uumain(std::env::args().collect())); +} diff --git a/src/expr/Cargo.toml b/src/expr/Cargo.toml index 32567df84..233804b67 100644 --- a/src/expr/Cargo.toml +++ b/src/expr/Cargo.toml @@ -1,11 +1,10 @@ - [package] name = "expr" version = "0.0.1" authors = [] [lib] -name = "expr" +name = "uu_expr" path = "expr.rs" [dependencies] @@ -14,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="expr" -path="expr.rs" +name = "expr" +path = "main.rs" diff --git a/src/expr/expr.rs b/src/expr/expr.rs index 712d8bc9c..5242fad37 100644 --- a/src/expr/expr.rs +++ b/src/expr/expr.rs @@ -1,4 +1,4 @@ -#![crate_name = "expr"] +#![crate_name = "uu_expr"] /* * This file is part of the uutils coreutils package. @@ -61,8 +61,6 @@ fn evaluate_ast( maybe_ast: Result, String> ) -> Resul else { maybe_ast.ok().unwrap().evaluate() } } - - fn maybe_handle_help_or_version( args: &Vec ) -> bool { if args.len() == 2 { if args[1] == "--help" { print_help(); true } @@ -133,8 +131,3 @@ Environment variables: fn print_version() { println!("{} {}", NAME, VERSION); } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/expr/main.rs b/src/expr/main.rs new file mode 100644 index 000000000..240305824 --- /dev/null +++ b/src/expr/main.rs @@ -0,0 +1,5 @@ +extern crate uu_expr; + +fn main() { + std::process::exit(uu_expr::uumain(std::env::args().collect())); +} diff --git a/src/factor/Cargo.toml b/src/factor/Cargo.toml index 0498908fa..00118dda0 100644 --- a/src/factor/Cargo.toml +++ b/src/factor/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "factor" +name = "uu_factor" path = "factor.rs" [dependencies] @@ -14,5 +14,5 @@ rand = "*" uucore = { path="../uucore" } [[bin]] -name="factor" -path="factor.rs" +name = "factor" +path = "main.rs" diff --git a/src/factor/factor.rs b/src/factor/factor.rs index aa01a782e..bdff4c545 100644 --- a/src/factor/factor.rs +++ b/src/factor/factor.rs @@ -1,4 +1,4 @@ -#![crate_name = "factor"] +#![crate_name = "uu_factor"] /* * This file is part of the uutils coreutils package. @@ -200,8 +200,3 @@ read from standard input.", NAME, VERSION); } 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/factor/main.rs b/src/factor/main.rs new file mode 100644 index 000000000..023510be8 --- /dev/null +++ b/src/factor/main.rs @@ -0,0 +1,5 @@ +extern crate uu_factor; + +fn main() { + std::process::exit(uu_factor::uumain(std::env::args().collect())); +} diff --git a/src/false/Cargo.toml b/src/false/Cargo.toml index 15e1690a2..daa2c5363 100644 --- a/src/false/Cargo.toml +++ b/src/false/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "false" +name = "uu_false" path = "false.rs" [dependencies] @@ -12,5 +12,5 @@ getopts = "*" libc = "*" [[bin]] -name="false" -path="false.rs" +name = "false" +path = "main.rs" diff --git a/src/false/false.rs b/src/false/false.rs index 0363495be..bdfe1c1b6 100644 --- a/src/false/false.rs +++ b/src/false/false.rs @@ -1,4 +1,4 @@ -#![crate_name = "false"] +#![crate_name = "uu_false"] /* * This file is part of the uutils coreutils package. @@ -12,8 +12,3 @@ pub fn uumain(_: Vec) -> i32 { 1 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/false/main.rs b/src/false/main.rs new file mode 100644 index 000000000..09a95fe39 --- /dev/null +++ b/src/false/main.rs @@ -0,0 +1,5 @@ +extern crate uu_false; + +fn main() { + std::process::exit(uu_false::uumain(std::env::args().collect())); +} diff --git a/src/fmt/Cargo.toml b/src/fmt/Cargo.toml index a70851434..3378b79ad 100644 --- a/src/fmt/Cargo.toml +++ b/src/fmt/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "fmt" +name = "uu_fmt" path = "fmt.rs" [dependencies] @@ -14,5 +14,5 @@ unicode-width = "*" uucore = { path="../uucore" } [[bin]] -name="fmt" -path="fmt.rs" +name = "fmt" +path = "main.rs" diff --git a/src/fmt/fmt.rs b/src/fmt/fmt.rs index 5dee29609..9e8c9dbd4 100644 --- a/src/fmt/fmt.rs +++ b/src/fmt/fmt.rs @@ -1,4 +1,4 @@ -#![crate_name = "fmt"] +#![crate_name = "uu_fmt"] #![feature(iter_cmp, str_char, unicode)] /* @@ -219,8 +219,3 @@ pub fn uumain(args: Vec) -> i32 { 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/fmt/main.rs b/src/fmt/main.rs new file mode 100644 index 000000000..ac1b5d125 --- /dev/null +++ b/src/fmt/main.rs @@ -0,0 +1,5 @@ +extern crate uu_fmt; + +fn main() { + std::process::exit(uu_fmt::uumain(std::env::args().collect())); +} diff --git a/src/fold/Cargo.toml b/src/fold/Cargo.toml index 5da2fed4d..99bc629e7 100644 --- a/src/fold/Cargo.toml +++ b/src/fold/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "fold" +name = "uu_fold" path = "fold.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="fold" -path="fold.rs" +name = "fold" +path = "main.rs" diff --git a/src/fold/fold.rs b/src/fold/fold.rs index fcaf77ab3..6650d2c9f 100644 --- a/src/fold/fold.rs +++ b/src/fold/fold.rs @@ -1,4 +1,4 @@ -#![crate_name = "fold"] +#![crate_name = "uu_fold"] /* * This file is part of the uutils coreutils package. @@ -219,8 +219,3 @@ fn rfind_whitespace(slice: &str) -> Option { } None } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/fold/main.rs b/src/fold/main.rs new file mode 100644 index 000000000..56c0a56d5 --- /dev/null +++ b/src/fold/main.rs @@ -0,0 +1,5 @@ +extern crate uu_fold; + +fn main() { + std::process::exit(uu_fold::uumain(std::env::args().collect())); +} diff --git a/src/groups/Cargo.toml b/src/groups/Cargo.toml index 684a250fc..c468e8a08 100644 --- a/src/groups/Cargo.toml +++ b/src/groups/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "groups" +name = "uu_groups" path = "groups.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="groups" -path="groups.rs" +name = "groups" +path = "main.rs" diff --git a/src/groups/groups.rs b/src/groups/groups.rs index 1eac56dc8..2ba06c1b4 100644 --- a/src/groups/groups.rs +++ b/src/groups/groups.rs @@ -1,4 +1,4 @@ -#![crate_name = "groups"] +#![crate_name = "uu_groups"] /* * This file is part of the uutils coreutils package. @@ -51,8 +51,3 @@ Prints the groups a user is in to standard output.", NAME, VERSION); 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/groups/main.rs b/src/groups/main.rs new file mode 100644 index 000000000..5ddd248c9 --- /dev/null +++ b/src/groups/main.rs @@ -0,0 +1,5 @@ +extern crate uu_groups; + +fn main() { + std::process::exit(uu_groups::uumain(std::env::args().collect())); +} diff --git a/src/hashsum/Cargo.toml b/src/hashsum/Cargo.toml index 3e70dee34..38fe83ed7 100644 --- a/src/hashsum/Cargo.toml +++ b/src/hashsum/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "hashsum" +name = "uu_hashsum" path = "hashsum.rs" [dependencies] @@ -16,5 +16,5 @@ rust-crypto = "*" uucore = { path="../uucore" } [[bin]] -name="hashsum" -path="hashsum.rs" +name = "hashsum" +path = "main.rs" diff --git a/src/hashsum/hashsum.rs b/src/hashsum/hashsum.rs index 90fb79f14..22faa7cf9 100644 --- a/src/hashsum/hashsum.rs +++ b/src/hashsum/hashsum.rs @@ -1,4 +1,4 @@ -#![crate_name = "hashsum"] +#![crate_name = "uu_hashsum"] /* * This file is part of the uutils coreutils package. @@ -306,8 +306,3 @@ fn digest_reader<'a, T: Read>(digest: &mut Box, reader: &mut BufReade Ok(digest.result_str()) } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/hashsum/main.rs b/src/hashsum/main.rs new file mode 100644 index 000000000..7c0126164 --- /dev/null +++ b/src/hashsum/main.rs @@ -0,0 +1,5 @@ +extern crate uu_hashsum; + +fn main() { + std::process::exit(uu_hashsum::uumain(std::env::args().collect())); +} diff --git a/src/head/Cargo.toml b/src/head/Cargo.toml index 930f8832d..aaa2874eb 100644 --- a/src/head/Cargo.toml +++ b/src/head/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "head" +name = "uu_head" path = "head.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="head" -path="head.rs" +name = "head" +path = "main.rs" diff --git a/src/head/head.rs b/src/head/head.rs index 1702172fa..3b79e9285 100644 --- a/src/head/head.rs +++ b/src/head/head.rs @@ -1,4 +1,4 @@ -#![crate_name = "head"] +#![crate_name = "uu_head"] /* * This file is part of the uutils coreutils package. @@ -207,8 +207,3 @@ fn head(reader: &mut BufReader, settings: &Settings) -> bool { fn version() { println!("{} {}", NAME, VERSION); } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/head/main.rs b/src/head/main.rs new file mode 100644 index 000000000..d0d2aa15b --- /dev/null +++ b/src/head/main.rs @@ -0,0 +1,5 @@ +extern crate uu_head; + +fn main() { + std::process::exit(uu_head::uumain(std::env::args().collect())); +} diff --git a/src/hostid/Cargo.toml b/src/hostid/Cargo.toml index b2d0c746b..985eebe3b 100644 --- a/src/hostid/Cargo.toml +++ b/src/hostid/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "hostid" +name = "uu_hostid" path = "hostid.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="hostid" -path="hostid.rs" +name = "hostid" +path = "main.rs" diff --git a/src/hostid/hostid.rs b/src/hostid/hostid.rs index dd9a5305d..a266fbcfe 100644 --- a/src/hostid/hostid.rs +++ b/src/hostid/hostid.rs @@ -1,4 +1,4 @@ -#![crate_name = "hostid"] +#![crate_name = "uu_hostid"] /* * This file is part of the uutils coreutils package. @@ -87,8 +87,3 @@ fn hostid() { result &= 0xffffffff; println!("{:0>8x}", result); } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/hostid/main.rs b/src/hostid/main.rs new file mode 100644 index 000000000..72e4104e2 --- /dev/null +++ b/src/hostid/main.rs @@ -0,0 +1,5 @@ +extern crate uu_hostid; + +fn main() { + std::process::exit(uu_hostid::uumain(std::env::args().collect())); +} diff --git a/src/hostname/Cargo.toml b/src/hostname/Cargo.toml index 45b06daf3..e135f99fd 100644 --- a/src/hostname/Cargo.toml +++ b/src/hostname/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "hostname" +name = "uu_hostname" path = "hostname.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="hostname" -path="hostname.rs" +name = "hostname" +path = "main.rs" diff --git a/src/hostname/hostname.rs b/src/hostname/hostname.rs index 3dae3ff28..fd78c87db 100644 --- a/src/hostname/hostname.rs +++ b/src/hostname/hostname.rs @@ -1,4 +1,4 @@ -#![crate_name = "hostname"] +#![crate_name = "uu_hostname"] /* * This file is part of the uutils coreutils package. @@ -174,8 +174,3 @@ fn xsethostname(name: &str) { println!("Cannot set hostname to {}", name); } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/hostname/main.rs b/src/hostname/main.rs new file mode 100644 index 000000000..5fb75dbbb --- /dev/null +++ b/src/hostname/main.rs @@ -0,0 +1,5 @@ +extern crate uu_hostname; + +fn main() { + std::process::exit(uu_hostname::uumain(std::env::args().collect())); +} diff --git a/src/id/Cargo.toml b/src/id/Cargo.toml index 930f91f50..664cb7399 100644 --- a/src/id/Cargo.toml +++ b/src/id/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "id" +name = "uu_id" path = "id.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="id" -path="id.rs" +name = "id" +path = "main.rs" diff --git a/src/id/id.rs b/src/id/id.rs index f589d3345..7e9e89b70 100644 --- a/src/id/id.rs +++ b/src/id/id.rs @@ -1,4 +1,4 @@ -#![crate_name = "id"] +#![crate_name = "uu_id"] /* * This file is part of the uutils coreutils package. @@ -394,8 +394,3 @@ fn id_print(possible_pw: Option, p_euid: bool, p_egid: bool) { println!(""); } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/id/main.rs b/src/id/main.rs new file mode 100644 index 000000000..8a62d84fb --- /dev/null +++ b/src/id/main.rs @@ -0,0 +1,5 @@ +extern crate uu_id; + +fn main() { + std::process::exit(uu_id::uumain(std::env::args().collect())); +} diff --git a/src/kill/Cargo.toml b/src/kill/Cargo.toml index b90b8a3ad..711d6dfc7 100644 --- a/src/kill/Cargo.toml +++ b/src/kill/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "kill" +name = "uu_kill" path = "kill.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="kill" -path="kill.rs" +name = "kill" +path = "main.rs" diff --git a/src/kill/kill.rs b/src/kill/kill.rs index 0d0625cf2..cc099402b 100644 --- a/src/kill/kill.rs +++ b/src/kill/kill.rs @@ -1,4 +1,4 @@ -#![crate_name = "kill"] +#![crate_name = "uu_kill"] /* * This file is part of the uutils coreutils package. @@ -185,8 +185,3 @@ fn kill(signalname: &str, pids: std::vec::Vec) -> i32 { } status } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/kill/main.rs b/src/kill/main.rs new file mode 100644 index 000000000..201a81128 --- /dev/null +++ b/src/kill/main.rs @@ -0,0 +1,5 @@ +extern crate uu_kill; + +fn main() { + std::process::exit(uu_kill::uumain(std::env::args().collect())); +} diff --git a/src/link/Cargo.toml b/src/link/Cargo.toml index 24fe96770..648cab96e 100644 --- a/src/link/Cargo.toml +++ b/src/link/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "link" +name = "uu_link" path = "link.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="link" -path="link.rs" +name = "link" +path = "main.rs" diff --git a/src/link/link.rs b/src/link/link.rs index 8b8c77c2a..863c9814e 100644 --- a/src/link/link.rs +++ b/src/link/link.rs @@ -1,4 +1,4 @@ -#![crate_name = "link"] +#![crate_name = "uu_link"] /* * This file is part of the uutils coreutils package. @@ -63,8 +63,3 @@ Create a link named FILE2 to FILE1.", NAME, VERSION); } } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/link/main.rs b/src/link/main.rs new file mode 100644 index 000000000..06d2c463e --- /dev/null +++ b/src/link/main.rs @@ -0,0 +1,5 @@ +extern crate uu_link; + +fn main() { + std::process::exit(uu_link::uumain(std::env::args().collect())); +} diff --git a/src/ln/Cargo.toml b/src/ln/Cargo.toml index e4973c1cc..7d4c19d66 100644 --- a/src/ln/Cargo.toml +++ b/src/ln/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "ln" +name = "uu_ln" path = "ln.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="ln" -path="ln.rs" +name = "ln" +path = "main.rs" diff --git a/src/ln/ln.rs b/src/ln/ln.rs index 104874008..5b71e8246 100644 --- a/src/ln/ln.rs +++ b/src/ln/ln.rs @@ -1,4 +1,4 @@ -#![crate_name = "ln"] +#![crate_name = "uu_ln"] /* * This file is part of the uutils coreutils package. @@ -326,8 +326,3 @@ pub fn is_symlink>(path: P) -> bool { Err(_) => false } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/ln/main.rs b/src/ln/main.rs new file mode 100644 index 000000000..d797a7f52 --- /dev/null +++ b/src/ln/main.rs @@ -0,0 +1,5 @@ +extern crate uu_ln; + +fn main() { + std::process::exit(uu_ln::uumain(std::env::args().collect())); +} diff --git a/src/logname/Cargo.toml b/src/logname/Cargo.toml index 824f99893..dfcf0454c 100644 --- a/src/logname/Cargo.toml +++ b/src/logname/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "logname" +name = "uu_logname" path = "logname.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="logname" -path="logname.rs" +name = "logname" +path = "main.rs" diff --git a/src/logname/logname.rs b/src/logname/logname.rs index b0c3ca455..b5b245456 100644 --- a/src/logname/logname.rs +++ b/src/logname/logname.rs @@ -1,4 +1,4 @@ -#![crate_name = "logname"] +#![crate_name = "uu_logname"] /* * This file is part of the uutils coreutils package. @@ -80,8 +80,3 @@ fn exec() { None => println!("{}: no login name", NAME) } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/logname/main.rs b/src/logname/main.rs new file mode 100644 index 000000000..171ca5396 --- /dev/null +++ b/src/logname/main.rs @@ -0,0 +1,5 @@ +extern crate uu_logname; + +fn main() { + std::process::exit(uu_logname::uumain(std::env::args().collect())); +} diff --git a/src/mkdir/Cargo.toml b/src/mkdir/Cargo.toml index 99824019e..662aeef54 100644 --- a/src/mkdir/Cargo.toml +++ b/src/mkdir/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "mkdir" +name = "uu_mkdir" path = "mkdir.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="mkdir" -path="mkdir.rs" +name = "mkdir" +path = "main.rs" diff --git a/src/mkdir/main.rs b/src/mkdir/main.rs new file mode 100644 index 000000000..670750817 --- /dev/null +++ b/src/mkdir/main.rs @@ -0,0 +1,5 @@ +extern crate uu_mkdir; + +fn main() { + std::process::exit(uu_mkdir::uumain(std::env::args().collect())); +} diff --git a/src/mkdir/mkdir.rs b/src/mkdir/mkdir.rs index fa55bafbe..f2a40d93a 100644 --- a/src/mkdir/mkdir.rs +++ b/src/mkdir/mkdir.rs @@ -1,4 +1,4 @@ -#![crate_name = "mkdir"] +#![crate_name = "uu_mkdir"] /* * This file is part of the uutils coreutils package. @@ -155,8 +155,3 @@ fn mkdir(path: &Path, mode: u16, verbose: bool) -> i32 { } chmod(path, mode) } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/mkfifo/Cargo.toml b/src/mkfifo/Cargo.toml index 360e69c2b..29b840c0e 100644 --- a/src/mkfifo/Cargo.toml +++ b/src/mkfifo/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "mkfifo" +name = "uu_mkfifo" path = "mkfifo.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="mkfifo" -path="mkfifo.rs" +name = "mkfifo" +path = "main.rs" diff --git a/src/mkfifo/main.rs b/src/mkfifo/main.rs new file mode 100644 index 000000000..7cd6052fd --- /dev/null +++ b/src/mkfifo/main.rs @@ -0,0 +1,5 @@ +extern crate uu_mkfifo; + +fn main() { + std::process::exit(uu_mkfifo::uumain(std::env::args().collect())); +} diff --git a/src/mkfifo/mkfifo.rs b/src/mkfifo/mkfifo.rs index 468cd83e2..593582670 100644 --- a/src/mkfifo/mkfifo.rs +++ b/src/mkfifo/mkfifo.rs @@ -1,4 +1,4 @@ -#![crate_name = "mkfifo"] +#![crate_name = "uu_mkfifo"] /* * This file is part of the uutils coreutils package. @@ -76,8 +76,3 @@ Create a FIFO with the given name.", NAME, VERSION); exit_status } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/mv/Cargo.toml b/src/mv/Cargo.toml index c05846062..435bd5d16 100644 --- a/src/mv/Cargo.toml +++ b/src/mv/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "mv" +name = "uu_mv" path = "mv.rs" [dependencies] @@ -16,5 +16,5 @@ uucore = { path="../uucore" } time = "*" [[bin]] -name="mv" -path="mv.rs" +name = "mv" +path = "main.rs" diff --git a/src/mv/main.rs b/src/mv/main.rs new file mode 100644 index 000000000..bb0448229 --- /dev/null +++ b/src/mv/main.rs @@ -0,0 +1,5 @@ +extern crate uu_mv; + +fn main() { + std::process::exit(uu_mv::uumain(std::env::args().collect())); +} diff --git a/src/mv/mv.rs b/src/mv/mv.rs index a401b87bf..c06d32284 100644 --- a/src/mv/mv.rs +++ b/src/mv/mv.rs @@ -1,4 +1,4 @@ -#![crate_name = "mv"] +#![crate_name = "uu_mv"] /* * This file is part of the uutils coreutils package. @@ -351,8 +351,3 @@ fn existing_backup_path(path: &PathBuf, suffix: &String) -> PathBuf { } simple_backup_path(path, suffix) } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/nice/Cargo.toml b/src/nice/Cargo.toml index 9fa1c051c..db73abdf6 100644 --- a/src/nice/Cargo.toml +++ b/src/nice/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "nice" +name = "uu_nice" path = "nice.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="nice" -path="nice.rs" +name = "nice" +path = "main.rs" diff --git a/src/nice/main.rs b/src/nice/main.rs new file mode 100644 index 000000000..cebe298a2 --- /dev/null +++ b/src/nice/main.rs @@ -0,0 +1,5 @@ +extern crate uu_nice; + +fn main() { + std::process::exit(uu_nice::uumain(std::env::args().collect())); +} diff --git a/src/nice/nice.rs b/src/nice/nice.rs index 8259983d9..410da0ebf 100644 --- a/src/nice/nice.rs +++ b/src/nice/nice.rs @@ -1,4 +1,4 @@ -#![crate_name = "nice"] +#![crate_name = "uu_nice"] /* * This file is part of the uutils coreutils package. @@ -109,8 +109,3 @@ process).", NAME, VERSION); show_error!("{}", Error::last_os_error()); if Error::last_os_error().raw_os_error().unwrap() as c_int == libc::ENOENT { 127 } else { 126 } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/nl/Cargo.toml b/src/nl/Cargo.toml index f5a700e5d..31a160807 100644 --- a/src/nl/Cargo.toml +++ b/src/nl/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "nl" +name = "uu_nl" path = "nl.rs" [dependencies] @@ -17,5 +17,5 @@ regex-syntax = "*" uucore = { path="../uucore" } [[bin]] -name="nl" -path="nl.rs" +name = "nl" +path = "main.rs" diff --git a/src/nl/main.rs b/src/nl/main.rs new file mode 100644 index 000000000..70c017e78 --- /dev/null +++ b/src/nl/main.rs @@ -0,0 +1,5 @@ +extern crate uu_nl; + +fn main() { + std::process::exit(uu_nl::uumain(std::env::args().collect())); +} diff --git a/src/nl/nl.rs b/src/nl/nl.rs index fd77539cb..8426ff454 100644 --- a/src/nl/nl.rs +++ b/src/nl/nl.rs @@ -1,4 +1,4 @@ -#![crate_name = "nl"] +#![crate_name = "uu_nl"] /* * This file is part of the uutils coreutils package. @@ -328,8 +328,3 @@ fn print_usage(opts: &getopts::Options) { fn version() { println!("{} {}", NAME, VERSION); } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/nohup/Cargo.toml b/src/nohup/Cargo.toml index e902d5d6c..adc53805d 100644 --- a/src/nohup/Cargo.toml +++ b/src/nohup/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "nohup" +name = "uu_nohup" path = "nohup.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="nohup" -path="nohup.rs" +name = "nohup" +path = "main.rs" diff --git a/src/nohup/main.rs b/src/nohup/main.rs new file mode 100644 index 000000000..52935b16f --- /dev/null +++ b/src/nohup/main.rs @@ -0,0 +1,5 @@ +extern crate uu_nohup; + +fn main() { + std::process::exit(uu_nohup::uumain(std::env::args().collect())); +} diff --git a/src/nohup/nohup.rs b/src/nohup/nohup.rs index 748000b18..3f5aa4977 100644 --- a/src/nohup/nohup.rs +++ b/src/nohup/nohup.rs @@ -1,4 +1,4 @@ -#![crate_name = "nohup"] +#![crate_name = "uu_nohup"] /* * This file is part of the uutils coreutils package. @@ -141,8 +141,3 @@ If standard error is terminal, it'll be redirected to stdout.", NAME, VERSION); print!("{}", opts.usage(&msg)); } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/nproc/Cargo.toml b/src/nproc/Cargo.toml index 3ad1c9e34..c9887982e 100644 --- a/src/nproc/Cargo.toml +++ b/src/nproc/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "nproc" +name = "uu_nproc" path = "nproc.rs" [dependencies] @@ -14,5 +14,5 @@ num_cpus = "*" uucore = { path="../uucore" } [[bin]] -name="nproc" -path="nproc.rs" +name = "nproc" +path = "main.rs" diff --git a/src/nproc/main.rs b/src/nproc/main.rs new file mode 100644 index 000000000..26a8ebbe4 --- /dev/null +++ b/src/nproc/main.rs @@ -0,0 +1,5 @@ +extern crate uu_nproc; + +fn main() { + std::process::exit(uu_nproc::uumain(std::env::args().collect())); +} diff --git a/src/nproc/nproc.rs b/src/nproc/nproc.rs index 2cc143650..303baa4f4 100644 --- a/src/nproc/nproc.rs +++ b/src/nproc/nproc.rs @@ -1,4 +1,4 @@ -#![crate_name = "nproc"] +#![crate_name = "uu_nproc"] /* * This file is part of the uutils coreutils package. @@ -84,8 +84,3 @@ Print the number of cores available to the current process.", NAME, VERSION); println!("{}", cores); 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/od/Cargo.toml b/src/od/Cargo.toml index e3fff21b0..d6320dd65 100644 --- a/src/od/Cargo.toml +++ b/src/od/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "od" +name = "uu_od" path = "od.rs" [dependencies] @@ -12,5 +12,5 @@ getopts = "*" libc = "*" [[bin]] -name="od" -path="od.rs" +name = "od" +path = "main.rs" diff --git a/src/od/main.rs b/src/od/main.rs new file mode 100644 index 000000000..6e3065cf5 --- /dev/null +++ b/src/od/main.rs @@ -0,0 +1,5 @@ +extern crate uu_od; + +fn main() { + std::process::exit(uu_od::uumain(std::env::args().collect())); +} diff --git a/src/od/od.rs b/src/od/od.rs index 471abf859..8a8f15393 100644 --- a/src/od/od.rs +++ b/src/od/od.rs @@ -1,4 +1,4 @@ -#![crate_name = "od"] +#![crate_name = "uu_od"] /* * This file is part of the uutils coreutils package. @@ -124,8 +124,3 @@ fn print_with_radix(r: &Radix, x: usize) { Radix::Binary => print!("{:07b}", x) } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/paste/Cargo.toml b/src/paste/Cargo.toml index 0b22ba4ed..17187e52b 100644 --- a/src/paste/Cargo.toml +++ b/src/paste/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "paste" +name = "uu_paste" path = "paste.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="paste" -path="paste.rs" +name = "paste" +path = "main.rs" diff --git a/src/paste/main.rs b/src/paste/main.rs new file mode 100644 index 000000000..ef80ff695 --- /dev/null +++ b/src/paste/main.rs @@ -0,0 +1,5 @@ +extern crate uu_paste; + +fn main() { + std::process::exit(uu_paste::uumain(std::env::args().collect())); +} diff --git a/src/paste/paste.rs b/src/paste/paste.rs index 52a899b1e..021d25c43 100644 --- a/src/paste/paste.rs +++ b/src/paste/paste.rs @@ -1,4 +1,4 @@ -#![crate_name = "paste"] +#![crate_name = "uu_paste"] /* * This file is part of the uutils coreutils package. @@ -127,8 +127,3 @@ fn unescape(s: String) -> String { .replace("\\\\", "\\") .replace("\\", "") } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/printenv/Cargo.toml b/src/printenv/Cargo.toml index fa378b465..a469e26e0 100644 --- a/src/printenv/Cargo.toml +++ b/src/printenv/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "printenv" +name = "uu_printenv" path = "printenv.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="printenv" -path="printenv.rs" +name = "printenv" +path = "main.rs" diff --git a/src/printenv/main.rs b/src/printenv/main.rs new file mode 100644 index 000000000..03f34f399 --- /dev/null +++ b/src/printenv/main.rs @@ -0,0 +1,5 @@ +extern crate uu_printenv; + +fn main() { + std::process::exit(uu_printenv::uumain(std::env::args().collect())); +} diff --git a/src/printenv/printenv.rs b/src/printenv/printenv.rs index 5025a3194..0fa2ff9ba 100644 --- a/src/printenv/printenv.rs +++ b/src/printenv/printenv.rs @@ -1,4 +1,4 @@ -#![crate_name = "printenv"] +#![crate_name = "uu_printenv"] /* * This file is part of the uutils coreutils package. @@ -75,8 +75,3 @@ pub fn exec(args: Vec, separator: &str) { } } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/ptx/Cargo.toml b/src/ptx/Cargo.toml index 708d2c944..d26d3fa4c 100644 --- a/src/ptx/Cargo.toml +++ b/src/ptx/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "ptx" +name = "uu_ptx" path = "ptx.rs" [dependencies] @@ -17,5 +17,5 @@ regex = "*" uucore = { path="../uucore" } [[bin]] -name="ptx" -path="ptx.rs" +name = "ptx" +path = "main.rs" diff --git a/src/ptx/main.rs b/src/ptx/main.rs new file mode 100644 index 000000000..af9ce7eed --- /dev/null +++ b/src/ptx/main.rs @@ -0,0 +1,5 @@ +extern crate uu_ptx; + +fn main() { + std::process::exit(uu_ptx::uumain(std::env::args().collect())); +} diff --git a/src/ptx/ptx.rs b/src/ptx/ptx.rs index e39cf19a5..6fd44ee11 100644 --- a/src/ptx/ptx.rs +++ b/src/ptx/ptx.rs @@ -1,4 +1,4 @@ -#![crate_name = "ptx"] +#![crate_name = "uu_ptx"] /* * This file is part of the uutils coreutils package. @@ -560,8 +560,3 @@ pub fn uumain(args: Vec) -> i32 { write_traditional_output(&config, &file_map, &word_set, &output_file); 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/pwd/Cargo.toml b/src/pwd/Cargo.toml index e72800968..fbf0c8b60 100644 --- a/src/pwd/Cargo.toml +++ b/src/pwd/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "pwd" +name = "uu_pwd" path = "pwd.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="pwd" -path="pwd.rs" +name = "pwd" +path = "main.rs" diff --git a/src/pwd/main.rs b/src/pwd/main.rs new file mode 100644 index 000000000..60786163d --- /dev/null +++ b/src/pwd/main.rs @@ -0,0 +1,5 @@ +extern crate uu_pwd; + +fn main() { + std::process::exit(uu_pwd::uumain(std::env::args().collect())); +} diff --git a/src/pwd/pwd.rs b/src/pwd/pwd.rs index b144d7f52..08788043e 100644 --- a/src/pwd/pwd.rs +++ b/src/pwd/pwd.rs @@ -1,4 +1,4 @@ -#![crate_name = "pwd"] +#![crate_name = "uu_pwd"] /* * This file is part of the uutils coreutils package. @@ -50,8 +50,3 @@ Print the full filename of the current working directory.", NAME, VERSION); 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/readlink/Cargo.toml b/src/readlink/Cargo.toml index e18e9ecfe..c0b238180 100644 --- a/src/readlink/Cargo.toml +++ b/src/readlink/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "readlink" +name = "uu_readlink" path = "readlink.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="readlink" -path="readlink.rs" +name = "readlink" +path = "main.rs" diff --git a/src/readlink/main.rs b/src/readlink/main.rs new file mode 100644 index 000000000..367df8bb4 --- /dev/null +++ b/src/readlink/main.rs @@ -0,0 +1,5 @@ +extern crate uu_readlink; + +fn main() { + std::process::exit(uu_readlink::uumain(std::env::args().collect())); +} diff --git a/src/readlink/readlink.rs b/src/readlink/readlink.rs index d6a8ad4a4..39d092199 100644 --- a/src/readlink/readlink.rs +++ b/src/readlink/readlink.rs @@ -1,4 +1,4 @@ -#![crate_name = "readlink"] +#![crate_name = "uu_readlink"] /* * This file is part of the uutils coreutils package. @@ -133,8 +133,3 @@ fn show_usage(opts: &getopts::Options) { print!("Print value of a symbolic link or canonical file name"); print!("{}", opts.usage("")); } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/realpath/Cargo.toml b/src/realpath/Cargo.toml index 7cef34d27..0028e042c 100644 --- a/src/realpath/Cargo.toml +++ b/src/realpath/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "realpath" +name = "uu_realpath" path = "realpath.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="realpath" -path="realpath.rs" +name = "realpath" +path = "main.rs" diff --git a/src/realpath/main.rs b/src/realpath/main.rs new file mode 100644 index 000000000..8a695b809 --- /dev/null +++ b/src/realpath/main.rs @@ -0,0 +1,5 @@ +extern crate uu_realpath; + +fn main() { + std::process::exit(uu_realpath::uumain(std::env::args().collect())); +} diff --git a/src/realpath/realpath.rs b/src/realpath/realpath.rs index bf4dd3dad..6316bbe75 100644 --- a/src/realpath/realpath.rs +++ b/src/realpath/realpath.rs @@ -1,4 +1,4 @@ -#![crate_name= "realpath"] +#![crate_name= "uu_realpath"] /* * This file is part of the uutils coreutils package. @@ -135,8 +135,3 @@ fn show_usage(opts: &getopts::Options) { Each resolved FILENAME will be written to the standard output, one per line.") ); } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/relpath/Cargo.toml b/src/relpath/Cargo.toml index 2b9627adb..0c3779a4e 100644 --- a/src/relpath/Cargo.toml +++ b/src/relpath/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "relpath" +name = "uu_relpath" path = "relpath.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="relpath" -path="relpath.rs" +name = "relpath" +path = "main.rs" diff --git a/src/relpath/main.rs b/src/relpath/main.rs new file mode 100644 index 000000000..78b52a01f --- /dev/null +++ b/src/relpath/main.rs @@ -0,0 +1,5 @@ +extern crate uu_relpath; + +fn main() { + std::process::exit(uu_relpath::uumain(std::env::args().collect())); +} diff --git a/src/relpath/relpath.rs b/src/relpath/relpath.rs index 877792965..2c965888f 100644 --- a/src/relpath/relpath.rs +++ b/src/relpath/relpath.rs @@ -1,4 +1,4 @@ -#![crate_name = "relpath"] +#![crate_name = "uu_relpath"] /* * This file is part of the uutils coreutils package. @@ -100,8 +100,3 @@ fn show_usage(opts: &getopts::Options) { If FROM path is omitted, current working dir will be used.") ); } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/rm/Cargo.toml b/src/rm/Cargo.toml index 5879ee076..32802457d 100644 --- a/src/rm/Cargo.toml +++ b/src/rm/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "rm" +name = "uu_rm" path = "rm.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="rm" -path="rm.rs" +name = "rm" +path = "main.rs" diff --git a/src/rm/main.rs b/src/rm/main.rs new file mode 100644 index 000000000..b89ea4969 --- /dev/null +++ b/src/rm/main.rs @@ -0,0 +1,5 @@ +extern crate uu_rm; + +fn main() { + std::process::exit(uu_rm::uumain(std::env::args().collect())); +} diff --git a/src/rm/rm.rs b/src/rm/rm.rs index 96b426aa8..987603db8 100644 --- a/src/rm/rm.rs +++ b/src/rm/rm.rs @@ -1,4 +1,4 @@ -#![crate_name = "rm"] +#![crate_name = "uu_rm"] /* * This file is part of the uutils coreutils package. @@ -285,8 +285,3 @@ fn prompt(msg: &str) -> bool { _ => false, } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/rmdir/Cargo.toml b/src/rmdir/Cargo.toml index 97ce7f1cc..b0f36d8f9 100644 --- a/src/rmdir/Cargo.toml +++ b/src/rmdir/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "rmdir" +name = "uu_rmdir" path = "rmdir.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="rmdir" -path="rmdir.rs" +name = "rmdir" +path = "main.rs" diff --git a/src/rmdir/main.rs b/src/rmdir/main.rs new file mode 100644 index 000000000..dfd6172ed --- /dev/null +++ b/src/rmdir/main.rs @@ -0,0 +1,5 @@ +extern crate uu_rmdir; + +fn main() { + std::process::exit(uu_rmdir::uumain(std::env::args().collect())); +} diff --git a/src/rmdir/rmdir.rs b/src/rmdir/rmdir.rs index 43c0c2d61..5f978f541 100644 --- a/src/rmdir/rmdir.rs +++ b/src/rmdir/rmdir.rs @@ -1,4 +1,4 @@ -#![crate_name = "rmdir"] +#![crate_name = "uu_rmdir"] /* * This file is part of the uutils coreutils package. @@ -123,8 +123,3 @@ fn remove_dir(path: &Path, ignore: bool, verbose: bool) -> Result<(), i32> { r } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/seq/Cargo.toml b/src/seq/Cargo.toml index 5e8fc0629..78f267934 100644 --- a/src/seq/Cargo.toml +++ b/src/seq/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "seq" +name = "uu_seq" path = "seq.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="seq" -path="seq.rs" +name = "seq" +path = "main.rs" diff --git a/src/seq/main.rs b/src/seq/main.rs new file mode 100644 index 000000000..5a7d48048 --- /dev/null +++ b/src/seq/main.rs @@ -0,0 +1,5 @@ +extern crate uu_seq; + +fn main() { + std::process::exit(uu_seq::uumain(std::env::args().collect())); +} diff --git a/src/seq/seq.rs b/src/seq/seq.rs index 299f26804..e1a731591 100644 --- a/src/seq/seq.rs +++ b/src/seq/seq.rs @@ -1,4 +1,4 @@ -#![crate_name = "seq"] +#![crate_name = "uu_seq"] // TODO: Make -w flag work with decimals // TODO: Support -f flag @@ -257,8 +257,3 @@ fn print_seq(first: f64, step: f64, last: f64, largest_dec: usize, separator: St } pipe_flush!(); } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/shuf/Cargo.toml b/src/shuf/Cargo.toml index 8b5d7e14e..349688d5a 100644 --- a/src/shuf/Cargo.toml +++ b/src/shuf/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "shuf" +name = "uu_shuf" path = "shuf.rs" [dependencies] @@ -14,5 +14,5 @@ rand = "*" uucore = { path="../uucore" } [[bin]] -name="shuf" -path="shuf.rs" +name = "shuf" +path = "main.rs" diff --git a/src/shuf/main.rs b/src/shuf/main.rs new file mode 100644 index 000000000..5c903d5af --- /dev/null +++ b/src/shuf/main.rs @@ -0,0 +1,5 @@ +extern crate uu_shuf; + +fn main() { + std::process::exit(uu_shuf::uumain(std::env::args().collect())); +} diff --git a/src/shuf/shuf.rs b/src/shuf/shuf.rs index d76a3a5b6..ff9057630 100644 --- a/src/shuf/shuf.rs +++ b/src/shuf/shuf.rs @@ -1,4 +1,4 @@ -#![crate_name = "shuf"] +#![crate_name = "uu_shuf"] /* * This file is part of the uutils coreutils package. @@ -266,8 +266,3 @@ impl WrappedRng { } } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/sleep/Cargo.toml b/src/sleep/Cargo.toml index 8430e420a..daa715a25 100644 --- a/src/sleep/Cargo.toml +++ b/src/sleep/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "sleep" +name = "uu_sleep" path = "sleep.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="sleep" -path="sleep.rs" +name = "sleep" +path = "main.rs" diff --git a/src/sleep/main.rs b/src/sleep/main.rs new file mode 100644 index 000000000..e52eb32ef --- /dev/null +++ b/src/sleep/main.rs @@ -0,0 +1,5 @@ +extern crate uu_sleep; + +fn main() { + std::process::exit(uu_sleep::uumain(std::env::args().collect())); +} diff --git a/src/sleep/sleep.rs b/src/sleep/sleep.rs index 0b6fc4312..1ace961d9 100644 --- a/src/sleep/sleep.rs +++ b/src/sleep/sleep.rs @@ -1,4 +1,4 @@ -#![crate_name = "sleep"] +#![crate_name = "uu_sleep"] /* * This file is part of the uutils coreutils package. @@ -76,8 +76,3 @@ fn sleep(args: Vec) { }; thread::sleep(Duration::new(0, sleep_dur)); } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/sort/Cargo.toml b/src/sort/Cargo.toml index a7ab52be4..f9d265d49 100644 --- a/src/sort/Cargo.toml +++ b/src/sort/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "sort" +name = "uu_sort" path = "sort.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="sort" -path="sort.rs" +name = "sort" +path = "main.rs" diff --git a/src/sort/main.rs b/src/sort/main.rs new file mode 100644 index 000000000..0b7b904b1 --- /dev/null +++ b/src/sort/main.rs @@ -0,0 +1,5 @@ +extern crate uu_sort; + +fn main() { + std::process::exit(uu_sort::uumain(std::env::args().collect())); +} diff --git a/src/sort/sort.rs b/src/sort/sort.rs index 2f44ac318..d18430daa 100644 --- a/src/sort/sort.rs +++ b/src/sort/sort.rs @@ -1,4 +1,4 @@ -#![crate_name = "sort"] +#![crate_name = "uu_sort"] /* * This file is part of the uutils coreutils package. @@ -204,8 +204,3 @@ fn open<'a>(path: &str) -> Option<(Box, bool)> { }, } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/split/Cargo.toml b/src/split/Cargo.toml index cda1dad48..76140863b 100644 --- a/src/split/Cargo.toml +++ b/src/split/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "split" +name = "uu_split" path = "split.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="split" -path="split.rs" +name = "split" +path = "main.rs" diff --git a/src/split/main.rs b/src/split/main.rs new file mode 100644 index 000000000..74705c681 --- /dev/null +++ b/src/split/main.rs @@ -0,0 +1,5 @@ +extern crate uu_split; + +fn main() { + std::process::exit(uu_split::uumain(std::env::args().collect())); +} diff --git a/src/split/split.rs b/src/split/split.rs index c601965dd..704fd9b27 100644 --- a/src/split/split.rs +++ b/src/split/split.rs @@ -1,4 +1,4 @@ -#![crate_name = "split"] +#![crate_name = "uu_split"] /* * This file is part of the uutils coreutils package. @@ -314,8 +314,3 @@ fn split(settings: &Settings) -> i32 { } 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/stdbuf/Cargo.toml b/src/stdbuf/Cargo.toml index 4e2c22d9b..71b955055 100644 --- a/src/stdbuf/Cargo.toml +++ b/src/stdbuf/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "stdbuf" +name = "uu_stdbuf" path = "stdbuf.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="stdbuf" -path="stdbuf.rs" +name = "stdbuf" +path = "main.rs" diff --git a/src/stdbuf/main.rs b/src/stdbuf/main.rs new file mode 100644 index 000000000..4994146c2 --- /dev/null +++ b/src/stdbuf/main.rs @@ -0,0 +1,5 @@ +extern crate uu_stdbuf; + +fn main() { + std::process::exit(uu_stdbuf::uumain(std::env::args().collect())); +} diff --git a/src/stdbuf/stdbuf.rs b/src/stdbuf/stdbuf.rs index 008e8f503..82aa2280f 100644 --- a/src/stdbuf/stdbuf.rs +++ b/src/stdbuf/stdbuf.rs @@ -1,4 +1,4 @@ -#![crate_name = "stdbuf"] +#![crate_name = "uu_stdbuf"] /* * This file is part of the uutils coreutils package. @@ -264,8 +264,3 @@ pub fn uumain(args: Vec) -> i32 { Err(e) => crash!(1, "{}", e) }; } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/sum/Cargo.toml b/src/sum/Cargo.toml index 3f9bbc5af..057e9e0f2 100644 --- a/src/sum/Cargo.toml +++ b/src/sum/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "sum" +name = "uu_sum" path = "sum.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="sum" -path="sum.rs" +name = "sum" +path = "main.rs" diff --git a/src/sum/main.rs b/src/sum/main.rs new file mode 100644 index 000000000..2c624161a --- /dev/null +++ b/src/sum/main.rs @@ -0,0 +1,5 @@ +extern crate uu_sum; + +fn main() { + std::process::exit(uu_sum::uumain(std::env::args().collect())); +} diff --git a/src/sum/sum.rs b/src/sum/sum.rs index bc59c63c9..e3fac0d89 100644 --- a/src/sum/sum.rs +++ b/src/sum/sum.rs @@ -1,4 +1,4 @@ -#![crate_name = "sum"] +#![crate_name = "uu_sum"] /* * This file is part of the uutils coreutils package. @@ -137,8 +137,3 @@ Checksum and count the blocks in a file.", NAME, VERSION); 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/sync/Cargo.toml b/src/sync/Cargo.toml index 5ad082c47..6b7c749c9 100644 --- a/src/sync/Cargo.toml +++ b/src/sync/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "sync" +name = "uu_sync" path = "sync.rs" [dependencies] @@ -15,5 +15,5 @@ kernel32-sys = "*" uucore = { path="../uucore" } [[bin]] -name="sync" -path="sync.rs" +name = "sync" +path = "main.rs" diff --git a/src/sync/main.rs b/src/sync/main.rs new file mode 100644 index 000000000..254d1af24 --- /dev/null +++ b/src/sync/main.rs @@ -0,0 +1,5 @@ +extern crate uu_sync; + +fn main() { + std::process::exit(uu_sync::uumain(std::env::args().collect())); +} diff --git a/src/sync/sync.rs b/src/sync/sync.rs index bbca4e3fe..580ae9b20 100644 --- a/src/sync/sync.rs +++ b/src/sync/sync.rs @@ -1,4 +1,4 @@ -#![crate_name = "sync"] +#![crate_name = "uu_sync"] /* * This file is part of the uutils coreutils package. @@ -144,8 +144,3 @@ fn sync() -> isize { platform::do_sync() } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/tac/Cargo.toml b/src/tac/Cargo.toml index 806fd552f..f7e6d500b 100644 --- a/src/tac/Cargo.toml +++ b/src/tac/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "tac" +name = "uu_tac" path = "tac.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="tac" -path="tac.rs" +name = "tac" +path = "main.rs" diff --git a/src/tac/main.rs b/src/tac/main.rs new file mode 100644 index 000000000..a12abd5af --- /dev/null +++ b/src/tac/main.rs @@ -0,0 +1,5 @@ +extern crate uu_tac; + +fn main() { + std::process::exit(uu_tac::uumain(std::env::args().collect())); +} diff --git a/src/tac/tac.rs b/src/tac/tac.rs index 953ca53ce..fdbbccdd6 100644 --- a/src/tac/tac.rs +++ b/src/tac/tac.rs @@ -1,4 +1,4 @@ -#![crate_name = "tac"] +#![crate_name = "uu_tac"] /* * This file is part of the uutils coreutils package. @@ -146,8 +146,3 @@ fn show_line(out: &mut Stdout, sep: &[u8], dat: &[u8], before: bool) { out.write_all(sep).unwrap_or_else(|e| crash!(1, "failed to write to stdout: {}", e)); } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/tail/Cargo.toml b/src/tail/Cargo.toml index 4468d4d4c..878265f2f 100644 --- a/src/tail/Cargo.toml +++ b/src/tail/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "tail" +name = "uu_tail" path = "tail.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="tail" -path="tail.rs" +name = "tail" +path = "main.rs" diff --git a/src/tail/main.rs b/src/tail/main.rs new file mode 100644 index 000000000..e547fc23f --- /dev/null +++ b/src/tail/main.rs @@ -0,0 +1,5 @@ +extern crate uu_tail; + +fn main() { + std::process::exit(uu_tail::uumain(std::env::args().collect())); +} diff --git a/src/tail/tail.rs b/src/tail/tail.rs index 0aec74d20..1c485efb8 100644 --- a/src/tail/tail.rs +++ b/src/tail/tail.rs @@ -1,4 +1,4 @@ -#![crate_name = "tail"] +#![crate_name = "uu_tail"] /* * This file is part of the uutils coreutils package. @@ -298,8 +298,3 @@ fn print_string(_: &mut T, s: &String) { fn version () { println!("{} {}", NAME, VERSION); } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/tee/Cargo.toml b/src/tee/Cargo.toml index f97ed1927..65c86dc97 100644 --- a/src/tee/Cargo.toml +++ b/src/tee/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "tee" +name = "uu_tee" path = "tee.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="tee" -path="tee.rs" +name = "tee" +path = "main.rs" diff --git a/src/tee/main.rs b/src/tee/main.rs new file mode 100644 index 000000000..587397ff9 --- /dev/null +++ b/src/tee/main.rs @@ -0,0 +1,5 @@ +extern crate uu_tee; + +fn main() { + std::process::exit(uu_tee::uumain(std::env::args().collect())); +} diff --git a/src/tee/tee.rs b/src/tee/tee.rs index c22f1e136..56bc19255 100644 --- a/src/tee/tee.rs +++ b/src/tee/tee.rs @@ -1,4 +1,4 @@ -#![crate_name = "tee"] +#![crate_name = "uu_tee"] /* * This file is part of the uutils coreutils package. @@ -171,8 +171,3 @@ fn warn(message: &str) -> Error { eprintln!("{}: {}", NAME, message); Error::new(ErrorKind::Other, format!("{}: {}", NAME, message)) } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/test/Cargo.toml b/src/test/Cargo.toml index f76a73111..900d9d18e 100644 --- a/src/test/Cargo.toml +++ b/src/test/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "uutest" +name = "uu_test" path = "test.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="test" -path="main.rs" +name = "test" +path = "main.rs" diff --git a/src/test/main.rs b/src/test/main.rs index f43c77b7c..183d88639 100644 --- a/src/test/main.rs +++ b/src/test/main.rs @@ -1,5 +1,5 @@ -extern crate uutest; +extern crate uu_test; fn main() { - std::process::exit(uutest::uumain(std::env::args().collect())); + std::process::exit(uu_test::uumain(std::env::args().collect())); } diff --git a/src/test/test.rs b/src/test/test.rs index 9cd3a589d..17b7821b8 100644 --- a/src/test/test.rs +++ b/src/test/test.rs @@ -1,4 +1,4 @@ -#![crate_name = "uutest"] +#![crate_name = "uu_test"] /* * This file is part of the uutils coreutils package. diff --git a/src/timeout/Cargo.toml b/src/timeout/Cargo.toml index 85a0c9061..2e71af3d8 100644 --- a/src/timeout/Cargo.toml +++ b/src/timeout/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "timeout" +name = "uu_timeout" path = "timeout.rs" [dependencies] @@ -14,5 +14,5 @@ time = "*" uucore = { path="../uucore" } [[bin]] -name="timeout" -path="timeout.rs" +name = "timeout" +path = "main.rs" diff --git a/src/timeout/main.rs b/src/timeout/main.rs new file mode 100644 index 000000000..0e7646f9b --- /dev/null +++ b/src/timeout/main.rs @@ -0,0 +1,5 @@ +extern crate uu_timeout; + +fn main() { + std::process::exit(uu_timeout::uumain(std::env::args().collect())); +} diff --git a/src/timeout/timeout.rs b/src/timeout/timeout.rs index 84d618b85..3cb587a7e 100644 --- a/src/timeout/timeout.rs +++ b/src/timeout/timeout.rs @@ -1,4 +1,4 @@ -#![crate_name = "timeout"] +#![crate_name = "uu_timeout"] /* * This file is part of the uutils coreutils package. @@ -147,8 +147,3 @@ fn timeout(cmdname: &str, args: &[String], duration: f64, signal: usize, kill_af }, } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/touch/Cargo.toml b/src/touch/Cargo.toml index e9a6b5ea4..6dffc3f00 100644 --- a/src/touch/Cargo.toml +++ b/src/touch/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "touch" +name = "uu_touch" path = "touch.rs" [dependencies] @@ -15,5 +15,5 @@ time = "*" uucore = { path="../uucore" } [[bin]] -name="touch" -path="touch.rs" +name = "touch" +path = "main.rs" diff --git a/src/touch/main.rs b/src/touch/main.rs new file mode 100644 index 000000000..de31a0391 --- /dev/null +++ b/src/touch/main.rs @@ -0,0 +1,5 @@ +extern crate uu_touch; + +fn main() { + std::process::exit(uu_touch::uumain(std::env::args().collect())); +} diff --git a/src/touch/touch.rs b/src/touch/touch.rs index 975dad316..24120e67c 100644 --- a/src/touch/touch.rs +++ b/src/touch/touch.rs @@ -1,4 +1,4 @@ -#![crate_name = "touch"] +#![crate_name = "uu_touch"] /* * This file is part of the uutils coreutils package. @@ -203,9 +203,3 @@ fn parse_timestamp(s: &str) -> FileTime { Err(e) => panic!("Unable to parse timestamp\n{}", e) } } - - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/tr/Cargo.toml b/src/tr/Cargo.toml index 78ba1210c..42b4a087a 100644 --- a/src/tr/Cargo.toml +++ b/src/tr/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "tr" +name = "uu_tr" path = "tr.rs" [dependencies] @@ -15,5 +15,5 @@ vec_map = "*" uucore = { path="../uucore" } [[bin]] -name="tr" -path="tr.rs" +name = "tr" +path = "main.rs" diff --git a/src/tr/main.rs b/src/tr/main.rs new file mode 100644 index 000000000..8bc7f54d4 --- /dev/null +++ b/src/tr/main.rs @@ -0,0 +1,5 @@ +extern crate uu_tr; + +fn main() { + std::process::exit(uu_tr::uumain(std::env::args().collect())); +} diff --git a/src/tr/tr.rs b/src/tr/tr.rs index 1b06c9829..096716ccb 100644 --- a/src/tr/tr.rs +++ b/src/tr/tr.rs @@ -1,4 +1,4 @@ -#![crate_name = "tr"] +#![crate_name = "uu_tr"] #![feature(io)] /* @@ -162,8 +162,3 @@ pub fn uumain(args: Vec) -> i32 { 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/true/Cargo.toml b/src/true/Cargo.toml index 2b0154c53..e6e78793e 100644 --- a/src/true/Cargo.toml +++ b/src/true/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "true" +name = "uu_true" path = "true.rs" [dependencies] @@ -12,5 +12,5 @@ getopts = "*" libc = "*" [[bin]] -name="true" -path="true.rs" +name = "true" +path = "main.rs" diff --git a/src/true/main.rs b/src/true/main.rs new file mode 100644 index 000000000..6c1874c75 --- /dev/null +++ b/src/true/main.rs @@ -0,0 +1,5 @@ +extern crate uu_true; + +fn main() { + std::process::exit(uu_true::uumain(std::env::args().collect())); +} diff --git a/src/true/true.rs b/src/true/true.rs index f37b1a8eb..16ef23527 100644 --- a/src/true/true.rs +++ b/src/true/true.rs @@ -1,4 +1,4 @@ -#![crate_name= "true"] +#![crate_name= "uu_true"] /* * This file is part of the uutils coreutils package. @@ -9,12 +9,6 @@ * file that was distributed with this source code. */ - pub fn uumain(_: Vec) -> i32 { 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/truncate/Cargo.toml b/src/truncate/Cargo.toml index 4491d9262..59683dbe9 100644 --- a/src/truncate/Cargo.toml +++ b/src/truncate/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "truncate" +name = "uu_truncate" path = "truncate.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="truncate" -path="truncate.rs" +name = "truncate" +path = "main.rs" diff --git a/src/truncate/main.rs b/src/truncate/main.rs new file mode 100644 index 000000000..d13c55415 --- /dev/null +++ b/src/truncate/main.rs @@ -0,0 +1,5 @@ +extern crate uu_truncate; + +fn main() { + std::process::exit(uu_truncate::uumain(std::env::args().collect())); +} diff --git a/src/truncate/truncate.rs b/src/truncate/truncate.rs index 6b3583e4f..fe38ef403 100644 --- a/src/truncate/truncate.rs +++ b/src/truncate/truncate.rs @@ -1,4 +1,4 @@ -#![crate_name = "truncate"] +#![crate_name = "uu_truncate"] /* * This file is part of the uutils coreutils package. @@ -212,8 +212,3 @@ fn parse_size(size: &str) -> (u64, TruncateMode) { } (number, mode) } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/tsort/Cargo.toml b/src/tsort/Cargo.toml index d3d96f2d8..b9e7be45d 100644 --- a/src/tsort/Cargo.toml +++ b/src/tsort/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "tsort" +name = "uu_tsort" path = "tsort.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="tsort" -path="tsort.rs" +name = "tsort" +path = "main.rs" diff --git a/src/tsort/main.rs b/src/tsort/main.rs new file mode 100644 index 000000000..36bdd64b8 --- /dev/null +++ b/src/tsort/main.rs @@ -0,0 +1,5 @@ +extern crate uu_tsort; + +fn main() { + std::process::exit(uu_tsort::uumain(std::env::args().collect())); +} diff --git a/src/tsort/tsort.rs b/src/tsort/tsort.rs index 568b1faae..8b2d38590 100644 --- a/src/tsort/tsort.rs +++ b/src/tsort/tsort.rs @@ -1,4 +1,4 @@ -#![crate_name = "tsort"] +#![crate_name = "uu_tsort"] /* * This file is part of the uutils coreutils package. @@ -193,8 +193,3 @@ impl Graph { true } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/tty/Cargo.toml b/src/tty/Cargo.toml index 6229406eb..692484290 100644 --- a/src/tty/Cargo.toml +++ b/src/tty/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "tty" +name = "uu_tty" path = "tty.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="tty" -path="tty.rs" +name = "tty" +path = "main.rs" diff --git a/src/tty/main.rs b/src/tty/main.rs new file mode 100644 index 000000000..a210eee8e --- /dev/null +++ b/src/tty/main.rs @@ -0,0 +1,5 @@ +extern crate uu_tty; + +fn main() { + std::process::exit(uu_tty::uumain(std::env::args().collect())); +} diff --git a/src/tty/tty.rs b/src/tty/tty.rs index b70cdc272..25dcd43e2 100644 --- a/src/tty/tty.rs +++ b/src/tty/tty.rs @@ -1,4 +1,4 @@ -#![crate_name = "tty"] +#![crate_name = "uu_tty"] /* * This file is part of the uutils coreutils package. @@ -78,8 +78,3 @@ pub fn uumain(args: Vec) -> i32 { 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/uname/Cargo.toml b/src/uname/Cargo.toml index 15e95f07b..03cc6923b 100644 --- a/src/uname/Cargo.toml +++ b/src/uname/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "uname" +name = "uu_uname" path = "uname.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="uname" -path="uname.rs" +name = "uname" +path = "main.rs" diff --git a/src/uname/main.rs b/src/uname/main.rs new file mode 100644 index 000000000..8a16b41b5 --- /dev/null +++ b/src/uname/main.rs @@ -0,0 +1,5 @@ +extern crate uu_uname; + +fn main() { + std::process::exit(uu_uname::uumain(std::env::args().collect())); +} diff --git a/src/uname/uname.rs b/src/uname/uname.rs index 6641f7a09..78106e8f2 100644 --- a/src/uname/uname.rs +++ b/src/uname/uname.rs @@ -1,4 +1,4 @@ -#![crate_name = "uname"] +#![crate_name = "uu_uname"] /* * This file is part of the uutils coreutils package. @@ -106,8 +106,3 @@ pub fn uumain(args: Vec) -> i32 { 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/unexpand/Cargo.toml b/src/unexpand/Cargo.toml index 9123271ab..5745cd512 100644 --- a/src/unexpand/Cargo.toml +++ b/src/unexpand/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "unexpand" +name = "uu_unexpand" path = "unexpand.rs" [dependencies] @@ -14,5 +14,5 @@ unicode-width = "*" uucore = { path="../uucore" } [[bin]] -name="unexpand" -path="unexpand.rs" +name = "unexpand" +path = "main.rs" diff --git a/src/unexpand/main.rs b/src/unexpand/main.rs new file mode 100644 index 000000000..7f763a901 --- /dev/null +++ b/src/unexpand/main.rs @@ -0,0 +1,5 @@ +extern crate uu_unexpand; + +fn main() { + std::process::exit(uu_unexpand::uumain(std::env::args().collect())); +} diff --git a/src/unexpand/unexpand.rs b/src/unexpand/unexpand.rs index d030f1b4b..9e369897f 100644 --- a/src/unexpand/unexpand.rs +++ b/src/unexpand/unexpand.rs @@ -1,4 +1,4 @@ -#![crate_name = "unexpand"] +#![crate_name = "uu_unexpand"] #![feature(unicode)] /* @@ -280,8 +280,3 @@ fn unexpand(options: Options) { } pipe_flush!(output); } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/uniq/Cargo.toml b/src/uniq/Cargo.toml index f5d9a56e7..bbab749c8 100644 --- a/src/uniq/Cargo.toml +++ b/src/uniq/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "uniq" +name = "uu_uniq" path = "uniq.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="uniq" -path="uniq.rs" +name = "uniq" +path = "main.rs" diff --git a/src/uniq/main.rs b/src/uniq/main.rs new file mode 100644 index 000000000..19d33042f --- /dev/null +++ b/src/uniq/main.rs @@ -0,0 +1,5 @@ +extern crate uu_uniq; + +fn main() { + std::process::exit(uu_uniq::uumain(std::env::args().collect())); +} diff --git a/src/uniq/uniq.rs b/src/uniq/uniq.rs index 1ad51c9b7..546b3ad60 100644 --- a/src/uniq/uniq.rs +++ b/src/uniq/uniq.rs @@ -1,4 +1,4 @@ -#![crate_name = "uniq"] +#![crate_name = "uu_uniq"] /* * This file is part of the uutils coreutils package. @@ -239,8 +239,3 @@ fn open_output_file(out_file_name: String) -> BufWriter> { }; BufWriter::new(out_file) } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/unlink/Cargo.toml b/src/unlink/Cargo.toml index cd23f3f3e..b2f682b6d 100644 --- a/src/unlink/Cargo.toml +++ b/src/unlink/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "unlink" +name = "uu_unlink" path = "unlink.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="unlink" -path="unlink.rs" +name = "unlink" +path = "main.rs" diff --git a/src/unlink/main.rs b/src/unlink/main.rs new file mode 100644 index 000000000..6842d98b3 --- /dev/null +++ b/src/unlink/main.rs @@ -0,0 +1,5 @@ +extern crate uu_unlink; + +fn main() { + std::process::exit(uu_unlink::uumain(std::env::args().collect())); +} diff --git a/src/unlink/unlink.rs b/src/unlink/unlink.rs index 25f70e3dc..f74a3bd43 100644 --- a/src/unlink/unlink.rs +++ b/src/unlink/unlink.rs @@ -1,4 +1,4 @@ -#![crate_name = "unlink"] +#![crate_name = "uu_unlink"] /* * This file is part of the uutils coreutils package. @@ -90,8 +90,3 @@ pub fn uumain(args: Vec) -> i32 { 0 } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/uptime/Cargo.toml b/src/uptime/Cargo.toml index 50cf4bd6d..977d03bf3 100644 --- a/src/uptime/Cargo.toml +++ b/src/uptime/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "uptime" +name = "uu_uptime" path = "uptime.rs" [dependencies] @@ -14,5 +14,5 @@ time = "*" uucore = { path="../uucore" } [[bin]] -name="uptime" -path="uptime.rs" +name = "uptime" +path = "main.rs" diff --git a/src/uptime/main.rs b/src/uptime/main.rs new file mode 100644 index 000000000..324e3bf4a --- /dev/null +++ b/src/uptime/main.rs @@ -0,0 +1,5 @@ +extern crate uu_uptime; + +fn main() { + std::process::exit(uu_uptime::uumain(std::env::args().collect())); +} diff --git a/src/uptime/uptime.rs b/src/uptime/uptime.rs index 24c801f28..de990eb4e 100644 --- a/src/uptime/uptime.rs +++ b/src/uptime/uptime.rs @@ -1,4 +1,4 @@ -#![crate_name = "uptime"] +#![crate_name = "uu_uptime"] /* * This file is part of the uutils coreutils package. @@ -202,8 +202,3 @@ fn print_uptime(upsecs: i64) { print!("up {:2}:{:02}, ", uphours, upmins); } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/users/Cargo.toml b/src/users/Cargo.toml index 059d773d5..adfa1dac4 100644 --- a/src/users/Cargo.toml +++ b/src/users/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "users" +name = "uu_users" path = "users.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="users" -path="users.rs" +name = "users" +path = "main.rs" diff --git a/src/users/main.rs b/src/users/main.rs new file mode 100644 index 000000000..596760442 --- /dev/null +++ b/src/users/main.rs @@ -0,0 +1,5 @@ +extern crate uu_users; + +fn main() { + std::process::exit(uu_users::uumain(std::env::args().collect())); +} diff --git a/src/users/users.rs b/src/users/users.rs index c7a6dd030..391fc3a06 100644 --- a/src/users/users.rs +++ b/src/users/users.rs @@ -1,4 +1,4 @@ -#![crate_name = "users"] +#![crate_name = "uu_users"] /* * This file is part of the uutils coreutils package. @@ -116,8 +116,3 @@ fn exec(filename: &str) { println!("{}", users.join(" ")); } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/wc/Cargo.toml b/src/wc/Cargo.toml index cad95a824..932920339 100644 --- a/src/wc/Cargo.toml +++ b/src/wc/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "wc" +name = "uu_wc" path = "wc.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="wc" -path="wc.rs" +name = "wc" +path = "main.rs" diff --git a/src/wc/main.rs b/src/wc/main.rs new file mode 100644 index 000000000..c09239aa1 --- /dev/null +++ b/src/wc/main.rs @@ -0,0 +1,5 @@ +extern crate uu_wc; + +fn main() { + std::process::exit(uu_wc::uumain(std::env::args().collect())); +} diff --git a/src/wc/wc.rs b/src/wc/wc.rs index 50a9f2bc0..3a0cd6635 100644 --- a/src/wc/wc.rs +++ b/src/wc/wc.rs @@ -1,4 +1,4 @@ -#![crate_name = "wc"] +#![crate_name = "uu_wc"] /* * This file is part of the uutils coreutils package. @@ -277,8 +277,3 @@ fn open(path: &str) -> StdResult>, i32> { } } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/whoami/Cargo.toml b/src/whoami/Cargo.toml index 2e4768ea6..af40ed7ed 100644 --- a/src/whoami/Cargo.toml +++ b/src/whoami/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "whoami" +name = "uu_whoami" path = "whoami.rs" [dependencies] @@ -15,5 +15,5 @@ advapi32-sys = "*" uucore = { path="../uucore" } [[bin]] -name="whoami" -path="whoami.rs" +name = "whoami" +path = "main.rs" diff --git a/src/whoami/main.rs b/src/whoami/main.rs new file mode 100644 index 000000000..a9a0610b9 --- /dev/null +++ b/src/whoami/main.rs @@ -0,0 +1,5 @@ +extern crate uu_whoami; + +fn main() { + std::process::exit(uu_whoami::uumain(std::env::args().collect())); +} diff --git a/src/whoami/whoami.rs b/src/whoami/whoami.rs index fb5ee278d..e7d01ba15 100644 --- a/src/whoami/whoami.rs +++ b/src/whoami/whoami.rs @@ -1,4 +1,4 @@ -#![crate_name = "whoami"] +#![crate_name = "uu_whoami"] /* * This file is part of the uutils coreutils package. @@ -65,8 +65,3 @@ pub fn exec() { } } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -} diff --git a/src/yes/Cargo.toml b/src/yes/Cargo.toml index 6d113820f..45d768094 100644 --- a/src/yes/Cargo.toml +++ b/src/yes/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" authors = [] [lib] -name = "yes" +name = "uu_yes" path = "yes.rs" [dependencies] @@ -13,5 +13,5 @@ libc = "*" uucore = { path="../uucore" } [[bin]] -name="yes" -path="yes.rs" +name = "yes" +path = "main.rs" diff --git a/src/yes/main.rs b/src/yes/main.rs new file mode 100644 index 000000000..ffe9d2c9d --- /dev/null +++ b/src/yes/main.rs @@ -0,0 +1,5 @@ +extern crate uu_yes; + +fn main() { + std::process::exit(uu_yes::uumain(std::env::args().collect())); +} diff --git a/src/yes/yes.rs b/src/yes/yes.rs index 4759e2787..2bc3e75dc 100644 --- a/src/yes/yes.rs +++ b/src/yes/yes.rs @@ -1,4 +1,4 @@ -#![crate_name = "yes"] +#![crate_name = "uu_yes"] /* * This file is part of the uutils coreutils package. @@ -60,8 +60,3 @@ pub fn uumain(args: Vec) -> i32 { pub fn exec(string: &str) { while pipe_println!("{}", string) { } } - -#[allow(dead_code)] -fn main() { - std::process::exit(uumain(std::env::args().collect())); -}