diff --git a/Cargo.toml b/Cargo.toml index 82ed97920..1ed983353 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -194,99 +194,99 @@ feat_common_core = [ [dependencies] uucore = "0.0.2" -arch = { optional=true, path="src/arch" } -base32 = { optional=true, path="src/base32" } -base64 = { optional=true, path="src/base64" } -basename = { optional=true, path="src/basename" } -cat = { optional=true, path="src/cat" } -chgrp = { optional=true, path="src/chgrp" } -chmod = { optional=true, path="src/chmod" } -chown = { optional=true, path="src/chown" } -chroot = { optional=true, path="src/chroot" } -cksum = { optional=true, path="src/cksum" } -comm = { optional=true, path="src/comm" } -cp = { optional=true, path="src/cp" } -cut = { optional=true, path="src/cut" } -date = { optional=true, path="src/date" } -dircolors= { optional=true, path="src/dircolors" } -dirname = { optional=true, path="src/dirname" } -du = { optional=true, path="src/du" } -echo = { optional=true, path="src/echo" } -env = { optional=true, path="src/env" } -expand = { optional=true, path="src/expand" } -expr = { optional=true, path="src/expr" } -factor = { optional=true, path="src/factor" } -false = { optional=true, path="src/false" } -fmt = { optional=true, path="src/fmt" } -fold = { optional=true, path="src/fold" } -groups = { optional=true, path="src/groups" } -hashsum = { optional=true, path="src/hashsum" } -head = { optional=true, path="src/head" } -hostid = { optional=true, path="src/hostid" } -hostname = { optional=true, path="src/hostname" } -id = { optional=true, path="src/id" } -install = { optional=true, path="src/install" } -join = { optional=true, path="src/join" } -kill = { optional=true, path="src/kill" } -link = { optional=true, path="src/link" } -ln = { optional=true, path="src/ln" } -ls = { optional=true, path="src/ls" } -logname = { optional=true, path="src/logname" } -mkdir = { optional=true, path="src/mkdir" } -mkfifo = { optional=true, path="src/mkfifo" } -mknod = { optional=true, path="src/mknod" } -mktemp = { optional=true, path="src/mktemp" } -more = { optional=true, path="src/more" } -mv = { optional=true, path="src/mv" } -nice = { optional=true, path="src/nice" } -nl = { optional=true, path="src/nl" } -nohup = { optional=true, path="src/nohup" } -nproc = { optional=true, path="src/nproc" } -numfmt = { optional=true, path="src/numfmt" } -od = { optional=true, path="src/od" } -paste = { optional=true, path="src/paste" } -pathchk = { optional=true, path="src/pathchk" } -pinky = { optional=true, path="src/pinky" } -printenv = { optional=true, path="src/printenv" } -printf = { optional=true, path="src/printf" } -ptx = { optional=true, path="src/ptx" } -pwd = { optional=true, path="src/pwd" } -readlink = { optional=true, path="src/readlink" } -realpath = { optional=true, path="src/realpath" } -relpath = { optional=true, path="src/relpath" } -rm = { optional=true, path="src/rm" } -rmdir = { optional=true, path="src/rmdir" } -seq = { optional=true, path="src/seq" } -shred = { optional=true, path="src/shred" } -shuf = { optional=true, path="src/shuf" } -sleep = { optional=true, path="src/sleep" } -sort = { optional=true, path="src/sort" } -split = { optional=true, path="src/split" } -stat = { optional=true, path="src/stat" } -stdbuf = { optional=true, path="src/stdbuf" } -sum = { optional=true, path="src/sum" } -sync = { optional=true, path="src/sync" } -tac = { optional=true, path="src/tac" } -tail = { optional=true, path="src/tail" } -tee = { optional=true, path="src/tee" } -test = { optional=true, path="src/test" } -timeout = { optional=true, path="src/timeout" } -touch = { optional=true, path="src/touch" } -tr = { optional=true, path="src/tr" } -true = { optional=true, path="src/true" } -truncate = { optional=true, path="src/truncate" } -tsort = { optional=true, path="src/tsort" } -tty = { optional=true, path="src/tty" } -uname = { optional=true, path="src/uname" } -unexpand = { optional=true, path="src/unexpand" } -uniq = { optional=true, path="src/uniq" } -unlink = { optional=true, path="src/unlink" } -uptime = { optional=true, path="src/uptime" } -users = { optional=true, path="src/users" } -wc = { optional=true, path="src/wc" } -who = { optional=true, path="src/who" } -whoami = { optional=true, path="src/whoami" } -yes = { optional=true, path="src/yes" } +arch = { optional=true, path="src/uu/arch" } +base32 = { optional=true, path="src/uu/base32" } +base64 = { optional=true, path="src/uu/base64" } +basename = { optional=true, path="src/uu/basename" } +cat = { optional=true, path="src/uu/cat" } +chgrp = { optional=true, path="src/uu/chgrp" } +chmod = { optional=true, path="src/uu/chmod" } +chown = { optional=true, path="src/uu/chown" } +chroot = { optional=true, path="src/uu/chroot" } +cksum = { optional=true, path="src/uu/cksum" } +comm = { optional=true, path="src/uu/comm" } +cp = { optional=true, path="src/uu/cp" } +cut = { optional=true, path="src/uu/cut" } +date = { optional=true, path="src/uu/date" } +dircolors= { optional=true, path="src/uu/dircolors" } +dirname = { optional=true, path="src/uu/dirname" } +du = { optional=true, path="src/uu/du" } +echo = { optional=true, path="src/uu/echo" } +env = { optional=true, path="src/uu/env" } +expand = { optional=true, path="src/uu/expand" } +expr = { optional=true, path="src/uu/expr" } +factor = { optional=true, path="src/uu/factor" } +false = { optional=true, path="src/uu/false" } +fmt = { optional=true, path="src/uu/fmt" } +fold = { optional=true, path="src/uu/fold" } +groups = { optional=true, path="src/uu/groups" } +hashsum = { optional=true, path="src/uu/hashsum" } +head = { optional=true, path="src/uu/head" } +hostid = { optional=true, path="src/uu/hostid" } +hostname = { optional=true, path="src/uu/hostname" } +id = { optional=true, path="src/uu/id" } +install = { optional=true, path="src/uu/install" } +join = { optional=true, path="src/uu/join" } +kill = { optional=true, path="src/uu/kill" } +link = { optional=true, path="src/uu/link" } +ln = { optional=true, path="src/uu/ln" } +ls = { optional=true, path="src/uu/ls" } +logname = { optional=true, path="src/uu/logname" } +mkdir = { optional=true, path="src/uu/mkdir" } +mkfifo = { optional=true, path="src/uu/mkfifo" } +mknod = { optional=true, path="src/uu/mknod" } +mktemp = { optional=true, path="src/uu/mktemp" } +more = { optional=true, path="src/uu/more" } +mv = { optional=true, path="src/uu/mv" } +nice = { optional=true, path="src/uu/nice" } +nl = { optional=true, path="src/uu/nl" } +nohup = { optional=true, path="src/uu/nohup" } +nproc = { optional=true, path="src/uu/nproc" } +numfmt = { optional=true, path="src/uu/numfmt" } +od = { optional=true, path="src/uu/od" } +paste = { optional=true, path="src/uu/paste" } +pathchk = { optional=true, path="src/uu/pathchk" } +pinky = { optional=true, path="src/uu/pinky" } +printenv = { optional=true, path="src/uu/printenv" } +printf = { optional=true, path="src/uu/printf" } +ptx = { optional=true, path="src/uu/ptx" } +pwd = { optional=true, path="src/uu/pwd" } +readlink = { optional=true, path="src/uu/readlink" } +realpath = { optional=true, path="src/uu/realpath" } +relpath = { optional=true, path="src/uu/relpath" } +rm = { optional=true, path="src/uu/rm" } +rmdir = { optional=true, path="src/uu/rmdir" } +seq = { optional=true, path="src/uu/seq" } +shred = { optional=true, path="src/uu/shred" } +shuf = { optional=true, path="src/uu/shuf" } +sleep = { optional=true, path="src/uu/sleep" } +sort = { optional=true, path="src/uu/sort" } +split = { optional=true, path="src/uu/split" } +stat = { optional=true, path="src/uu/stat" } +stdbuf = { optional=true, path="src/uu/stdbuf" } +sum = { optional=true, path="src/uu/sum" } +sync = { optional=true, path="src/uu/sync" } +tac = { optional=true, path="src/uu/tac" } +tail = { optional=true, path="src/uu/tail" } +tee = { optional=true, path="src/uu/tee" } +test = { optional=true, path="src/uu/test" } +timeout = { optional=true, path="src/uu/timeout" } +touch = { optional=true, path="src/uu/touch" } +tr = { optional=true, path="src/uu/tr" } +true = { optional=true, path="src/uu/true" } +truncate = { optional=true, path="src/uu/truncate" } +tsort = { optional=true, path="src/uu/tsort" } +tty = { optional=true, path="src/uu/tty" } +uname = { optional=true, path="src/uu/uname" } +unexpand = { optional=true, path="src/uu/unexpand" } +uniq = { optional=true, path="src/uu/uniq" } +unlink = { optional=true, path="src/uu/unlink" } +uptime = { optional=true, path="src/uu/uptime" } +users = { optional=true, path="src/uu/users" } +wc = { optional=true, path="src/uu/wc" } +who = { optional=true, path="src/uu/who" } +whoami = { optional=true, path="src/uu/whoami" } +yes = { optional=true, path="src/uu/yes" } # # * transitive dependency via 'failure'; pin to <= v0.3.30 to avoid increasing MinSRV to v1.33.0 backtrace = ">= 0.3.3, <= 0.3.30" @@ -308,7 +308,7 @@ unix_socket = "0.5.0" [[bin]] name = "uutils" -path = "src/uutils/uutils.rs" +path = "src/bin/uutils.rs" [[test]] name = "tests" diff --git a/src/uutils/uutils.rs b/src/bin/uutils.rs similarity index 100% rename from src/uutils/uutils.rs rename to src/bin/uutils.rs diff --git a/src/#common/mkmain.rs b/src/common/mkmain.rs similarity index 100% rename from src/#common/mkmain.rs rename to src/common/mkmain.rs diff --git a/src/#common/uumain.rs b/src/common/uumain.rs similarity index 100% rename from src/#common/uumain.rs rename to src/common/uumain.rs diff --git a/src/arch/Cargo.toml b/src/uu/arch/Cargo.toml similarity index 67% rename from src/arch/Cargo.toml rename to src/uu/arch/Cargo.toml index 5c316495f..7fc71e1b4 100644 --- a/src/arch/Cargo.toml +++ b/src/uu/arch/Cargo.toml @@ -3,11 +3,11 @@ name = "arch" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_arch" -path = "arch.rs" +path = "src/arch.rs" [dependencies] platform-info = "0.0.1" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "arch" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/arch/arch.rs b/src/uu/arch/src/arch.rs similarity index 100% rename from src/arch/arch.rs rename to src/uu/arch/src/arch.rs diff --git a/src/base32/Cargo.toml b/src/uu/base32/Cargo.toml similarity index 74% rename from src/base32/Cargo.toml rename to src/uu/base32/Cargo.toml index eaddeaa6b..63f5c6ebf 100644 --- a/src/base32/Cargo.toml +++ b/src/uu/base32/Cargo.toml @@ -3,11 +3,11 @@ name = "base32" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_base32" -path = "base32.rs" +path = "src/base32.rs" [dependencies] uucore = { version = "0.0.2", features = ["encoding"] } @@ -16,4 +16,4 @@ clippy = { version = "0.0.212", optional = true } [[bin]] name = "base32" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/base32/base32.rs b/src/uu/base32/src/base32.rs similarity index 95% rename from src/base32/base32.rs rename to src/uu/base32/src/base32.rs index feb7bc384..83d2b7e46 100644 --- a/src/base32/base32.rs +++ b/src/uu/base32/src/base32.rs @@ -12,7 +12,7 @@ extern crate uucore; use uucore::encoding::Format; -#[path = "../base64/base_common.rs"] +#[path = "../../base64/src/base_common.rs"] mod base_common; static SYNTAX: &str = "[OPTION]... [FILE]"; diff --git a/src/base64/Cargo.toml b/src/uu/base64/Cargo.toml similarity index 69% rename from src/base64/Cargo.toml rename to src/uu/base64/Cargo.toml index bb8b17e78..300c616c2 100644 --- a/src/base64/Cargo.toml +++ b/src/uu/base64/Cargo.toml @@ -3,15 +3,15 @@ name = "base64" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_base64" -path = "base64.rs" +path = "src/base64.rs" [dependencies] uucore = { version = "0.0.2", features = ["encoding"] } [[bin]] name = "base64" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/base64/base64.rs b/src/uu/base64/src/base64.rs similarity index 100% rename from src/base64/base64.rs rename to src/uu/base64/src/base64.rs diff --git a/src/base64/base_common.rs b/src/uu/base64/src/base_common.rs similarity index 100% rename from src/base64/base_common.rs rename to src/uu/base64/src/base_common.rs diff --git a/src/basename/Cargo.toml b/src/uu/basename/Cargo.toml similarity index 64% rename from src/basename/Cargo.toml rename to src/uu/basename/Cargo.toml index 9edb409f1..d1cebb4c3 100644 --- a/src/basename/Cargo.toml +++ b/src/uu/basename/Cargo.toml @@ -3,15 +3,15 @@ name = "basename" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_basename" -path = "basename.rs" +path = "src/basename.rs" [dependencies] uucore = "0.0.2" [[bin]] name = "basename" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/basename/basename.rs b/src/uu/basename/src/basename.rs similarity index 100% rename from src/basename/basename.rs rename to src/uu/basename/src/basename.rs diff --git a/src/cat/Cargo.toml b/src/uu/cat/Cargo.toml similarity index 75% rename from src/cat/Cargo.toml rename to src/uu/cat/Cargo.toml index 0e561b7fb..c64fcb52e 100644 --- a/src/cat/Cargo.toml +++ b/src/uu/cat/Cargo.toml @@ -3,11 +3,11 @@ name = "cat" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_cat" -path = "cat.rs" +path = "src/cat.rs" [dependencies] quick-error = "1.2.3" @@ -18,4 +18,4 @@ unix_socket = "0.5.0" [[bin]] name = "cat" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/cat/cat.rs b/src/uu/cat/src/cat.rs old mode 100755 new mode 100644 similarity index 100% rename from src/cat/cat.rs rename to src/uu/cat/src/cat.rs diff --git a/src/chgrp/Cargo.toml b/src/uu/chgrp/Cargo.toml similarity index 71% rename from src/chgrp/Cargo.toml rename to src/uu/chgrp/Cargo.toml index 301f081df..37f490cbf 100644 --- a/src/chgrp/Cargo.toml +++ b/src/uu/chgrp/Cargo.toml @@ -3,11 +3,11 @@ name = "chgrp" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_chgrp" -path = "chgrp.rs" +path = "src/chgrp.rs" [dependencies] uucore = { version = "0.0.2", features = ["entries", "fs"] } @@ -15,4 +15,4 @@ walkdir = "2.2.8" [[bin]] name = "chgrp" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/chgrp/chgrp.rs b/src/uu/chgrp/src/chgrp.rs similarity index 100% rename from src/chgrp/chgrp.rs rename to src/uu/chgrp/src/chgrp.rs diff --git a/src/chmod/Cargo.toml b/src/uu/chmod/Cargo.toml similarity index 71% rename from src/chmod/Cargo.toml rename to src/uu/chmod/Cargo.toml index 596adee41..8b3d5c43e 100644 --- a/src/chmod/Cargo.toml +++ b/src/uu/chmod/Cargo.toml @@ -3,11 +3,11 @@ name = "chmod" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_chmod" -path = "chmod.rs" +path = "src/chmod.rs" [dependencies] libc = "0.2.42" @@ -16,4 +16,4 @@ walker = "1.0.0" [[bin]] name = "chmod" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/chmod/chmod.rs b/src/uu/chmod/src/chmod.rs similarity index 100% rename from src/chmod/chmod.rs rename to src/uu/chmod/src/chmod.rs diff --git a/src/chown/Cargo.toml b/src/uu/chown/Cargo.toml similarity index 76% rename from src/chown/Cargo.toml rename to src/uu/chown/Cargo.toml index 9b56872f5..98be41b04 100644 --- a/src/chown/Cargo.toml +++ b/src/uu/chown/Cargo.toml @@ -3,11 +3,11 @@ name = "chown" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_chown" -path = "chown.rs" +path = "src/chown.rs" [dependencies] glob = "0.3.0" @@ -20,4 +20,4 @@ optional = true [[bin]] name = "chown" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/chown/chown.rs b/src/uu/chown/src/chown.rs similarity index 100% rename from src/chown/chown.rs rename to src/uu/chown/src/chown.rs diff --git a/src/chroot/Cargo.toml b/src/uu/chroot/Cargo.toml similarity index 70% rename from src/chroot/Cargo.toml rename to src/uu/chroot/Cargo.toml index b450fe570..2c17faf92 100644 --- a/src/chroot/Cargo.toml +++ b/src/uu/chroot/Cargo.toml @@ -3,11 +3,11 @@ name = "chroot" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_chroot" -path = "chroot.rs" +path = "src/chroot.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = { version = "0.0.2", features = ["entries"] } [[bin]] name = "chroot" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/chroot/chroot.rs b/src/uu/chroot/src/chroot.rs similarity index 100% rename from src/chroot/chroot.rs rename to src/uu/chroot/src/chroot.rs diff --git a/src/cksum/Cargo.toml b/src/uu/cksum/Cargo.toml similarity index 75% rename from src/cksum/Cargo.toml rename to src/uu/cksum/Cargo.toml index 4052b436e..403e0e8e1 100644 --- a/src/cksum/Cargo.toml +++ b/src/uu/cksum/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" [lib] name = "uu_cksum" -path = "cksum.rs" +path = "src/cksum.rs" [dependencies] libc = "0.2.42" @@ -14,4 +14,4 @@ uucore = "0.0.2" [[bin]] name = "cksum" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/cksum/build.rs b/src/uu/cksum/build.rs similarity index 96% rename from src/cksum/build.rs rename to src/uu/cksum/build.rs index e918a7442..df4e02c28 100644 --- a/src/cksum/build.rs +++ b/src/uu/cksum/build.rs @@ -15,7 +15,7 @@ use std::path::Path; const CRC_TABLE_LEN: usize = 256; -#[path = "../#common/mkmain.rs"] +#[path = "../../common/mkmain.rs"] mod mkmain; fn main() { diff --git a/src/cksum/cksum.rs b/src/uu/cksum/src/cksum.rs similarity index 100% rename from src/cksum/cksum.rs rename to src/uu/cksum/src/cksum.rs diff --git a/src/comm/Cargo.toml b/src/uu/comm/Cargo.toml similarity index 68% rename from src/comm/Cargo.toml rename to src/uu/comm/Cargo.toml index 533c96ebe..017de5209 100644 --- a/src/comm/Cargo.toml +++ b/src/uu/comm/Cargo.toml @@ -3,11 +3,11 @@ name = "comm" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_comm" -path = "comm.rs" +path = "src/comm.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = "0.0.2" [[bin]] name = "comm" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/comm/comm.rs b/src/uu/comm/src/comm.rs similarity index 100% rename from src/comm/comm.rs rename to src/uu/comm/src/comm.rs diff --git a/src/cp/Cargo.toml b/src/uu/cp/Cargo.toml similarity index 87% rename from src/cp/Cargo.toml rename to src/uu/cp/Cargo.toml index 6474bb06a..8ffb83bb3 100644 --- a/src/cp/Cargo.toml +++ b/src/uu/cp/Cargo.toml @@ -6,11 +6,11 @@ authors = [ "Joshua S. Miller ", ] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_cp" -path = "cp.rs" +path = "src/cp.rs" [dependencies] clap = "2.32.0" @@ -33,4 +33,4 @@ xattr="0.2.1" [[bin]] name = "cp" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/cp/README.md b/src/uu/cp/README.md similarity index 100% rename from src/cp/README.md rename to src/uu/cp/README.md diff --git a/src/cp/cp.rs b/src/uu/cp/src/cp.rs similarity index 100% rename from src/cp/cp.rs rename to src/uu/cp/src/cp.rs diff --git a/src/cut/.gitignore b/src/uu/cut/.gitignore similarity index 100% rename from src/cut/.gitignore rename to src/uu/cut/.gitignore diff --git a/src/cut/Cargo.toml b/src/uu/cut/Cargo.toml similarity index 63% rename from src/cut/Cargo.toml rename to src/uu/cut/Cargo.toml index c22d4fd43..59bb0f56d 100644 --- a/src/cut/Cargo.toml +++ b/src/uu/cut/Cargo.toml @@ -3,15 +3,15 @@ name = "cut" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_cut" -path = "cut.rs" +path = "src/cut.rs" [dependencies] uucore = "0.0.2" [[bin]] name = "cut" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/cut/buffer.rs b/src/uu/cut/src/buffer.rs similarity index 100% rename from src/cut/buffer.rs rename to src/uu/cut/src/buffer.rs diff --git a/src/cut/cut.rs b/src/uu/cut/src/cut.rs similarity index 100% rename from src/cut/cut.rs rename to src/uu/cut/src/cut.rs diff --git a/src/cut/ranges.rs b/src/uu/cut/src/ranges.rs similarity index 100% rename from src/cut/ranges.rs rename to src/uu/cut/src/ranges.rs diff --git a/src/cut/searcher.rs b/src/uu/cut/src/searcher.rs similarity index 100% rename from src/cut/searcher.rs rename to src/uu/cut/src/searcher.rs diff --git a/src/date/Cargo.toml b/src/uu/date/Cargo.toml similarity index 68% rename from src/date/Cargo.toml rename to src/uu/date/Cargo.toml index 5b5fe8104..e80e85353 100644 --- a/src/date/Cargo.toml +++ b/src/uu/date/Cargo.toml @@ -3,11 +3,11 @@ name = "date" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_date" -path = "date.rs" +path = "src/date.rs" [dependencies] chrono = "0.4.4" @@ -16,4 +16,4 @@ uucore = "0.0.2" [[bin]] name = "date" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/date/date.rs b/src/uu/date/src/date.rs similarity index 100% rename from src/date/date.rs rename to src/uu/date/src/date.rs diff --git a/src/date/usage.txt b/src/uu/date/usage.txt similarity index 100% rename from src/date/usage.txt rename to src/uu/date/usage.txt diff --git a/src/dircolors/Cargo.toml b/src/uu/dircolors/Cargo.toml similarity index 66% rename from src/dircolors/Cargo.toml rename to src/uu/dircolors/Cargo.toml index 58d618f79..5af6334fc 100644 --- a/src/dircolors/Cargo.toml +++ b/src/uu/dircolors/Cargo.toml @@ -3,11 +3,11 @@ name = "dircolors" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_dircolors" -path = "dircolors.rs" +path = "src/dircolors.rs" [dependencies] glob = "0.3.0" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "dircolors" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/dircolors/colors.rs b/src/uu/dircolors/src/colors.rs similarity index 100% rename from src/dircolors/colors.rs rename to src/uu/dircolors/src/colors.rs diff --git a/src/dircolors/dircolors.rs b/src/uu/dircolors/src/dircolors.rs similarity index 100% rename from src/dircolors/dircolors.rs rename to src/uu/dircolors/src/dircolors.rs diff --git a/src/dirname/Cargo.toml b/src/uu/dirname/Cargo.toml similarity index 66% rename from src/dirname/Cargo.toml rename to src/uu/dirname/Cargo.toml index 853a4d91a..7eff0730e 100644 --- a/src/dirname/Cargo.toml +++ b/src/uu/dirname/Cargo.toml @@ -3,11 +3,11 @@ name = "dirname" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_dirname" -path = "dirname.rs" +path = "src/dirname.rs" [dependencies] libc = "0.2.42" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "dirname" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/dirname/dirname.rs b/src/uu/dirname/src/dirname.rs similarity index 100% rename from src/dirname/dirname.rs rename to src/uu/dirname/src/dirname.rs diff --git a/src/du/Cargo.toml b/src/uu/du/Cargo.toml similarity index 65% rename from src/du/Cargo.toml rename to src/uu/du/Cargo.toml index 51d8a6467..df0faf9bc 100644 --- a/src/du/Cargo.toml +++ b/src/uu/du/Cargo.toml @@ -3,11 +3,11 @@ name = "du" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_du" -path = "du.rs" +path = "src/du.rs" [dependencies] time = "0.1.40" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "du" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/du/du.rs b/src/uu/du/src/du.rs similarity index 100% rename from src/du/du.rs rename to src/uu/du/src/du.rs diff --git a/src/echo/Cargo.toml b/src/uu/echo/Cargo.toml similarity index 63% rename from src/echo/Cargo.toml rename to src/uu/echo/Cargo.toml index 2144f8ba5..88dce77f7 100644 --- a/src/echo/Cargo.toml +++ b/src/uu/echo/Cargo.toml @@ -3,15 +3,15 @@ name = "echo" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_echo" -path = "echo.rs" +path = "src/echo.rs" [dependencies] uucore = "0.0.2" [[bin]] name = "echo" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/echo/echo.rs b/src/uu/echo/src/echo.rs similarity index 100% rename from src/echo/echo.rs rename to src/uu/echo/src/echo.rs diff --git a/src/env/Cargo.toml b/src/uu/env/Cargo.toml similarity index 78% rename from src/env/Cargo.toml rename to src/uu/env/Cargo.toml index e0e5d336f..72509ef04 100644 --- a/src/env/Cargo.toml +++ b/src/uu/env/Cargo.toml @@ -4,12 +4,12 @@ version = "0.0.1" authors = ["uutils developers"] description = "Set each NAME to VALUE in the environment and run COMMAND" license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" edition = "2018" [lib] name = "uu_env" -path = "env.rs" +path = "src/env.rs" [dependencies] clap = "2.33" @@ -19,4 +19,4 @@ uucore = "0.0.2" [[bin]] name = "env" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/env/env.rs b/src/uu/env/src/env.rs similarity index 100% rename from src/env/env.rs rename to src/uu/env/src/env.rs diff --git a/src/expand/Cargo.toml b/src/uu/expand/Cargo.toml similarity index 69% rename from src/expand/Cargo.toml rename to src/uu/expand/Cargo.toml index c93868399..fb92d5bd6 100644 --- a/src/expand/Cargo.toml +++ b/src/uu/expand/Cargo.toml @@ -3,11 +3,11 @@ name = "expand" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_expand" -path = "expand.rs" +path = "src/expand.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = "0.0.2" [[bin]] name = "expand" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/expand/expand.rs b/src/uu/expand/src/expand.rs similarity index 100% rename from src/expand/expand.rs rename to src/uu/expand/src/expand.rs diff --git a/src/expr/Cargo.toml b/src/uu/expr/Cargo.toml similarity index 68% rename from src/expr/Cargo.toml rename to src/uu/expr/Cargo.toml index 00609aade..275a64c26 100644 --- a/src/expr/Cargo.toml +++ b/src/uu/expr/Cargo.toml @@ -3,11 +3,11 @@ name = "expr" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_expr" -path = "expr.rs" +path = "src/expr.rs" [dependencies] libc = "0.2.42" @@ -16,4 +16,4 @@ uucore = "0.0.2" [[bin]] name = "expr" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/expr/expr.rs b/src/uu/expr/src/expr.rs similarity index 100% rename from src/expr/expr.rs rename to src/uu/expr/src/expr.rs diff --git a/src/expr/syntax_tree.rs b/src/uu/expr/src/syntax_tree.rs similarity index 100% rename from src/expr/syntax_tree.rs rename to src/uu/expr/src/syntax_tree.rs diff --git a/src/expr/tokens.rs b/src/uu/expr/src/tokens.rs similarity index 100% rename from src/expr/tokens.rs rename to src/uu/expr/src/tokens.rs diff --git a/src/factor/Cargo.toml b/src/uu/factor/Cargo.toml similarity index 75% rename from src/factor/Cargo.toml rename to src/uu/factor/Cargo.toml index 59dfbc5db..8f61ced4a 100644 --- a/src/factor/Cargo.toml +++ b/src/uu/factor/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" [lib] name = "uu_factor" -path = "factor.rs" +path = "src/factor.rs" [dependencies] rand = "0.5" @@ -14,4 +14,4 @@ uucore = "0.0.2" [[bin]] name = "factor" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/factor/build.rs b/src/uu/factor/build.rs similarity index 98% rename from src/factor/build.rs rename to src/uu/factor/build.rs index 42845ecb7..acc4d9a3f 100644 --- a/src/factor/build.rs +++ b/src/uu/factor/build.rs @@ -29,11 +29,12 @@ use std::u64::MAX as MAX_U64; use numeric::is_prime; #[cfg(test)] +#[path = "src/numeric.rs"] mod numeric; mod sieve; -#[path = "../#common/mkmain.rs"] +#[path = "../../common/mkmain.rs"] mod mkmain; // extended Euclid algorithm diff --git a/src/factor/sieve.rs b/src/uu/factor/sieve.rs similarity index 100% rename from src/factor/sieve.rs rename to src/uu/factor/sieve.rs diff --git a/src/factor/factor.rs b/src/uu/factor/src/factor.rs similarity index 100% rename from src/factor/factor.rs rename to src/uu/factor/src/factor.rs diff --git a/src/factor/numeric.rs b/src/uu/factor/src/numeric.rs similarity index 100% rename from src/factor/numeric.rs rename to src/uu/factor/src/numeric.rs diff --git a/src/false/Cargo.toml b/src/uu/false/Cargo.toml similarity index 63% rename from src/false/Cargo.toml rename to src/uu/false/Cargo.toml index 78894a291..8f0af3062 100644 --- a/src/false/Cargo.toml +++ b/src/uu/false/Cargo.toml @@ -3,15 +3,15 @@ name = "false" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_false" -path = "false.rs" +path = "src/false.rs" [dependencies] uucore = "0.0.2" [[bin]] name = "false" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/false/false.rs b/src/uu/false/src/false.rs similarity index 100% rename from src/false/false.rs rename to src/uu/false/src/false.rs diff --git a/src/fmt/Cargo.toml b/src/uu/fmt/Cargo.toml similarity index 68% rename from src/fmt/Cargo.toml rename to src/uu/fmt/Cargo.toml index e17bcb70f..76204f0bf 100644 --- a/src/fmt/Cargo.toml +++ b/src/uu/fmt/Cargo.toml @@ -3,11 +3,11 @@ name = "fmt" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_fmt" -path = "fmt.rs" +path = "src/fmt.rs" [dependencies] libc = "0.2.42" @@ -16,4 +16,4 @@ uucore = "0.0.2" [[bin]] name = "fmt" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/fmt/fmt.rs b/src/uu/fmt/src/fmt.rs similarity index 100% rename from src/fmt/fmt.rs rename to src/uu/fmt/src/fmt.rs diff --git a/src/fmt/linebreak.rs b/src/uu/fmt/src/linebreak.rs similarity index 100% rename from src/fmt/linebreak.rs rename to src/uu/fmt/src/linebreak.rs diff --git a/src/fmt/parasplit.rs b/src/uu/fmt/src/parasplit.rs similarity index 100% rename from src/fmt/parasplit.rs rename to src/uu/fmt/src/parasplit.rs diff --git a/src/fold/Cargo.toml b/src/uu/fold/Cargo.toml similarity index 63% rename from src/fold/Cargo.toml rename to src/uu/fold/Cargo.toml index a79465d4b..155d5b7b2 100644 --- a/src/fold/Cargo.toml +++ b/src/uu/fold/Cargo.toml @@ -3,15 +3,15 @@ name = "fold" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_fold" -path = "fold.rs" +path = "src/fold.rs" [dependencies] uucore = "0.0.2" [[bin]] name = "fold" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/fold/fold.rs b/src/uu/fold/src/fold.rs similarity index 100% rename from src/fold/fold.rs rename to src/uu/fold/src/fold.rs diff --git a/src/groups/Cargo.toml b/src/uu/groups/Cargo.toml similarity index 68% rename from src/groups/Cargo.toml rename to src/uu/groups/Cargo.toml index 39821c101..e9513227b 100644 --- a/src/groups/Cargo.toml +++ b/src/uu/groups/Cargo.toml @@ -3,15 +3,15 @@ name = "groups" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_groups" -path = "groups.rs" +path = "src/groups.rs" [dependencies] uucore = { version = "0.0.2", features = ["entries"] } [[bin]] name = "groups" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/groups/groups.rs b/src/uu/groups/src/groups.rs similarity index 100% rename from src/groups/groups.rs rename to src/uu/groups/src/groups.rs diff --git a/src/hashsum/Cargo.toml b/src/uu/hashsum/Cargo.toml similarity index 78% rename from src/hashsum/Cargo.toml rename to src/uu/hashsum/Cargo.toml index 74634d5b2..0ab2661ce 100644 --- a/src/hashsum/Cargo.toml +++ b/src/uu/hashsum/Cargo.toml @@ -3,11 +3,11 @@ name = "hashsum" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_hashsum" -path = "hashsum.rs" +path = "src/hashsum.rs" [dependencies] digest = "0.6.2" @@ -24,4 +24,4 @@ uucore = "0.0.2" [[bin]] name = "hashsum" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/hashsum/digest.rs b/src/uu/hashsum/src/digest.rs similarity index 100% rename from src/hashsum/digest.rs rename to src/uu/hashsum/src/digest.rs diff --git a/src/hashsum/hashsum.rs b/src/uu/hashsum/src/hashsum.rs similarity index 100% rename from src/hashsum/hashsum.rs rename to src/uu/hashsum/src/hashsum.rs diff --git a/src/head/Cargo.toml b/src/uu/head/Cargo.toml similarity index 66% rename from src/head/Cargo.toml rename to src/uu/head/Cargo.toml index 9e5dafb30..467681b99 100644 --- a/src/head/Cargo.toml +++ b/src/uu/head/Cargo.toml @@ -3,11 +3,11 @@ name = "head" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_head" -path = "head.rs" +path = "src/head.rs" [dependencies] libc = "0.2.42" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "head" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/head/head.rs b/src/uu/head/src/head.rs similarity index 100% rename from src/head/head.rs rename to src/uu/head/src/head.rs diff --git a/src/hostid/Cargo.toml b/src/uu/hostid/Cargo.toml similarity index 66% rename from src/hostid/Cargo.toml rename to src/uu/hostid/Cargo.toml index 17a6ae3c0..69225c667 100644 --- a/src/hostid/Cargo.toml +++ b/src/uu/hostid/Cargo.toml @@ -3,11 +3,11 @@ name = "hostid" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_hostid" -path = "hostid.rs" +path = "src/hostid.rs" [dependencies] libc = "0.2.42" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "hostid" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/hostid/hostid.rs b/src/uu/hostid/src/hostid.rs similarity index 100% rename from src/hostid/hostid.rs rename to src/uu/hostid/src/hostid.rs diff --git a/src/hostname/Cargo.toml b/src/uu/hostname/Cargo.toml similarity index 74% rename from src/hostname/Cargo.toml rename to src/uu/hostname/Cargo.toml index e8640eb99..b5f27bbd2 100644 --- a/src/hostname/Cargo.toml +++ b/src/uu/hostname/Cargo.toml @@ -3,11 +3,11 @@ name = "hostname" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_hostname" -path = "hostname.rs" +path = "src/hostname.rs" [dependencies] getopts = "0.2" @@ -17,4 +17,4 @@ winapi = { version = "0.3", features = ["sysinfoapi", "winsock2"] } [[bin]] name = "hostname" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/hostname/hostname.rs b/src/uu/hostname/src/hostname.rs similarity index 100% rename from src/hostname/hostname.rs rename to src/uu/hostname/src/hostname.rs diff --git a/src/id/Cargo.toml b/src/uu/id/Cargo.toml similarity index 69% rename from src/id/Cargo.toml rename to src/uu/id/Cargo.toml index ada18752f..34df8250d 100644 --- a/src/id/Cargo.toml +++ b/src/uu/id/Cargo.toml @@ -3,15 +3,15 @@ name = "id" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_id" -path = "id.rs" +path = "src/id.rs" [dependencies] uucore = { version = "0.0.2", features = ["entries", "process"] } [[bin]] name = "id" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/id/id.rs b/src/uu/id/src/id.rs similarity index 100% rename from src/id/id.rs rename to src/uu/id/src/id.rs diff --git a/src/install/Cargo.toml b/src/uu/install/Cargo.toml similarity index 74% rename from src/install/Cargo.toml rename to src/uu/install/Cargo.toml index fb93ae8b9..e50cc69f7 100644 --- a/src/install/Cargo.toml +++ b/src/uu/install/Cargo.toml @@ -3,11 +3,11 @@ name = "install" version = "0.0.1" authors = ["Ben Eills "] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_install" -path = "install.rs" +path = "src/install.rs" [dependencies] getopts = "0.2.18" @@ -19,4 +19,4 @@ time = "0.1.40" [[bin]] name = "install" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/install/install.rs b/src/uu/install/src/install.rs similarity index 100% rename from src/install/install.rs rename to src/uu/install/src/install.rs diff --git a/src/install/mode.rs b/src/uu/install/src/mode.rs similarity index 100% rename from src/install/mode.rs rename to src/uu/install/src/mode.rs diff --git a/src/join/Cargo.toml b/src/uu/join/Cargo.toml similarity index 66% rename from src/join/Cargo.toml rename to src/uu/join/Cargo.toml index 567d63a79..90609d103 100644 --- a/src/join/Cargo.toml +++ b/src/uu/join/Cargo.toml @@ -3,11 +3,11 @@ name = "join" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_join" -path = "join.rs" +path = "src/join.rs" [dependencies] clap = "2.32.0" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "join" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/join/join.rs b/src/uu/join/src/join.rs old mode 100755 new mode 100644 similarity index 100% rename from src/join/join.rs rename to src/uu/join/src/join.rs diff --git a/src/kill/Cargo.toml b/src/uu/kill/Cargo.toml similarity index 70% rename from src/kill/Cargo.toml rename to src/uu/kill/Cargo.toml index c9dc99cac..4c7a93591 100644 --- a/src/kill/Cargo.toml +++ b/src/uu/kill/Cargo.toml @@ -3,11 +3,11 @@ name = "kill" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_kill" -path = "kill.rs" +path = "src/kill.rs" [dependencies] libc = "0.2.42" @@ -15,4 +15,4 @@ uucore = { version = "0.0.2", features = ["signals"] } [[bin]] name = "kill" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/kill/kill.rs b/src/uu/kill/src/kill.rs similarity index 100% rename from src/kill/kill.rs rename to src/uu/kill/src/kill.rs diff --git a/src/link/Cargo.toml b/src/uu/link/Cargo.toml similarity index 66% rename from src/link/Cargo.toml rename to src/uu/link/Cargo.toml index 7da8cc271..e405b4e2a 100644 --- a/src/link/Cargo.toml +++ b/src/uu/link/Cargo.toml @@ -3,11 +3,11 @@ name = "link" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_link" -path = "link.rs" +path = "src/link.rs" [dependencies] libc = "0.2.42" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "link" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/link/link.rs b/src/uu/link/src/link.rs similarity index 100% rename from src/link/link.rs rename to src/uu/link/src/link.rs diff --git a/src/ln/Cargo.toml b/src/uu/ln/Cargo.toml similarity index 65% rename from src/ln/Cargo.toml rename to src/uu/ln/Cargo.toml index 49f164afa..e7f0170ed 100644 --- a/src/ln/Cargo.toml +++ b/src/uu/ln/Cargo.toml @@ -3,11 +3,11 @@ name = "ln" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_ln" -path = "ln.rs" +path = "src/ln.rs" [dependencies] libc = "0.2.42" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "ln" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/ln/ln.rs b/src/uu/ln/src/ln.rs similarity index 100% rename from src/ln/ln.rs rename to src/uu/ln/src/ln.rs diff --git a/src/logname/Cargo.toml b/src/uu/logname/Cargo.toml similarity index 66% rename from src/logname/Cargo.toml rename to src/uu/logname/Cargo.toml index f8a72f5f5..83d793cf6 100644 --- a/src/logname/Cargo.toml +++ b/src/uu/logname/Cargo.toml @@ -3,11 +3,11 @@ name = "logname" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_logname" -path = "logname.rs" +path = "src/logname.rs" [dependencies] libc = "0.2.42" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "logname" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/logname/logname.rs b/src/uu/logname/src/logname.rs similarity index 100% rename from src/logname/logname.rs rename to src/uu/logname/src/logname.rs diff --git a/src/ls/Cargo.toml b/src/uu/ls/Cargo.toml similarity index 82% rename from src/ls/Cargo.toml rename to src/uu/ls/Cargo.toml index 3fd352044..c713729b5 100644 --- a/src/ls/Cargo.toml +++ b/src/uu/ls/Cargo.toml @@ -3,11 +3,11 @@ name = "ls" version = "0.0.1" authors = ["Jeremiah Peschka "] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_ls" -path = "ls.rs" +path = "src/ls.rs" [dependencies] getopts = "0.2.18" @@ -22,4 +22,4 @@ uucore = { version = "0.0.2", features = ["entries", "fs"] } [[bin]] name = "ls" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/ls/ls.rs b/src/uu/ls/src/ls.rs similarity index 100% rename from src/ls/ls.rs rename to src/uu/ls/src/ls.rs diff --git a/src/mkdir/Cargo.toml b/src/uu/mkdir/Cargo.toml similarity index 68% rename from src/mkdir/Cargo.toml rename to src/uu/mkdir/Cargo.toml index a9e6726d4..1c050722a 100644 --- a/src/mkdir/Cargo.toml +++ b/src/uu/mkdir/Cargo.toml @@ -3,11 +3,11 @@ name = "mkdir" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_mkdir" -path = "mkdir.rs" +path = "src/mkdir.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = "0.0.2" [[bin]] name = "mkdir" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/mkdir/mkdir.rs b/src/uu/mkdir/src/mkdir.rs similarity index 100% rename from src/mkdir/mkdir.rs rename to src/uu/mkdir/src/mkdir.rs diff --git a/src/mkfifo/Cargo.toml b/src/uu/mkfifo/Cargo.toml similarity index 68% rename from src/mkfifo/Cargo.toml rename to src/uu/mkfifo/Cargo.toml index 9fe02b2f8..25e07fa28 100644 --- a/src/mkfifo/Cargo.toml +++ b/src/uu/mkfifo/Cargo.toml @@ -3,11 +3,11 @@ name = "mkfifo" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_mkfifo" -path = "mkfifo.rs" +path = "src/mkfifo.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = "0.0.2" [[bin]] name = "mkfifo" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/mkfifo/mkfifo.rs b/src/uu/mkfifo/src/mkfifo.rs similarity index 100% rename from src/mkfifo/mkfifo.rs rename to src/uu/mkfifo/src/mkfifo.rs diff --git a/src/mknod/Cargo.toml b/src/uu/mknod/Cargo.toml similarity index 68% rename from src/mknod/Cargo.toml rename to src/uu/mknod/Cargo.toml index f1baa1446..090143353 100644 --- a/src/mknod/Cargo.toml +++ b/src/uu/mknod/Cargo.toml @@ -3,11 +3,11 @@ name = "mknod" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_mknod" -path = "mknod.rs" +path = "src/mknod.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = "0.0.2" [[bin]] name = "mknod" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/mknod/mknod.rs b/src/uu/mknod/src/mknod.rs similarity index 100% rename from src/mknod/mknod.rs rename to src/uu/mknod/src/mknod.rs diff --git a/src/mknod/parsemode.rs b/src/uu/mknod/src/parsemode.rs similarity index 100% rename from src/mknod/parsemode.rs rename to src/uu/mknod/src/parsemode.rs diff --git a/src/mktemp/Cargo.toml b/src/uu/mktemp/Cargo.toml similarity index 70% rename from src/mktemp/Cargo.toml rename to src/uu/mktemp/Cargo.toml index 9ab5406c6..8d49b3cac 100644 --- a/src/mktemp/Cargo.toml +++ b/src/uu/mktemp/Cargo.toml @@ -3,11 +3,11 @@ name = "mktemp" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_mktemp" -path = "mktemp.rs" +path = "src/mktemp.rs" [dependencies] getopts = "0.2.18" @@ -17,4 +17,4 @@ uucore = "0.0.2" [[bin]] name = "mktemp" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/mktemp/mktemp.rs b/src/uu/mktemp/src/mktemp.rs similarity index 100% rename from src/mktemp/mktemp.rs rename to src/uu/mktemp/src/mktemp.rs diff --git a/src/mktemp/tempdir.rs b/src/uu/mktemp/src/tempdir.rs similarity index 100% rename from src/mktemp/tempdir.rs rename to src/uu/mktemp/src/tempdir.rs diff --git a/src/more/Cargo.toml b/src/uu/more/Cargo.toml similarity index 80% rename from src/more/Cargo.toml rename to src/uu/more/Cargo.toml index 75503c788..87125d6f7 100644 --- a/src/more/Cargo.toml +++ b/src/uu/more/Cargo.toml @@ -3,11 +3,11 @@ name = "more" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_more" -path = "more.rs" +path = "src/more.rs" [dependencies] getopts = "0.2.18" @@ -22,4 +22,4 @@ nix = "0.8.1" [[bin]] name = "more" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/more/more.rs b/src/uu/more/src/more.rs similarity index 100% rename from src/more/more.rs rename to src/uu/more/src/more.rs diff --git a/src/mv/Cargo.toml b/src/uu/mv/Cargo.toml similarity index 66% rename from src/mv/Cargo.toml rename to src/uu/mv/Cargo.toml index d3a759a8c..4432c17b6 100644 --- a/src/mv/Cargo.toml +++ b/src/uu/mv/Cargo.toml @@ -3,11 +3,11 @@ name = "mv" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_mv" -path = "mv.rs" +path = "src/mv.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "mv" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/mv/mv.rs b/src/uu/mv/src/mv.rs similarity index 100% rename from src/mv/mv.rs rename to src/uu/mv/src/mv.rs diff --git a/src/nice/Cargo.toml b/src/uu/nice/Cargo.toml similarity index 68% rename from src/nice/Cargo.toml rename to src/uu/nice/Cargo.toml index 44f677358..d09a7709f 100644 --- a/src/nice/Cargo.toml +++ b/src/uu/nice/Cargo.toml @@ -3,11 +3,11 @@ name = "nice" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_nice" -path = "nice.rs" +path = "src/nice.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = "0.0.2" [[bin]] name = "nice" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/nice/nice.rs b/src/uu/nice/src/nice.rs similarity index 100% rename from src/nice/nice.rs rename to src/uu/nice/src/nice.rs diff --git a/src/nl/Cargo.toml b/src/uu/nl/Cargo.toml similarity index 75% rename from src/nl/Cargo.toml rename to src/uu/nl/Cargo.toml index 358cffc5a..1f582aae5 100644 --- a/src/nl/Cargo.toml +++ b/src/uu/nl/Cargo.toml @@ -3,11 +3,11 @@ name = "nl" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_nl" -path = "nl.rs" +path = "src/nl.rs" [dependencies] aho-corasick = "0.7.3" @@ -20,4 +20,4 @@ uucore = "0.0.2" [[bin]] name = "nl" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/nl/helper.rs b/src/uu/nl/src/helper.rs similarity index 100% rename from src/nl/helper.rs rename to src/uu/nl/src/helper.rs diff --git a/src/nl/nl.rs b/src/uu/nl/src/nl.rs similarity index 100% rename from src/nl/nl.rs rename to src/uu/nl/src/nl.rs diff --git a/src/nohup/Cargo.toml b/src/uu/nohup/Cargo.toml similarity index 71% rename from src/nohup/Cargo.toml rename to src/uu/nohup/Cargo.toml index d18442af0..68afca8a0 100644 --- a/src/nohup/Cargo.toml +++ b/src/uu/nohup/Cargo.toml @@ -3,11 +3,11 @@ name = "nohup" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_nohup" -path = "nohup.rs" +path = "src/nohup.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = { version = "0.0.2", features = ["fs"] } [[bin]] name = "nohup" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/nohup/nohup.rs b/src/uu/nohup/src/nohup.rs similarity index 100% rename from src/nohup/nohup.rs rename to src/uu/nohup/src/nohup.rs diff --git a/src/nproc/Cargo.toml b/src/uu/nproc/Cargo.toml similarity index 70% rename from src/nproc/Cargo.toml rename to src/uu/nproc/Cargo.toml index 5055a6480..f80fb727c 100644 --- a/src/nproc/Cargo.toml +++ b/src/uu/nproc/Cargo.toml @@ -3,11 +3,11 @@ name = "nproc" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_nproc" -path = "nproc.rs" +path = "src/nproc.rs" [dependencies] getopts = "0.2.18" @@ -17,4 +17,4 @@ uucore = "0.0.2" [[bin]] name = "nproc" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/nproc/nproc.rs b/src/uu/nproc/src/nproc.rs similarity index 100% rename from src/nproc/nproc.rs rename to src/uu/nproc/src/nproc.rs diff --git a/src/numfmt/Cargo.toml b/src/uu/numfmt/Cargo.toml similarity index 66% rename from src/numfmt/Cargo.toml rename to src/uu/numfmt/Cargo.toml index 0a782f565..cd56f2dfc 100644 --- a/src/numfmt/Cargo.toml +++ b/src/uu/numfmt/Cargo.toml @@ -3,11 +3,11 @@ name = "numfmt" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_numfmt" -path = "numfmt.rs" +path = "src/numfmt.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "numfmt" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/numfmt/numfmt.rs b/src/uu/numfmt/src/numfmt.rs similarity index 100% rename from src/numfmt/numfmt.rs rename to src/uu/numfmt/src/numfmt.rs diff --git a/src/od/Cargo.toml b/src/uu/od/Cargo.toml similarity index 71% rename from src/od/Cargo.toml rename to src/uu/od/Cargo.toml index 7636daa7e..2fc92c2a8 100644 --- a/src/od/Cargo.toml +++ b/src/uu/od/Cargo.toml @@ -3,11 +3,11 @@ name = "od" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_od" -path = "od.rs" +path = "src/od.rs" [dependencies] byteorder = "1.3.2" @@ -18,4 +18,4 @@ uucore = "0.0.2" [[bin]] name = "od" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/od/byteorder_io.rs b/src/uu/od/src/byteorder_io.rs similarity index 100% rename from src/od/byteorder_io.rs rename to src/uu/od/src/byteorder_io.rs diff --git a/src/od/formatteriteminfo.rs b/src/uu/od/src/formatteriteminfo.rs similarity index 100% rename from src/od/formatteriteminfo.rs rename to src/uu/od/src/formatteriteminfo.rs diff --git a/src/od/inputdecoder.rs b/src/uu/od/src/inputdecoder.rs similarity index 100% rename from src/od/inputdecoder.rs rename to src/uu/od/src/inputdecoder.rs diff --git a/src/od/inputoffset.rs b/src/uu/od/src/inputoffset.rs similarity index 100% rename from src/od/inputoffset.rs rename to src/uu/od/src/inputoffset.rs diff --git a/src/od/mockstream.rs b/src/uu/od/src/mockstream.rs similarity index 100% rename from src/od/mockstream.rs rename to src/uu/od/src/mockstream.rs diff --git a/src/od/multifilereader.rs b/src/uu/od/src/multifilereader.rs similarity index 100% rename from src/od/multifilereader.rs rename to src/uu/od/src/multifilereader.rs diff --git a/src/od/od.rs b/src/uu/od/src/od.rs similarity index 100% rename from src/od/od.rs rename to src/uu/od/src/od.rs diff --git a/src/od/output_info.rs b/src/uu/od/src/output_info.rs similarity index 100% rename from src/od/output_info.rs rename to src/uu/od/src/output_info.rs diff --git a/src/od/parse_formats.rs b/src/uu/od/src/parse_formats.rs similarity index 100% rename from src/od/parse_formats.rs rename to src/uu/od/src/parse_formats.rs diff --git a/src/od/parse_inputs.rs b/src/uu/od/src/parse_inputs.rs similarity index 100% rename from src/od/parse_inputs.rs rename to src/uu/od/src/parse_inputs.rs diff --git a/src/od/parse_nrofbytes.rs b/src/uu/od/src/parse_nrofbytes.rs similarity index 100% rename from src/od/parse_nrofbytes.rs rename to src/uu/od/src/parse_nrofbytes.rs diff --git a/src/od/partialreader.rs b/src/uu/od/src/partialreader.rs similarity index 100% rename from src/od/partialreader.rs rename to src/uu/od/src/partialreader.rs diff --git a/src/od/peekreader.rs b/src/uu/od/src/peekreader.rs similarity index 100% rename from src/od/peekreader.rs rename to src/uu/od/src/peekreader.rs diff --git a/src/od/prn_char.rs b/src/uu/od/src/prn_char.rs similarity index 100% rename from src/od/prn_char.rs rename to src/uu/od/src/prn_char.rs diff --git a/src/od/prn_float.rs b/src/uu/od/src/prn_float.rs similarity index 100% rename from src/od/prn_float.rs rename to src/uu/od/src/prn_float.rs diff --git a/src/od/prn_int.rs b/src/uu/od/src/prn_int.rs similarity index 100% rename from src/od/prn_int.rs rename to src/uu/od/src/prn_int.rs diff --git a/src/paste/Cargo.toml b/src/uu/paste/Cargo.toml similarity index 66% rename from src/paste/Cargo.toml rename to src/uu/paste/Cargo.toml index 47054357c..6673311a4 100644 --- a/src/paste/Cargo.toml +++ b/src/uu/paste/Cargo.toml @@ -3,11 +3,11 @@ name = "paste" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_paste" -path = "paste.rs" +path = "src/paste.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "paste" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/paste/paste.rs b/src/uu/paste/src/paste.rs similarity index 100% rename from src/paste/paste.rs rename to src/uu/paste/src/paste.rs diff --git a/src/pathchk/Cargo.toml b/src/uu/pathchk/Cargo.toml similarity index 68% rename from src/pathchk/Cargo.toml rename to src/uu/pathchk/Cargo.toml index 117daa307..c554356cd 100644 --- a/src/pathchk/Cargo.toml +++ b/src/uu/pathchk/Cargo.toml @@ -3,11 +3,11 @@ name = "pathchk" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_pathchk" -path = "pathchk.rs" +path = "src/pathchk.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = "0.0.2" [[bin]] name = "pathchk" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/pathchk/pathchk.rs b/src/uu/pathchk/src/pathchk.rs similarity index 100% rename from src/pathchk/pathchk.rs rename to src/uu/pathchk/src/pathchk.rs diff --git a/src/pinky/Cargo.toml b/src/uu/pinky/Cargo.toml similarity index 69% rename from src/pinky/Cargo.toml rename to src/uu/pinky/Cargo.toml index 4e7735216..6bb45200f 100644 --- a/src/pinky/Cargo.toml +++ b/src/uu/pinky/Cargo.toml @@ -3,15 +3,15 @@ name = "pinky" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_pinky" -path = "pinky.rs" +path = "src/pinky.rs" [dependencies] uucore = { version = "0.0.2", features = ["utmpx", "entries"] } [[bin]] name = "pinky" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/pinky/pinky.rs b/src/uu/pinky/src/pinky.rs similarity index 100% rename from src/pinky/pinky.rs rename to src/uu/pinky/src/pinky.rs diff --git a/src/printenv/Cargo.toml b/src/uu/printenv/Cargo.toml similarity index 66% rename from src/printenv/Cargo.toml rename to src/uu/printenv/Cargo.toml index f7505199c..473adfab4 100644 --- a/src/printenv/Cargo.toml +++ b/src/uu/printenv/Cargo.toml @@ -3,11 +3,11 @@ name = "printenv" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_printenv" -path = "printenv.rs" +path = "src/printenv.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "printenv" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/printenv/printenv.rs b/src/uu/printenv/src/printenv.rs similarity index 100% rename from src/printenv/printenv.rs rename to src/uu/printenv/src/printenv.rs diff --git a/src/printf/Cargo.toml b/src/uu/printf/Cargo.toml similarity index 68% rename from src/printf/Cargo.toml rename to src/uu/printf/Cargo.toml index f05387dd3..27eee8dab 100644 --- a/src/printf/Cargo.toml +++ b/src/uu/printf/Cargo.toml @@ -3,11 +3,11 @@ name = "printf" version = "0.0.1" authors = ["Nathan Ross"] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_printf" -path = "printf.rs" +path = "src/printf.rs" [dependencies] itertools = "0.8.0" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "printf" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/printf/cli.rs b/src/uu/printf/src/cli.rs similarity index 100% rename from src/printf/cli.rs rename to src/uu/printf/src/cli.rs diff --git a/src/printf/memo.rs b/src/uu/printf/src/memo.rs similarity index 100% rename from src/printf/memo.rs rename to src/uu/printf/src/memo.rs diff --git a/src/printf/mod.rs b/src/uu/printf/src/mod.rs similarity index 100% rename from src/printf/mod.rs rename to src/uu/printf/src/mod.rs diff --git a/src/printf/printf.rs b/src/uu/printf/src/printf.rs similarity index 100% rename from src/printf/printf.rs rename to src/uu/printf/src/printf.rs diff --git a/src/printf/tokenize/mod.rs b/src/uu/printf/src/tokenize/mod.rs similarity index 100% rename from src/printf/tokenize/mod.rs rename to src/uu/printf/src/tokenize/mod.rs diff --git a/src/printf/tokenize/num_format/format_field.rs b/src/uu/printf/src/tokenize/num_format/format_field.rs similarity index 100% rename from src/printf/tokenize/num_format/format_field.rs rename to src/uu/printf/src/tokenize/num_format/format_field.rs diff --git a/src/printf/tokenize/num_format/formatter.rs b/src/uu/printf/src/tokenize/num_format/formatter.rs similarity index 100% rename from src/printf/tokenize/num_format/formatter.rs rename to src/uu/printf/src/tokenize/num_format/formatter.rs diff --git a/src/printf/tokenize/num_format/formatters/base_conv/mod.rs b/src/uu/printf/src/tokenize/num_format/formatters/base_conv/mod.rs similarity index 100% rename from src/printf/tokenize/num_format/formatters/base_conv/mod.rs rename to src/uu/printf/src/tokenize/num_format/formatters/base_conv/mod.rs diff --git a/src/printf/tokenize/num_format/formatters/base_conv/tests.rs b/src/uu/printf/src/tokenize/num_format/formatters/base_conv/tests.rs similarity index 100% rename from src/printf/tokenize/num_format/formatters/base_conv/tests.rs rename to src/uu/printf/src/tokenize/num_format/formatters/base_conv/tests.rs diff --git a/src/printf/tokenize/num_format/formatters/cninetyninehexfloatf.rs b/src/uu/printf/src/tokenize/num_format/formatters/cninetyninehexfloatf.rs similarity index 100% rename from src/printf/tokenize/num_format/formatters/cninetyninehexfloatf.rs rename to src/uu/printf/src/tokenize/num_format/formatters/cninetyninehexfloatf.rs diff --git a/src/printf/tokenize/num_format/formatters/decf.rs b/src/uu/printf/src/tokenize/num_format/formatters/decf.rs similarity index 100% rename from src/printf/tokenize/num_format/formatters/decf.rs rename to src/uu/printf/src/tokenize/num_format/formatters/decf.rs diff --git a/src/printf/tokenize/num_format/formatters/float_common.rs b/src/uu/printf/src/tokenize/num_format/formatters/float_common.rs similarity index 100% rename from src/printf/tokenize/num_format/formatters/float_common.rs rename to src/uu/printf/src/tokenize/num_format/formatters/float_common.rs diff --git a/src/printf/tokenize/num_format/formatters/floatf.rs b/src/uu/printf/src/tokenize/num_format/formatters/floatf.rs similarity index 100% rename from src/printf/tokenize/num_format/formatters/floatf.rs rename to src/uu/printf/src/tokenize/num_format/formatters/floatf.rs diff --git a/src/printf/tokenize/num_format/formatters/intf.rs b/src/uu/printf/src/tokenize/num_format/formatters/intf.rs similarity index 100% rename from src/printf/tokenize/num_format/formatters/intf.rs rename to src/uu/printf/src/tokenize/num_format/formatters/intf.rs diff --git a/src/printf/tokenize/num_format/formatters/mod.rs b/src/uu/printf/src/tokenize/num_format/formatters/mod.rs similarity index 100% rename from src/printf/tokenize/num_format/formatters/mod.rs rename to src/uu/printf/src/tokenize/num_format/formatters/mod.rs diff --git a/src/printf/tokenize/num_format/formatters/scif.rs b/src/uu/printf/src/tokenize/num_format/formatters/scif.rs similarity index 100% rename from src/printf/tokenize/num_format/formatters/scif.rs rename to src/uu/printf/src/tokenize/num_format/formatters/scif.rs diff --git a/src/printf/tokenize/num_format/mod.rs b/src/uu/printf/src/tokenize/num_format/mod.rs similarity index 100% rename from src/printf/tokenize/num_format/mod.rs rename to src/uu/printf/src/tokenize/num_format/mod.rs diff --git a/src/printf/tokenize/num_format/num_format.rs b/src/uu/printf/src/tokenize/num_format/num_format.rs similarity index 100% rename from src/printf/tokenize/num_format/num_format.rs rename to src/uu/printf/src/tokenize/num_format/num_format.rs diff --git a/src/printf/tokenize/sub.rs b/src/uu/printf/src/tokenize/sub.rs similarity index 100% rename from src/printf/tokenize/sub.rs rename to src/uu/printf/src/tokenize/sub.rs diff --git a/src/printf/tokenize/token.rs b/src/uu/printf/src/tokenize/token.rs similarity index 100% rename from src/printf/tokenize/token.rs rename to src/uu/printf/src/tokenize/token.rs diff --git a/src/printf/tokenize/unescaped_text.rs b/src/uu/printf/src/tokenize/unescaped_text.rs similarity index 100% rename from src/printf/tokenize/unescaped_text.rs rename to src/uu/printf/src/tokenize/unescaped_text.rs diff --git a/src/ptx/Cargo.toml b/src/uu/ptx/Cargo.toml similarity index 75% rename from src/ptx/Cargo.toml rename to src/uu/ptx/Cargo.toml index 700e150bd..e3d6135ff 100644 --- a/src/ptx/Cargo.toml +++ b/src/uu/ptx/Cargo.toml @@ -3,11 +3,11 @@ name = "ptx" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_ptx" -path = "ptx.rs" +path = "src/ptx.rs" [dependencies] aho-corasick = "0.7.3" @@ -20,4 +20,4 @@ uucore = "0.0.2" [[bin]] name = "ptx" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/ptx/ptx.rs b/src/uu/ptx/src/ptx.rs similarity index 100% rename from src/ptx/ptx.rs rename to src/uu/ptx/src/ptx.rs diff --git a/src/pwd/Cargo.toml b/src/uu/pwd/Cargo.toml similarity index 66% rename from src/pwd/Cargo.toml rename to src/uu/pwd/Cargo.toml index 8466713c9..328fda9e8 100644 --- a/src/pwd/Cargo.toml +++ b/src/uu/pwd/Cargo.toml @@ -3,11 +3,11 @@ name = "pwd" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_pwd" -path = "pwd.rs" +path = "src/pwd.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "pwd" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/pwd/pwd.rs b/src/uu/pwd/src/pwd.rs similarity index 100% rename from src/pwd/pwd.rs rename to src/uu/pwd/src/pwd.rs diff --git a/src/readlink/Cargo.toml b/src/uu/readlink/Cargo.toml similarity index 71% rename from src/readlink/Cargo.toml rename to src/uu/readlink/Cargo.toml index b2185789e..39b88f0a8 100644 --- a/src/readlink/Cargo.toml +++ b/src/uu/readlink/Cargo.toml @@ -3,11 +3,11 @@ name = "readlink" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_readlink" -path = "readlink.rs" +path = "src/readlink.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = { version = "0.0.2", features = ["fs"] } [[bin]] name = "readlink" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/readlink/readlink.rs b/src/uu/readlink/src/readlink.rs similarity index 100% rename from src/readlink/readlink.rs rename to src/uu/readlink/src/readlink.rs diff --git a/src/realpath/Cargo.toml b/src/uu/realpath/Cargo.toml similarity index 70% rename from src/realpath/Cargo.toml rename to src/uu/realpath/Cargo.toml index f574d8852..c79c5f5a7 100644 --- a/src/realpath/Cargo.toml +++ b/src/uu/realpath/Cargo.toml @@ -3,11 +3,11 @@ name = "realpath" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_realpath" -path = "realpath.rs" +path = "src/realpath.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = { version = "0.0.2", features = ["fs"] } [[bin]] name = "realpath" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/realpath/realpath.rs b/src/uu/realpath/src/realpath.rs similarity index 100% rename from src/realpath/realpath.rs rename to src/uu/realpath/src/realpath.rs diff --git a/src/relpath/Cargo.toml b/src/uu/relpath/Cargo.toml similarity index 70% rename from src/relpath/Cargo.toml rename to src/uu/relpath/Cargo.toml index 799732eae..6bb6cb4de 100644 --- a/src/relpath/Cargo.toml +++ b/src/uu/relpath/Cargo.toml @@ -3,11 +3,11 @@ name = "relpath" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_relpath" -path = "relpath.rs" +path = "src/relpath.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = { version = "0.0.2", features = ["fs"] } [[bin]] name = "relpath" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/relpath/relpath.rs b/src/uu/relpath/src/relpath.rs similarity index 100% rename from src/relpath/relpath.rs rename to src/uu/relpath/src/relpath.rs diff --git a/src/rm/Cargo.toml b/src/uu/rm/Cargo.toml similarity index 71% rename from src/rm/Cargo.toml rename to src/uu/rm/Cargo.toml index 418e3fdf2..bbaaaea53 100644 --- a/src/rm/Cargo.toml +++ b/src/uu/rm/Cargo.toml @@ -3,11 +3,11 @@ name = "rm" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_rm" -path = "rm.rs" +path = "src/rm.rs" [dependencies] getopts = "0.2.18" @@ -17,4 +17,4 @@ uucore = "0.0.2" [[bin]] name = "rm" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/rm/rm.rs b/src/uu/rm/src/rm.rs similarity index 100% rename from src/rm/rm.rs rename to src/uu/rm/src/rm.rs diff --git a/src/rmdir/Cargo.toml b/src/uu/rmdir/Cargo.toml similarity index 66% rename from src/rmdir/Cargo.toml rename to src/uu/rmdir/Cargo.toml index 038e5365d..233e9bdc8 100644 --- a/src/rmdir/Cargo.toml +++ b/src/uu/rmdir/Cargo.toml @@ -3,11 +3,11 @@ name = "rmdir" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_rmdir" -path = "rmdir.rs" +path = "src/rmdir.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "rmdir" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/rmdir/rmdir.rs b/src/uu/rmdir/src/rmdir.rs similarity index 100% rename from src/rmdir/rmdir.rs rename to src/uu/rmdir/src/rmdir.rs diff --git a/src/seq/Cargo.toml b/src/uu/seq/Cargo.toml similarity index 66% rename from src/seq/Cargo.toml rename to src/uu/seq/Cargo.toml index 608b1a418..c1c38b926 100644 --- a/src/seq/Cargo.toml +++ b/src/uu/seq/Cargo.toml @@ -3,11 +3,11 @@ name = "seq" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_seq" -path = "seq.rs" +path = "src/seq.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "seq" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/seq/seq.rs b/src/uu/seq/src/seq.rs similarity index 100% rename from src/seq/seq.rs rename to src/uu/seq/src/seq.rs diff --git a/src/shred/Cargo.toml b/src/uu/shred/Cargo.toml similarity index 73% rename from src/shred/Cargo.toml rename to src/uu/shred/Cargo.toml index 3a1ee6da7..e23dce935 100644 --- a/src/shred/Cargo.toml +++ b/src/uu/shred/Cargo.toml @@ -3,11 +3,11 @@ name = "shred" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_shred" -path = "shred.rs" +path = "src/shred.rs" [dependencies] filetime = "0.2.1" @@ -19,4 +19,4 @@ uucore = "0.0.2" [[bin]] name = "shred" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/shred/shred.rs b/src/uu/shred/src/shred.rs similarity index 100% rename from src/shred/shred.rs rename to src/uu/shred/src/shred.rs diff --git a/src/shuf/Cargo.toml b/src/uu/shuf/Cargo.toml similarity index 68% rename from src/shuf/Cargo.toml rename to src/uu/shuf/Cargo.toml index 66cee9e98..755b3c207 100644 --- a/src/shuf/Cargo.toml +++ b/src/uu/shuf/Cargo.toml @@ -3,11 +3,11 @@ name = "shuf" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_shuf" -path = "shuf.rs" +path = "src/shuf.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = "0.0.2" [[bin]] name = "shuf" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/shuf/shuf.rs b/src/uu/shuf/src/shuf.rs similarity index 100% rename from src/shuf/shuf.rs rename to src/uu/shuf/src/shuf.rs diff --git a/src/sleep/Cargo.toml b/src/uu/sleep/Cargo.toml similarity index 71% rename from src/sleep/Cargo.toml rename to src/uu/sleep/Cargo.toml index 825dc92a2..ccfcf092b 100644 --- a/src/sleep/Cargo.toml +++ b/src/uu/sleep/Cargo.toml @@ -3,11 +3,11 @@ name = "sleep" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_sleep" -path = "sleep.rs" +path = "src/sleep.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = { version = "0.0.2", features = ["parse_time"] } [[bin]] name = "sleep" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/sleep/sleep.rs b/src/uu/sleep/src/sleep.rs similarity index 100% rename from src/sleep/sleep.rs rename to src/uu/sleep/src/sleep.rs diff --git a/src/sort/Cargo.toml b/src/uu/sort/Cargo.toml similarity index 73% rename from src/sort/Cargo.toml rename to src/uu/sort/Cargo.toml index 22f0d0fdc..9795c7cb3 100644 --- a/src/sort/Cargo.toml +++ b/src/uu/sort/Cargo.toml @@ -3,11 +3,11 @@ name = "sort" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_sort" -path = "sort.rs" +path = "src/sort.rs" [dependencies] getopts = "0.2.18" @@ -17,4 +17,4 @@ uucore = { version = "0.0.2", features = ["fs"] } [[bin]] name = "sort" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/sort/sort.rs b/src/uu/sort/src/sort.rs similarity index 100% rename from src/sort/sort.rs rename to src/uu/sort/src/sort.rs diff --git a/src/split/Cargo.toml b/src/uu/split/Cargo.toml similarity index 66% rename from src/split/Cargo.toml rename to src/uu/split/Cargo.toml index ece2eca1f..a2904515d 100644 --- a/src/split/Cargo.toml +++ b/src/uu/split/Cargo.toml @@ -3,11 +3,11 @@ name = "split" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_split" -path = "split.rs" +path = "src/split.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "split" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/split/README.md b/src/uu/split/README.md similarity index 100% rename from src/split/README.md rename to src/uu/split/README.md diff --git a/src/split/split.rs b/src/uu/split/src/split.rs similarity index 100% rename from src/split/split.rs rename to src/uu/split/src/split.rs diff --git a/src/stat/Cargo.toml b/src/uu/stat/Cargo.toml similarity index 72% rename from src/stat/Cargo.toml rename to src/uu/stat/Cargo.toml index df7700e71..4fc924645 100644 --- a/src/stat/Cargo.toml +++ b/src/uu/stat/Cargo.toml @@ -3,11 +3,11 @@ name = "stat" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_stat" -path = "stat.rs" +path = "src/stat.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = { version = "0.0.2", features = ["entries"] } [[bin]] name = "stat" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/stat/fsext.rs b/src/uu/stat/src/fsext.rs similarity index 100% rename from src/stat/fsext.rs rename to src/uu/stat/src/fsext.rs diff --git a/src/stat/stat.rs b/src/uu/stat/src/stat.rs similarity index 100% rename from src/stat/stat.rs rename to src/uu/stat/src/stat.rs diff --git a/src/stat/test_stat.rs b/src/uu/stat/src/test_stat.rs similarity index 100% rename from src/stat/test_stat.rs rename to src/uu/stat/src/test_stat.rs diff --git a/src/stdbuf/Cargo.toml b/src/uu/stdbuf/Cargo.toml similarity index 71% rename from src/stdbuf/Cargo.toml rename to src/uu/stdbuf/Cargo.toml index 037750b05..f59d252f4 100644 --- a/src/stdbuf/Cargo.toml +++ b/src/uu/stdbuf/Cargo.toml @@ -7,7 +7,7 @@ build = "build.rs" [lib] name = "uu_stdbuf" -path = "stdbuf.rs" +path = "src/stdbuf.rs" [dependencies] getopts = "0.2.18" @@ -15,8 +15,8 @@ tempdir = "0.3.7" uucore = "0.0.2" [build-dependencies] -libstdbuf = { path="libstdbuf" } +libstdbuf = { path="src/libstdbuf" } [[bin]] name = "stdbuf" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/stdbuf/build.rs b/src/uu/stdbuf/build.rs similarity index 91% rename from src/stdbuf/build.rs rename to src/uu/stdbuf/build.rs index 90b16c908..d4c9b718d 100644 --- a/src/stdbuf/build.rs +++ b/src/uu/stdbuf/build.rs @@ -2,7 +2,7 @@ use std::env; use std::fs; use std::path::Path; -#[path = "../#common/mkmain.rs"] +#[path = "../../common/mkmain.rs"] mod mkmain; #[cfg(not(any(target_os = "macos", target_os = "ios", target_os = "windows")))] @@ -28,7 +28,7 @@ fn main() { let out_dir = env::var("OUT_DIR").unwrap(); let libstdbuf = format!( - "{}/../../{}/{}/deps/liblibstdbuf{}", + "{}/../../../{}/{}/deps/liblibstdbuf{}", manifest_dir, env::var("CARGO_TARGET_DIR").unwrap_or_else(|_| "target".to_string()), profile, diff --git a/src/stdbuf/libstdbuf/Cargo.toml b/src/uu/stdbuf/src/libstdbuf/Cargo.toml similarity index 92% rename from src/stdbuf/libstdbuf/Cargo.toml rename to src/uu/stdbuf/src/libstdbuf/Cargo.toml index 425905f2b..d977515d9 100644 --- a/src/stdbuf/libstdbuf/Cargo.toml +++ b/src/uu/stdbuf/src/libstdbuf/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" [lib] name = "libstdbuf" -path = "libstdbuf.rs" +path = "src/libstdbuf.rs" # XXX: the rlib is just to prevent Cargo from spitting out a warning crate-type = ["cdylib", "rlib"] diff --git a/src/stdbuf/libstdbuf/build.rs b/src/uu/stdbuf/src/libstdbuf/build.rs similarity index 53% rename from src/stdbuf/libstdbuf/build.rs rename to src/uu/stdbuf/src/libstdbuf/build.rs index c4bb007b9..a295b4406 100644 --- a/src/stdbuf/libstdbuf/build.rs +++ b/src/uu/stdbuf/src/libstdbuf/build.rs @@ -3,5 +3,5 @@ extern crate cpp_build; use cpp_build::Config; fn main() { - Config::new().pic(true).build("libstdbuf.rs"); + Config::new().pic(true).build("src/libstdbuf.rs"); } diff --git a/src/stdbuf/libstdbuf/libstdbuf.rs b/src/uu/stdbuf/src/libstdbuf/src/libstdbuf.rs similarity index 100% rename from src/stdbuf/libstdbuf/libstdbuf.rs rename to src/uu/stdbuf/src/libstdbuf/src/libstdbuf.rs diff --git a/src/stdbuf/stdbuf.rs b/src/uu/stdbuf/src/stdbuf.rs similarity index 100% rename from src/stdbuf/stdbuf.rs rename to src/uu/stdbuf/src/stdbuf.rs diff --git a/src/sum/Cargo.toml b/src/uu/sum/Cargo.toml similarity index 66% rename from src/sum/Cargo.toml rename to src/uu/sum/Cargo.toml index 5203a05a0..939b5803a 100644 --- a/src/sum/Cargo.toml +++ b/src/uu/sum/Cargo.toml @@ -3,11 +3,11 @@ name = "sum" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_sum" -path = "sum.rs" +path = "src/sum.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "sum" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/sum/sum.rs b/src/uu/sum/src/sum.rs similarity index 100% rename from src/sum/sum.rs rename to src/uu/sum/src/sum.rs diff --git a/src/sync/Cargo.toml b/src/uu/sync/Cargo.toml similarity index 78% rename from src/sync/Cargo.toml rename to src/uu/sync/Cargo.toml index b1fa56329..0d24a5fa5 100644 --- a/src/sync/Cargo.toml +++ b/src/uu/sync/Cargo.toml @@ -3,11 +3,11 @@ name = "sync" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_sync" -path = "sync.rs" +path = "src/sync.rs" [dependencies] getopts = "0.2.18" @@ -18,4 +18,4 @@ winapi = { version = "0.3", features = ["handleapi", "winerror"] } [[bin]] name = "sync" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/sync/sync.rs b/src/uu/sync/src/sync.rs similarity index 100% rename from src/sync/sync.rs rename to src/uu/sync/src/sync.rs diff --git a/src/tac/Cargo.toml b/src/uu/tac/Cargo.toml similarity index 66% rename from src/tac/Cargo.toml rename to src/uu/tac/Cargo.toml index 1094b113f..11f69b73e 100644 --- a/src/tac/Cargo.toml +++ b/src/uu/tac/Cargo.toml @@ -3,11 +3,11 @@ name = "tac" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_tac" -path = "tac.rs" +path = "src/tac.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "tac" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/tac/tac.rs b/src/uu/tac/src/tac.rs similarity index 100% rename from src/tac/tac.rs rename to src/uu/tac/src/tac.rs diff --git a/src/tail/Cargo.toml b/src/uu/tail/Cargo.toml similarity index 77% rename from src/tail/Cargo.toml rename to src/uu/tail/Cargo.toml index f3290471b..0789ed5b5 100644 --- a/src/tail/Cargo.toml +++ b/src/uu/tail/Cargo.toml @@ -3,11 +3,11 @@ name = "tail" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_tail" -path = "tail.rs" +path = "src/tail.rs" [dependencies] getopts = "0.2.18" @@ -21,4 +21,4 @@ redox_syscall = "0.1" [[bin]] name = "tail" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/tail/README.md b/src/uu/tail/README.md similarity index 100% rename from src/tail/README.md rename to src/uu/tail/README.md diff --git a/src/tail/platform/mod.rs b/src/uu/tail/src/platform/mod.rs similarity index 100% rename from src/tail/platform/mod.rs rename to src/uu/tail/src/platform/mod.rs diff --git a/src/tail/platform/redox.rs b/src/uu/tail/src/platform/redox.rs similarity index 100% rename from src/tail/platform/redox.rs rename to src/uu/tail/src/platform/redox.rs diff --git a/src/tail/platform/unix.rs b/src/uu/tail/src/platform/unix.rs similarity index 100% rename from src/tail/platform/unix.rs rename to src/uu/tail/src/platform/unix.rs diff --git a/src/tail/platform/windows.rs b/src/uu/tail/src/platform/windows.rs similarity index 100% rename from src/tail/platform/windows.rs rename to src/uu/tail/src/platform/windows.rs diff --git a/src/tail/tail.rs b/src/uu/tail/src/tail.rs old mode 100755 new mode 100644 similarity index 100% rename from src/tail/tail.rs rename to src/uu/tail/src/tail.rs diff --git a/src/tee/Cargo.toml b/src/uu/tee/Cargo.toml similarity index 68% rename from src/tee/Cargo.toml rename to src/uu/tee/Cargo.toml index c688b9bdc..a6c44f756 100644 --- a/src/tee/Cargo.toml +++ b/src/uu/tee/Cargo.toml @@ -3,11 +3,11 @@ name = "tee" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_tee" -path = "tee.rs" +path = "src/tee.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = "0.0.2" [[bin]] name = "tee" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/tee/tee.rs b/src/uu/tee/src/tee.rs similarity index 100% rename from src/tee/tee.rs rename to src/uu/tee/src/tee.rs diff --git a/src/test/Cargo.toml b/src/uu/test/Cargo.toml similarity index 73% rename from src/test/Cargo.toml rename to src/uu/test/Cargo.toml index 4dc6877e8..4b89d3a6e 100644 --- a/src/test/Cargo.toml +++ b/src/uu/test/Cargo.toml @@ -3,11 +3,11 @@ name = "test" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_test" -path = "test.rs" +path = "src/test.rs" [dependencies] libc = "0.2.42" @@ -18,4 +18,4 @@ redox_syscall = "0.1" [[bin]] name = "test" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/test/test.rs b/src/uu/test/src/test.rs similarity index 100% rename from src/test/test.rs rename to src/uu/test/src/test.rs diff --git a/src/timeout/Cargo.toml b/src/uu/timeout/Cargo.toml similarity index 74% rename from src/timeout/Cargo.toml rename to src/uu/timeout/Cargo.toml index 1169d87eb..44a02a13e 100644 --- a/src/timeout/Cargo.toml +++ b/src/uu/timeout/Cargo.toml @@ -3,11 +3,11 @@ name = "timeout" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_timeout" -path = "timeout.rs" +path = "src/timeout.rs" [dependencies] getopts = "0.2.18" @@ -17,4 +17,4 @@ uucore = { version = "0.0.2", features = ["parse_time", "process"] } [[bin]] name = "timeout" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/timeout/timeout.rs b/src/uu/timeout/src/timeout.rs similarity index 100% rename from src/timeout/timeout.rs rename to src/uu/timeout/src/timeout.rs diff --git a/src/touch/Cargo.toml b/src/uu/touch/Cargo.toml similarity index 73% rename from src/touch/Cargo.toml rename to src/uu/touch/Cargo.toml index 2b78a33f3..dd1f5fd58 100644 --- a/src/touch/Cargo.toml +++ b/src/uu/touch/Cargo.toml @@ -3,11 +3,11 @@ name = "touch" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_touch" -path = "touch.rs" +path = "src/touch.rs" [dependencies] filetime = "0.2.1" @@ -17,4 +17,4 @@ uucore = { version = "0.0.2", features = ["libc"] } [[bin]] name = "touch" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/touch/touch.rs b/src/uu/touch/src/touch.rs similarity index 100% rename from src/touch/touch.rs rename to src/uu/touch/src/touch.rs diff --git a/src/tr/Cargo.toml b/src/uu/tr/Cargo.toml similarity index 70% rename from src/tr/Cargo.toml rename to src/uu/tr/Cargo.toml index 2c4cc0132..df3fc69da 100644 --- a/src/tr/Cargo.toml +++ b/src/uu/tr/Cargo.toml @@ -3,11 +3,11 @@ name = "tr" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_tr" -path = "tr.rs" +path = "src/tr.rs" [dependencies] bit-set = "0.5.0" @@ -17,4 +17,4 @@ uucore = "0.0.2" [[bin]] name = "tr" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/tr/expand.rs b/src/uu/tr/src/expand.rs similarity index 100% rename from src/tr/expand.rs rename to src/uu/tr/src/expand.rs diff --git a/src/tr/tr.rs b/src/uu/tr/src/tr.rs similarity index 100% rename from src/tr/tr.rs rename to src/uu/tr/src/tr.rs diff --git a/src/true/Cargo.toml b/src/uu/true/Cargo.toml similarity index 63% rename from src/true/Cargo.toml rename to src/uu/true/Cargo.toml index c36c29526..37db54256 100644 --- a/src/true/Cargo.toml +++ b/src/uu/true/Cargo.toml @@ -3,15 +3,15 @@ name = "true" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_true" -path = "true.rs" +path = "src/true.rs" [dependencies] uucore = "0.0.2" [[bin]] name = "true" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/true/true.rs b/src/uu/true/src/true.rs similarity index 100% rename from src/true/true.rs rename to src/uu/true/src/true.rs diff --git a/src/truncate/Cargo.toml b/src/uu/truncate/Cargo.toml similarity index 66% rename from src/truncate/Cargo.toml rename to src/uu/truncate/Cargo.toml index 376afafc0..506c96550 100644 --- a/src/truncate/Cargo.toml +++ b/src/uu/truncate/Cargo.toml @@ -3,11 +3,11 @@ name = "truncate" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_truncate" -path = "truncate.rs" +path = "src/truncate.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "truncate" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/truncate/truncate.rs b/src/uu/truncate/src/truncate.rs similarity index 100% rename from src/truncate/truncate.rs rename to src/uu/truncate/src/truncate.rs diff --git a/src/tsort/Cargo.toml b/src/uu/tsort/Cargo.toml similarity index 66% rename from src/tsort/Cargo.toml rename to src/uu/tsort/Cargo.toml index 096ba2e2e..82f710b1d 100644 --- a/src/tsort/Cargo.toml +++ b/src/uu/tsort/Cargo.toml @@ -3,11 +3,11 @@ name = "tsort" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_tsort" -path = "tsort.rs" +path = "src/tsort.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "tsort" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/tsort/tsort.rs b/src/uu/tsort/src/tsort.rs similarity index 100% rename from src/tsort/tsort.rs rename to src/uu/tsort/src/tsort.rs diff --git a/src/tty/Cargo.toml b/src/uu/tty/Cargo.toml similarity index 71% rename from src/tty/Cargo.toml rename to src/uu/tty/Cargo.toml index 0e8a07039..7d2769a95 100644 --- a/src/tty/Cargo.toml +++ b/src/uu/tty/Cargo.toml @@ -3,11 +3,11 @@ name = "tty" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_tty" -path = "tty.rs" +path = "src/tty.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = { version = "0.0.2", features = ["fs"] } [[bin]] name = "tty" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/tty/tty.rs b/src/uu/tty/src/tty.rs similarity index 100% rename from src/tty/tty.rs rename to src/uu/tty/src/tty.rs diff --git a/src/uname/Cargo.toml b/src/uu/uname/Cargo.toml similarity index 69% rename from src/uname/Cargo.toml rename to src/uu/uname/Cargo.toml index 8f8025a3e..fa4ebb406 100644 --- a/src/uname/Cargo.toml +++ b/src/uu/uname/Cargo.toml @@ -3,11 +3,11 @@ name = "uname" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_uname" -path = "uname.rs" +path = "src/uname.rs" [dependencies] clap = "2.32.0" @@ -16,4 +16,4 @@ uucore = "0.0.2" [[bin]] name = "uname" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/uname/uname.rs b/src/uu/uname/src/uname.rs similarity index 100% rename from src/uname/uname.rs rename to src/uu/uname/src/uname.rs diff --git a/src/unexpand/Cargo.toml b/src/uu/unexpand/Cargo.toml similarity index 69% rename from src/unexpand/Cargo.toml rename to src/uu/unexpand/Cargo.toml index c408c98d3..d81f290e4 100644 --- a/src/unexpand/Cargo.toml +++ b/src/uu/unexpand/Cargo.toml @@ -3,11 +3,11 @@ name = "unexpand" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_unexpand" -path = "unexpand.rs" +path = "src/unexpand.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = "0.0.2" [[bin]] name = "unexpand" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/unexpand/unexpand.rs b/src/uu/unexpand/src/unexpand.rs similarity index 100% rename from src/unexpand/unexpand.rs rename to src/uu/unexpand/src/unexpand.rs diff --git a/src/uniq/Cargo.toml b/src/uu/uniq/Cargo.toml similarity index 66% rename from src/uniq/Cargo.toml rename to src/uu/uniq/Cargo.toml index de02b220d..5263efca4 100644 --- a/src/uniq/Cargo.toml +++ b/src/uu/uniq/Cargo.toml @@ -3,11 +3,11 @@ name = "uniq" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_uniq" -path = "uniq.rs" +path = "src/uniq.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "uniq" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/uniq/uniq.rs b/src/uu/uniq/src/uniq.rs similarity index 100% rename from src/uniq/uniq.rs rename to src/uu/uniq/src/uniq.rs diff --git a/src/unlink/Cargo.toml b/src/uu/unlink/Cargo.toml similarity index 68% rename from src/unlink/Cargo.toml rename to src/uu/unlink/Cargo.toml index de564f360..9cd1ee7d2 100644 --- a/src/unlink/Cargo.toml +++ b/src/uu/unlink/Cargo.toml @@ -3,11 +3,11 @@ name = "unlink" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_unlink" -path = "unlink.rs" +path = "src/unlink.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = "0.0.2" [[bin]] name = "unlink" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/unlink/unlink.rs b/src/uu/unlink/src/unlink.rs similarity index 100% rename from src/unlink/unlink.rs rename to src/uu/unlink/src/unlink.rs diff --git a/src/uptime/Cargo.toml b/src/uu/uptime/Cargo.toml similarity index 72% rename from src/uptime/Cargo.toml rename to src/uu/uptime/Cargo.toml index 94333bf6e..93bcd4349 100644 --- a/src/uptime/Cargo.toml +++ b/src/uu/uptime/Cargo.toml @@ -3,11 +3,11 @@ name = "uptime" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_uptime" -path = "uptime.rs" +path = "src/uptime.rs" [dependencies] getopts = "0.2.18" @@ -16,4 +16,4 @@ uucore = { version = "0.0.2", features = ["utmpx"] } [[bin]] name = "uptime" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/uptime/uptime.rs b/src/uu/uptime/src/uptime.rs similarity index 100% rename from src/uptime/uptime.rs rename to src/uu/uptime/src/uptime.rs diff --git a/src/users/Cargo.toml b/src/uu/users/Cargo.toml similarity index 70% rename from src/users/Cargo.toml rename to src/uu/users/Cargo.toml index 5ba2cc7d4..5176646cf 100644 --- a/src/users/Cargo.toml +++ b/src/uu/users/Cargo.toml @@ -3,11 +3,11 @@ name = "users" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_users" -path = "users.rs" +path = "src/users.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = { version = "0.0.2", features = ["utmpx"] } [[bin]] name = "users" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/users/users.rs b/src/uu/users/src/users.rs similarity index 100% rename from src/users/users.rs rename to src/uu/users/src/users.rs diff --git a/src/wc/Cargo.toml b/src/uu/wc/Cargo.toml similarity index 66% rename from src/wc/Cargo.toml rename to src/uu/wc/Cargo.toml index 35d1f0cbf..cad2a4286 100644 --- a/src/wc/Cargo.toml +++ b/src/uu/wc/Cargo.toml @@ -3,11 +3,11 @@ name = "wc" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_wc" -path = "wc.rs" +path = "src/wc.rs" [dependencies] getopts = "0.2.18" @@ -15,4 +15,4 @@ uucore = "0.0.2" [[bin]] name = "wc" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/wc/wc.rs b/src/uu/wc/src/wc.rs similarity index 100% rename from src/wc/wc.rs rename to src/uu/wc/src/wc.rs diff --git a/src/who/Cargo.toml b/src/uu/who/Cargo.toml similarity index 74% rename from src/who/Cargo.toml rename to src/uu/who/Cargo.toml index 3f3b3431e..ce8f3c509 100644 --- a/src/who/Cargo.toml +++ b/src/uu/who/Cargo.toml @@ -3,11 +3,11 @@ name = "who" version = "0.0.1" authors = [] license = "MIT" -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_who" -path = "who.rs" +path = "src/who.rs" [dependencies] uucore = { version = "0.0.2", features = ["utmpx"] } @@ -16,4 +16,4 @@ clippy = { version = "0.0.212", optional = true } [[bin]] name = "who" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/who/who.rs b/src/uu/who/src/who.rs similarity index 100% rename from src/who/who.rs rename to src/uu/who/src/who.rs diff --git a/src/whoami/Cargo.toml b/src/uu/whoami/Cargo.toml similarity index 79% rename from src/whoami/Cargo.toml rename to src/uu/whoami/Cargo.toml index 36a3f5f70..f1d315fce 100644 --- a/src/whoami/Cargo.toml +++ b/src/uu/whoami/Cargo.toml @@ -4,11 +4,11 @@ version = "0.0.1" authors = [] license = "MIT" description = "Print effective user ID." -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_whoami" -path = "whoami.rs" +path = "src/whoami.rs" [dependencies] advapi32-sys = "0.2.0" @@ -18,4 +18,4 @@ winapi = { version = "0.3", features = ["lmcons"] } [[bin]] name = "whoami" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/whoami/platform/mod.rs b/src/uu/whoami/src/platform/mod.rs similarity index 100% rename from src/whoami/platform/mod.rs rename to src/uu/whoami/src/platform/mod.rs diff --git a/src/whoami/platform/unix.rs b/src/uu/whoami/src/platform/unix.rs similarity index 100% rename from src/whoami/platform/unix.rs rename to src/uu/whoami/src/platform/unix.rs diff --git a/src/whoami/platform/windows.rs b/src/uu/whoami/src/platform/windows.rs similarity index 100% rename from src/whoami/platform/windows.rs rename to src/uu/whoami/src/platform/windows.rs diff --git a/src/whoami/whoami.rs b/src/uu/whoami/src/whoami.rs similarity index 95% rename from src/whoami/whoami.rs rename to src/uu/whoami/src/whoami.rs index 886126cbf..5fedeec9f 100644 --- a/src/whoami/whoami.rs +++ b/src/uu/whoami/src/whoami.rs @@ -19,7 +19,7 @@ extern crate uucore; mod platform; // force a re-build whenever Cargo.toml changes -const _CARGO_TOML: &str = include_str!("Cargo.toml"); +const _CARGO_TOML: &str = include_str!("../Cargo.toml"); pub fn uumain(args: Vec) -> i32 { let app = app_from_crate!(); diff --git a/src/yes/Cargo.toml b/src/uu/yes/Cargo.toml similarity index 78% rename from src/yes/Cargo.toml rename to src/uu/yes/Cargo.toml index d1b9605b2..aa5e8967b 100644 --- a/src/yes/Cargo.toml +++ b/src/uu/yes/Cargo.toml @@ -4,11 +4,11 @@ version = "0.0.1" authors = [] license = "MIT" description = "Repeatedly output a line with all specified STRING(s), or 'y'." -build = "../#common/mkmain.rs" +build = "../../common/mkmain.rs" [lib] name = "uu_yes" -path = "yes.rs" +path = "src/yes.rs" [dependencies] clap = "2.32" @@ -20,4 +20,4 @@ default = [] [[bin]] name = "yes" -path = "../#common/uumain.rs" +path = "../../common/uumain.rs" diff --git a/src/yes/yes.rs b/src/uu/yes/src/yes.rs similarity index 97% rename from src/yes/yes.rs rename to src/uu/yes/src/yes.rs index 6a46d61ba..ccc9b3992 100644 --- a/src/yes/yes.rs +++ b/src/uu/yes/src/yes.rs @@ -22,7 +22,7 @@ use std::io::{self, Write}; use uucore::zero_copy::ZeroCopyWriter; // force a re-build whenever Cargo.toml changes -const _CARGO_TOML: &str = include_str!("Cargo.toml"); +const _CARGO_TOML: &str = include_str!("../Cargo.toml"); // it's possible that using a smaller or larger buffer might provide better performance on some // systems, but honestly this is good enough diff --git a/tests/test_factor.rs b/tests/test_factor.rs index 460526c16..a6b853064 100644 --- a/tests/test_factor.rs +++ b/tests/test_factor.rs @@ -9,7 +9,7 @@ use common::util::*; -#[path = "../src/factor/sieve.rs"] +#[path = "../src/uu/factor/sieve.rs"] mod sieve; use self::sieve::Sieve;