1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00

Merge 'rf.code-structure' into HEAD

- refactor ~ reorganize source file directory structure to avoid impairing code coverage
This commit is contained in:
Roy Ivy III 2020-04-14 13:49:31 -05:00
commit 7109e6c869
263 changed files with 382 additions and 381 deletions

View file

@ -194,99 +194,99 @@ feat_common_core = [
[dependencies] [dependencies]
uucore = "0.0.2" uucore = "0.0.2"
arch = { optional=true, path="src/arch" } arch = { optional=true, path="src/uu/arch" }
base32 = { optional=true, path="src/base32" } base32 = { optional=true, path="src/uu/base32" }
base64 = { optional=true, path="src/base64" } base64 = { optional=true, path="src/uu/base64" }
basename = { optional=true, path="src/basename" } basename = { optional=true, path="src/uu/basename" }
cat = { optional=true, path="src/cat" } cat = { optional=true, path="src/uu/cat" }
chgrp = { optional=true, path="src/chgrp" } chgrp = { optional=true, path="src/uu/chgrp" }
chmod = { optional=true, path="src/chmod" } chmod = { optional=true, path="src/uu/chmod" }
chown = { optional=true, path="src/chown" } chown = { optional=true, path="src/uu/chown" }
chroot = { optional=true, path="src/chroot" } chroot = { optional=true, path="src/uu/chroot" }
cksum = { optional=true, path="src/cksum" } cksum = { optional=true, path="src/uu/cksum" }
comm = { optional=true, path="src/comm" } comm = { optional=true, path="src/uu/comm" }
cp = { optional=true, path="src/cp" } cp = { optional=true, path="src/uu/cp" }
cut = { optional=true, path="src/cut" } cut = { optional=true, path="src/uu/cut" }
date = { optional=true, path="src/date" } date = { optional=true, path="src/uu/date" }
dircolors= { optional=true, path="src/dircolors" } dircolors= { optional=true, path="src/uu/dircolors" }
dirname = { optional=true, path="src/dirname" } dirname = { optional=true, path="src/uu/dirname" }
du = { optional=true, path="src/du" } du = { optional=true, path="src/uu/du" }
echo = { optional=true, path="src/echo" } echo = { optional=true, path="src/uu/echo" }
env = { optional=true, path="src/env" } env = { optional=true, path="src/uu/env" }
expand = { optional=true, path="src/expand" } expand = { optional=true, path="src/uu/expand" }
expr = { optional=true, path="src/expr" } expr = { optional=true, path="src/uu/expr" }
factor = { optional=true, path="src/factor" } factor = { optional=true, path="src/uu/factor" }
false = { optional=true, path="src/false" } false = { optional=true, path="src/uu/false" }
fmt = { optional=true, path="src/fmt" } fmt = { optional=true, path="src/uu/fmt" }
fold = { optional=true, path="src/fold" } fold = { optional=true, path="src/uu/fold" }
groups = { optional=true, path="src/groups" } groups = { optional=true, path="src/uu/groups" }
hashsum = { optional=true, path="src/hashsum" } hashsum = { optional=true, path="src/uu/hashsum" }
head = { optional=true, path="src/head" } head = { optional=true, path="src/uu/head" }
hostid = { optional=true, path="src/hostid" } hostid = { optional=true, path="src/uu/hostid" }
hostname = { optional=true, path="src/hostname" } hostname = { optional=true, path="src/uu/hostname" }
id = { optional=true, path="src/id" } id = { optional=true, path="src/uu/id" }
install = { optional=true, path="src/install" } install = { optional=true, path="src/uu/install" }
join = { optional=true, path="src/join" } join = { optional=true, path="src/uu/join" }
kill = { optional=true, path="src/kill" } kill = { optional=true, path="src/uu/kill" }
link = { optional=true, path="src/link" } link = { optional=true, path="src/uu/link" }
ln = { optional=true, path="src/ln" } ln = { optional=true, path="src/uu/ln" }
ls = { optional=true, path="src/ls" } ls = { optional=true, path="src/uu/ls" }
logname = { optional=true, path="src/logname" } logname = { optional=true, path="src/uu/logname" }
mkdir = { optional=true, path="src/mkdir" } mkdir = { optional=true, path="src/uu/mkdir" }
mkfifo = { optional=true, path="src/mkfifo" } mkfifo = { optional=true, path="src/uu/mkfifo" }
mknod = { optional=true, path="src/mknod" } mknod = { optional=true, path="src/uu/mknod" }
mktemp = { optional=true, path="src/mktemp" } mktemp = { optional=true, path="src/uu/mktemp" }
more = { optional=true, path="src/more" } more = { optional=true, path="src/uu/more" }
mv = { optional=true, path="src/mv" } mv = { optional=true, path="src/uu/mv" }
nice = { optional=true, path="src/nice" } nice = { optional=true, path="src/uu/nice" }
nl = { optional=true, path="src/nl" } nl = { optional=true, path="src/uu/nl" }
nohup = { optional=true, path="src/nohup" } nohup = { optional=true, path="src/uu/nohup" }
nproc = { optional=true, path="src/nproc" } nproc = { optional=true, path="src/uu/nproc" }
numfmt = { optional=true, path="src/numfmt" } numfmt = { optional=true, path="src/uu/numfmt" }
od = { optional=true, path="src/od" } od = { optional=true, path="src/uu/od" }
paste = { optional=true, path="src/paste" } paste = { optional=true, path="src/uu/paste" }
pathchk = { optional=true, path="src/pathchk" } pathchk = { optional=true, path="src/uu/pathchk" }
pinky = { optional=true, path="src/pinky" } pinky = { optional=true, path="src/uu/pinky" }
printenv = { optional=true, path="src/printenv" } printenv = { optional=true, path="src/uu/printenv" }
printf = { optional=true, path="src/printf" } printf = { optional=true, path="src/uu/printf" }
ptx = { optional=true, path="src/ptx" } ptx = { optional=true, path="src/uu/ptx" }
pwd = { optional=true, path="src/pwd" } pwd = { optional=true, path="src/uu/pwd" }
readlink = { optional=true, path="src/readlink" } readlink = { optional=true, path="src/uu/readlink" }
realpath = { optional=true, path="src/realpath" } realpath = { optional=true, path="src/uu/realpath" }
relpath = { optional=true, path="src/relpath" } relpath = { optional=true, path="src/uu/relpath" }
rm = { optional=true, path="src/rm" } rm = { optional=true, path="src/uu/rm" }
rmdir = { optional=true, path="src/rmdir" } rmdir = { optional=true, path="src/uu/rmdir" }
seq = { optional=true, path="src/seq" } seq = { optional=true, path="src/uu/seq" }
shred = { optional=true, path="src/shred" } shred = { optional=true, path="src/uu/shred" }
shuf = { optional=true, path="src/shuf" } shuf = { optional=true, path="src/uu/shuf" }
sleep = { optional=true, path="src/sleep" } sleep = { optional=true, path="src/uu/sleep" }
sort = { optional=true, path="src/sort" } sort = { optional=true, path="src/uu/sort" }
split = { optional=true, path="src/split" } split = { optional=true, path="src/uu/split" }
stat = { optional=true, path="src/stat" } stat = { optional=true, path="src/uu/stat" }
stdbuf = { optional=true, path="src/stdbuf" } stdbuf = { optional=true, path="src/uu/stdbuf" }
sum = { optional=true, path="src/sum" } sum = { optional=true, path="src/uu/sum" }
sync = { optional=true, path="src/sync" } sync = { optional=true, path="src/uu/sync" }
tac = { optional=true, path="src/tac" } tac = { optional=true, path="src/uu/tac" }
tail = { optional=true, path="src/tail" } tail = { optional=true, path="src/uu/tail" }
tee = { optional=true, path="src/tee" } tee = { optional=true, path="src/uu/tee" }
test = { optional=true, path="src/test" } test = { optional=true, path="src/uu/test" }
timeout = { optional=true, path="src/timeout" } timeout = { optional=true, path="src/uu/timeout" }
touch = { optional=true, path="src/touch" } touch = { optional=true, path="src/uu/touch" }
tr = { optional=true, path="src/tr" } tr = { optional=true, path="src/uu/tr" }
true = { optional=true, path="src/true" } true = { optional=true, path="src/uu/true" }
truncate = { optional=true, path="src/truncate" } truncate = { optional=true, path="src/uu/truncate" }
tsort = { optional=true, path="src/tsort" } tsort = { optional=true, path="src/uu/tsort" }
tty = { optional=true, path="src/tty" } tty = { optional=true, path="src/uu/tty" }
uname = { optional=true, path="src/uname" } uname = { optional=true, path="src/uu/uname" }
unexpand = { optional=true, path="src/unexpand" } unexpand = { optional=true, path="src/uu/unexpand" }
uniq = { optional=true, path="src/uniq" } uniq = { optional=true, path="src/uu/uniq" }
unlink = { optional=true, path="src/unlink" } unlink = { optional=true, path="src/uu/unlink" }
uptime = { optional=true, path="src/uptime" } uptime = { optional=true, path="src/uu/uptime" }
users = { optional=true, path="src/users" } users = { optional=true, path="src/uu/users" }
wc = { optional=true, path="src/wc" } wc = { optional=true, path="src/uu/wc" }
who = { optional=true, path="src/who" } who = { optional=true, path="src/uu/who" }
whoami = { optional=true, path="src/whoami" } whoami = { optional=true, path="src/uu/whoami" }
yes = { optional=true, path="src/yes" } yes = { optional=true, path="src/uu/yes" }
# #
# * transitive dependency via 'failure'; pin to <= v0.3.30 to avoid increasing MinSRV to v1.33.0 # * transitive dependency via 'failure'; pin to <= v0.3.30 to avoid increasing MinSRV to v1.33.0
backtrace = ">= 0.3.3, <= 0.3.30" backtrace = ">= 0.3.3, <= 0.3.30"
@ -308,7 +308,7 @@ unix_socket = "0.5.0"
[[bin]] [[bin]]
name = "uutils" name = "uutils"
path = "src/uutils/uutils.rs" path = "src/bin/uutils.rs"
[[test]] [[test]]
name = "tests" name = "tests"

View file

@ -3,11 +3,11 @@ name = "arch"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_arch" name = "uu_arch"
path = "arch.rs" path = "src/arch.rs"
[dependencies] [dependencies]
platform-info = "0.0.1" platform-info = "0.0.1"
@ -15,4 +15,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "arch" name = "arch"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "base32"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_base32" name = "uu_base32"
path = "base32.rs" path = "src/base32.rs"
[dependencies] [dependencies]
uucore = { version = "0.0.2", features = ["encoding"] } uucore = { version = "0.0.2", features = ["encoding"] }
@ -16,4 +16,4 @@ clippy = { version = "0.0.212", optional = true }
[[bin]] [[bin]]
name = "base32" name = "base32"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -12,7 +12,7 @@
extern crate uucore; extern crate uucore;
use uucore::encoding::Format; use uucore::encoding::Format;
#[path = "../base64/base_common.rs"] #[path = "../../base64/src/base_common.rs"]
mod base_common; mod base_common;
static SYNTAX: &str = "[OPTION]... [FILE]"; static SYNTAX: &str = "[OPTION]... [FILE]";

View file

@ -3,15 +3,15 @@ name = "base64"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_base64" name = "uu_base64"
path = "base64.rs" path = "src/base64.rs"
[dependencies] [dependencies]
uucore = { version = "0.0.2", features = ["encoding"] } uucore = { version = "0.0.2", features = ["encoding"] }
[[bin]] [[bin]]
name = "base64" name = "base64"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,15 +3,15 @@ name = "basename"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_basename" name = "uu_basename"
path = "basename.rs" path = "src/basename.rs"
[dependencies] [dependencies]
uucore = "0.0.2" uucore = "0.0.2"
[[bin]] [[bin]]
name = "basename" name = "basename"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "cat"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_cat" name = "uu_cat"
path = "cat.rs" path = "src/cat.rs"
[dependencies] [dependencies]
quick-error = "1.2.3" quick-error = "1.2.3"
@ -18,4 +18,4 @@ unix_socket = "0.5.0"
[[bin]] [[bin]]
name = "cat" name = "cat"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

0
src/cat/cat.rs → src/uu/cat/src/cat.rs Executable file → Normal file
View file

View file

@ -3,11 +3,11 @@ name = "chgrp"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_chgrp" name = "uu_chgrp"
path = "chgrp.rs" path = "src/chgrp.rs"
[dependencies] [dependencies]
uucore = { version = "0.0.2", features = ["entries", "fs"] } uucore = { version = "0.0.2", features = ["entries", "fs"] }
@ -15,4 +15,4 @@ walkdir = "2.2.8"
[[bin]] [[bin]]
name = "chgrp" name = "chgrp"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "chmod"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_chmod" name = "uu_chmod"
path = "chmod.rs" path = "src/chmod.rs"
[dependencies] [dependencies]
libc = "0.2.42" libc = "0.2.42"
@ -16,4 +16,4 @@ walker = "1.0.0"
[[bin]] [[bin]]
name = "chmod" name = "chmod"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "chown"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_chown" name = "uu_chown"
path = "chown.rs" path = "src/chown.rs"
[dependencies] [dependencies]
glob = "0.3.0" glob = "0.3.0"
@ -20,4 +20,4 @@ optional = true
[[bin]] [[bin]]
name = "chown" name = "chown"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "chroot"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_chroot" name = "uu_chroot"
path = "chroot.rs" path = "src/chroot.rs"
[dependencies] [dependencies]
getopts = "0.2.18" getopts = "0.2.18"
@ -15,4 +15,4 @@ uucore = { version = "0.0.2", features = ["entries"] }
[[bin]] [[bin]]
name = "chroot" name = "chroot"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -6,7 +6,7 @@ license = "MIT"
[lib] [lib]
name = "uu_cksum" name = "uu_cksum"
path = "cksum.rs" path = "src/cksum.rs"
[dependencies] [dependencies]
libc = "0.2.42" libc = "0.2.42"
@ -14,4 +14,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "cksum" name = "cksum"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -15,7 +15,7 @@ use std::path::Path;
const CRC_TABLE_LEN: usize = 256; const CRC_TABLE_LEN: usize = 256;
#[path = "../#common/mkmain.rs"] #[path = "../../common/mkmain.rs"]
mod mkmain; mod mkmain;
fn main() { fn main() {

View file

@ -3,11 +3,11 @@ name = "comm"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_comm" name = "uu_comm"
path = "comm.rs" path = "src/comm.rs"
[dependencies] [dependencies]
getopts = "0.2.18" getopts = "0.2.18"
@ -16,4 +16,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "comm" name = "comm"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -6,11 +6,11 @@ authors = [
"Joshua S. Miller <jsmiller@uchicago.edu>", "Joshua S. Miller <jsmiller@uchicago.edu>",
] ]
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_cp" name = "uu_cp"
path = "cp.rs" path = "src/cp.rs"
[dependencies] [dependencies]
clap = "2.32.0" clap = "2.32.0"
@ -33,4 +33,4 @@ xattr="0.2.1"
[[bin]] [[bin]]
name = "cp" name = "cp"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,15 +3,15 @@ name = "cut"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_cut" name = "uu_cut"
path = "cut.rs" path = "src/cut.rs"
[dependencies] [dependencies]
uucore = "0.0.2" uucore = "0.0.2"
[[bin]] [[bin]]
name = "cut" name = "cut"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "date"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_date" name = "uu_date"
path = "date.rs" path = "src/date.rs"
[dependencies] [dependencies]
chrono = "0.4.4" chrono = "0.4.4"
@ -16,4 +16,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "date" name = "date"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "dircolors"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_dircolors" name = "uu_dircolors"
path = "dircolors.rs" path = "src/dircolors.rs"
[dependencies] [dependencies]
glob = "0.3.0" glob = "0.3.0"
@ -15,4 +15,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "dircolors" name = "dircolors"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "dirname"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_dirname" name = "uu_dirname"
path = "dirname.rs" path = "src/dirname.rs"
[dependencies] [dependencies]
libc = "0.2.42" libc = "0.2.42"
@ -15,4 +15,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "dirname" name = "dirname"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "du"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_du" name = "uu_du"
path = "du.rs" path = "src/du.rs"
[dependencies] [dependencies]
time = "0.1.40" time = "0.1.40"
@ -15,4 +15,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "du" name = "du"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,15 +3,15 @@ name = "echo"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_echo" name = "uu_echo"
path = "echo.rs" path = "src/echo.rs"
[dependencies] [dependencies]
uucore = "0.0.2" uucore = "0.0.2"
[[bin]] [[bin]]
name = "echo" name = "echo"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -4,12 +4,12 @@ version = "0.0.1"
authors = ["uutils developers"] authors = ["uutils developers"]
description = "Set each NAME to VALUE in the environment and run COMMAND" description = "Set each NAME to VALUE in the environment and run COMMAND"
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
edition = "2018" edition = "2018"
[lib] [lib]
name = "uu_env" name = "uu_env"
path = "env.rs" path = "src/env.rs"
[dependencies] [dependencies]
clap = "2.33" clap = "2.33"
@ -19,4 +19,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "env" name = "env"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "expand"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_expand" name = "uu_expand"
path = "expand.rs" path = "src/expand.rs"
[dependencies] [dependencies]
getopts = "0.2.18" getopts = "0.2.18"
@ -16,4 +16,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "expand" name = "expand"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "expr"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_expr" name = "uu_expr"
path = "expr.rs" path = "src/expr.rs"
[dependencies] [dependencies]
libc = "0.2.42" libc = "0.2.42"
@ -16,4 +16,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "expr" name = "expr"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -6,7 +6,7 @@ license = "MIT"
[lib] [lib]
name = "uu_factor" name = "uu_factor"
path = "factor.rs" path = "src/factor.rs"
[dependencies] [dependencies]
rand = "0.5" rand = "0.5"
@ -14,4 +14,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "factor" name = "factor"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -29,11 +29,12 @@ use std::u64::MAX as MAX_U64;
use numeric::is_prime; use numeric::is_prime;
#[cfg(test)] #[cfg(test)]
#[path = "src/numeric.rs"]
mod numeric; mod numeric;
mod sieve; mod sieve;
#[path = "../#common/mkmain.rs"] #[path = "../../common/mkmain.rs"]
mod mkmain; mod mkmain;
// extended Euclid algorithm // extended Euclid algorithm

View file

@ -3,15 +3,15 @@ name = "false"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_false" name = "uu_false"
path = "false.rs" path = "src/false.rs"
[dependencies] [dependencies]
uucore = "0.0.2" uucore = "0.0.2"
[[bin]] [[bin]]
name = "false" name = "false"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "fmt"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_fmt" name = "uu_fmt"
path = "fmt.rs" path = "src/fmt.rs"
[dependencies] [dependencies]
libc = "0.2.42" libc = "0.2.42"
@ -16,4 +16,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "fmt" name = "fmt"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,15 +3,15 @@ name = "fold"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_fold" name = "uu_fold"
path = "fold.rs" path = "src/fold.rs"
[dependencies] [dependencies]
uucore = "0.0.2" uucore = "0.0.2"
[[bin]] [[bin]]
name = "fold" name = "fold"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,15 +3,15 @@ name = "groups"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_groups" name = "uu_groups"
path = "groups.rs" path = "src/groups.rs"
[dependencies] [dependencies]
uucore = { version = "0.0.2", features = ["entries"] } uucore = { version = "0.0.2", features = ["entries"] }
[[bin]] [[bin]]
name = "groups" name = "groups"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "hashsum"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_hashsum" name = "uu_hashsum"
path = "hashsum.rs" path = "src/hashsum.rs"
[dependencies] [dependencies]
digest = "0.6.2" digest = "0.6.2"
@ -24,4 +24,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "hashsum" name = "hashsum"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "head"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_head" name = "uu_head"
path = "head.rs" path = "src/head.rs"
[dependencies] [dependencies]
libc = "0.2.42" libc = "0.2.42"
@ -15,4 +15,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "head" name = "head"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "hostid"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_hostid" name = "uu_hostid"
path = "hostid.rs" path = "src/hostid.rs"
[dependencies] [dependencies]
libc = "0.2.42" libc = "0.2.42"
@ -15,4 +15,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "hostid" name = "hostid"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "hostname"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_hostname" name = "uu_hostname"
path = "hostname.rs" path = "src/hostname.rs"
[dependencies] [dependencies]
getopts = "0.2" getopts = "0.2"
@ -17,4 +17,4 @@ winapi = { version = "0.3", features = ["sysinfoapi", "winsock2"] }
[[bin]] [[bin]]
name = "hostname" name = "hostname"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,15 +3,15 @@ name = "id"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_id" name = "uu_id"
path = "id.rs" path = "src/id.rs"
[dependencies] [dependencies]
uucore = { version = "0.0.2", features = ["entries", "process"] } uucore = { version = "0.0.2", features = ["entries", "process"] }
[[bin]] [[bin]]
name = "id" name = "id"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "install"
version = "0.0.1" version = "0.0.1"
authors = ["Ben Eills <ben@beneills.com>"] authors = ["Ben Eills <ben@beneills.com>"]
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_install" name = "uu_install"
path = "install.rs" path = "src/install.rs"
[dependencies] [dependencies]
getopts = "0.2.18" getopts = "0.2.18"
@ -19,4 +19,4 @@ time = "0.1.40"
[[bin]] [[bin]]
name = "install" name = "install"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "join"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_join" name = "uu_join"
path = "join.rs" path = "src/join.rs"
[dependencies] [dependencies]
clap = "2.32.0" clap = "2.32.0"
@ -15,4 +15,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "join" name = "join"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

0
src/join/join.rs → src/uu/join/src/join.rs Executable file → Normal file
View file

View file

@ -3,11 +3,11 @@ name = "kill"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_kill" name = "uu_kill"
path = "kill.rs" path = "src/kill.rs"
[dependencies] [dependencies]
libc = "0.2.42" libc = "0.2.42"
@ -15,4 +15,4 @@ uucore = { version = "0.0.2", features = ["signals"] }
[[bin]] [[bin]]
name = "kill" name = "kill"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "link"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_link" name = "uu_link"
path = "link.rs" path = "src/link.rs"
[dependencies] [dependencies]
libc = "0.2.42" libc = "0.2.42"
@ -15,4 +15,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "link" name = "link"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "ln"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_ln" name = "uu_ln"
path = "ln.rs" path = "src/ln.rs"
[dependencies] [dependencies]
libc = "0.2.42" libc = "0.2.42"
@ -15,4 +15,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "ln" name = "ln"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "logname"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_logname" name = "uu_logname"
path = "logname.rs" path = "src/logname.rs"
[dependencies] [dependencies]
libc = "0.2.42" libc = "0.2.42"
@ -15,4 +15,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "logname" name = "logname"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "ls"
version = "0.0.1" version = "0.0.1"
authors = ["Jeremiah Peschka <jeremiah.peschka@gmail.com>"] authors = ["Jeremiah Peschka <jeremiah.peschka@gmail.com>"]
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_ls" name = "uu_ls"
path = "ls.rs" path = "src/ls.rs"
[dependencies] [dependencies]
getopts = "0.2.18" getopts = "0.2.18"
@ -22,4 +22,4 @@ uucore = { version = "0.0.2", features = ["entries", "fs"] }
[[bin]] [[bin]]
name = "ls" name = "ls"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

View file

@ -3,11 +3,11 @@ name = "mkdir"
version = "0.0.1" version = "0.0.1"
authors = [] authors = []
license = "MIT" license = "MIT"
build = "../#common/mkmain.rs" build = "../../common/mkmain.rs"
[lib] [lib]
name = "uu_mkdir" name = "uu_mkdir"
path = "mkdir.rs" path = "src/mkdir.rs"
[dependencies] [dependencies]
getopts = "0.2.18" getopts = "0.2.18"
@ -16,4 +16,4 @@ uucore = "0.0.2"
[[bin]] [[bin]]
name = "mkdir" name = "mkdir"
path = "../#common/uumain.rs" path = "../../common/uumain.rs"

Some files were not shown because too many files have changed in this diff Show more