change ~ fixup paths (within workspace packages)

src/uu/arch/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_arch"
-path = "arch.rs"
+path = "src/arch.rs"
 
 [dependencies]
 platform-info = "0.0.1"

src/uu/base32/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_base32"
-path = "base32.rs"
+path = "src/base32.rs"
 
 [dependencies]
 uucore = { version = "0.0.2", features = ["encoding"] }

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]";

src/uu/base64/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_base64"
-path = "base64.rs"
+path = "src/base64.rs"
 
 [dependencies]
 uucore = { version = "0.0.2", features = ["encoding"] }

src/uu/basename/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_basename"
-path = "basename.rs"
+path = "src/basename.rs"
 
 [dependencies]
 uucore = "0.0.2"

src/uu/cat/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_cat"
-path = "cat.rs"
+path = "src/cat.rs"
 
 [dependencies]
 quick-error = "1.2.3"

src/uu/chgrp/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_chgrp"
-path = "chgrp.rs"
+path = "src/chgrp.rs"
 
 [dependencies]
 uucore = { version = "0.0.2", features = ["entries", "fs"] }

src/uu/chmod/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_chmod"
-path = "chmod.rs"
+path = "src/chmod.rs"
 
 [dependencies]
 libc = "0.2.42"

src/uu/chown/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_chown"
-path = "chown.rs"
+path = "src/chown.rs"
 
 [dependencies]
 glob = "0.3.0"

src/uu/chroot/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_chroot"
-path = "chroot.rs"
+path = "src/chroot.rs"
 
 [dependencies]
 getopts = "0.2.18"

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"

src/uu/comm/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_comm"
-path = "comm.rs"
+path = "src/comm.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/cp/Cargo.toml

@@ -10,7 +10,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_cp"
-path = "cp.rs"
+path = "src/cp.rs"
 
 [dependencies]
 clap = "2.32.0"

src/uu/cut/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_cut"
-path = "cut.rs"
+path = "src/cut.rs"
 
 [dependencies]
 uucore = "0.0.2"

src/uu/date/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_date"
-path = "date.rs"
+path = "src/date.rs"
 
 [dependencies]
 chrono = "0.4.4"

src/uu/dircolors/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_dircolors"
-path = "dircolors.rs"
+path = "src/dircolors.rs"
 
 [dependencies]
 glob = "0.3.0"

src/uu/dirname/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_dirname"
-path = "dirname.rs"
+path = "src/dirname.rs"
 
 [dependencies]
 libc = "0.2.42"

src/uu/du/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_du"
-path = "du.rs"
+path = "src/du.rs"
 
 [dependencies]
 time = "0.1.40"

src/uu/echo/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_echo"
-path = "echo.rs"
+path = "src/echo.rs"
 
 [dependencies]
 uucore = "0.0.2"

src/uu/env/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2018"
 
 [lib]
 name = "uu_env"
-path = "env.rs"
+path = "src/env.rs"
 
 [dependencies]
 clap = "2.33"

src/uu/expand/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_expand"
-path = "expand.rs"
+path = "src/expand.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/expr/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_expr"
-path = "expr.rs"
+path = "src/expr.rs"
 
 [dependencies]
 libc = "0.2.42"

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"

src/uu/factor/build.rs

@@ -29,6 +29,7 @@ use std::u64::MAX as MAX_U64;
 use numeric::is_prime;
 
 #[cfg(test)]
+#[path = "src/numeric.rs"]
 mod numeric;
 
 mod sieve;

src/uu/false/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_false"
-path = "false.rs"
+path = "src/false.rs"
 
 [dependencies]
 uucore = "0.0.2"

src/uu/fmt/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_fmt"
-path = "fmt.rs"
+path = "src/fmt.rs"
 
 [dependencies]
 libc = "0.2.42"

src/uu/fold/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_fold"
-path = "fold.rs"
+path = "src/fold.rs"
 
 [dependencies]
 uucore = "0.0.2"

src/uu/groups/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_groups"
-path = "groups.rs"
+path = "src/groups.rs"
 
 [dependencies]
 uucore = { version = "0.0.2", features = ["entries"] }

src/uu/hashsum/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_hashsum"
-path = "hashsum.rs"
+path = "src/hashsum.rs"
 
 [dependencies]
 digest = "0.6.2"

src/uu/head/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_head"
-path = "head.rs"
+path = "src/head.rs"
 
 [dependencies]
 libc = "0.2.42"

src/uu/hostid/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_hostid"
-path = "hostid.rs"
+path = "src/hostid.rs"
 
 [dependencies]
 libc = "0.2.42"

src/uu/hostname/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_hostname"
-path = "hostname.rs"
+path = "src/hostname.rs"
 
 [dependencies]
 getopts = "0.2"

src/uu/id/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_id"
-path = "id.rs"
+path = "src/id.rs"
 
 [dependencies]
 uucore = { version = "0.0.2", features = ["entries", "process"] }

src/uu/install/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_install"
-path = "install.rs"
+path = "src/install.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/join/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_join"
-path = "join.rs"
+path = "src/join.rs"
 
 [dependencies]
 clap = "2.32.0"

src/uu/kill/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_kill"
-path = "kill.rs"
+path = "src/kill.rs"
 
 [dependencies]
 libc = "0.2.42"

src/uu/link/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_link"
-path = "link.rs"
+path = "src/link.rs"
 
 [dependencies]
 libc = "0.2.42"

src/uu/ln/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_ln"
-path = "ln.rs"
+path = "src/ln.rs"
 
 [dependencies]
 libc = "0.2.42"

src/uu/logname/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_logname"
-path = "logname.rs"
+path = "src/logname.rs"
 
 [dependencies]
 libc = "0.2.42"

src/uu/ls/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_ls"
-path = "ls.rs"
+path = "src/ls.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/mkdir/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_mkdir"
-path = "mkdir.rs"
+path = "src/mkdir.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/mkfifo/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_mkfifo"
-path = "mkfifo.rs"
+path = "src/mkfifo.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/mknod/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_mknod"
-path = "mknod.rs"
+path = "src/mknod.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/mktemp/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_mktemp"
-path = "mktemp.rs"
+path = "src/mktemp.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/more/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_more"
-path = "more.rs"
+path = "src/more.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/mv/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_mv"
-path = "mv.rs"
+path = "src/mv.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/nice/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_nice"
-path = "nice.rs"
+path = "src/nice.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/nl/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_nl"
-path = "nl.rs"
+path = "src/nl.rs"
 
 [dependencies]
 aho-corasick = "0.7.3"

src/uu/nohup/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_nohup"
-path = "nohup.rs"
+path = "src/nohup.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/nproc/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_nproc"
-path = "nproc.rs"
+path = "src/nproc.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/numfmt/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_numfmt"
-path = "numfmt.rs"
+path = "src/numfmt.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/od/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_od"
-path = "od.rs"
+path = "src/od.rs"
 
 [dependencies]
 byteorder = "1.3.2"

src/uu/paste/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_paste"
-path = "paste.rs"
+path = "src/paste.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/pathchk/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_pathchk"
-path = "pathchk.rs"
+path = "src/pathchk.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/pinky/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_pinky"
-path = "pinky.rs"
+path = "src/pinky.rs"
 
 [dependencies]
 uucore = { version = "0.0.2", features = ["utmpx", "entries"] }

src/uu/printenv/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_printenv"
-path = "printenv.rs"
+path = "src/printenv.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/printf/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_printf"
-path = "printf.rs"
+path = "src/printf.rs"
 
 [dependencies]
 itertools = "0.8.0"

src/uu/ptx/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_ptx"
-path = "ptx.rs"
+path = "src/ptx.rs"
 
 [dependencies]
 aho-corasick = "0.7.3"

src/uu/pwd/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_pwd"
-path = "pwd.rs"
+path = "src/pwd.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/readlink/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_readlink"
-path = "readlink.rs"
+path = "src/readlink.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/realpath/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_realpath"
-path = "realpath.rs"
+path = "src/realpath.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/relpath/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_relpath"
-path = "relpath.rs"
+path = "src/relpath.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/rm/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_rm"
-path = "rm.rs"
+path = "src/rm.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/rmdir/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_rmdir"
-path = "rmdir.rs"
+path = "src/rmdir.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/seq/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_seq"
-path = "seq.rs"
+path = "src/seq.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/shred/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_shred"
-path = "shred.rs"
+path = "src/shred.rs"
 
 [dependencies]
 filetime = "0.2.1"

src/uu/shuf/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_shuf"
-path = "shuf.rs"
+path = "src/shuf.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/sleep/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_sleep"
-path = "sleep.rs"
+path = "src/sleep.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/sort/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_sort"
-path = "sort.rs"
+path = "src/sort.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/split/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_split"
-path = "split.rs"
+path = "src/split.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/stat/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_stat"
-path = "stat.rs"
+path = "src/stat.rs"
 
 [dependencies]
 getopts = "0.2.18"

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,7 +15,7 @@ tempdir = "0.3.7"
 uucore = "0.0.2"
 
 [build-dependencies]
-libstdbuf = { path="libstdbuf" }
+libstdbuf = { path="src/libstdbuf" }
 
 [[bin]]
 name = "stdbuf"

src/uu/stdbuf/build.rs

@@ -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,

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"]
 

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");
 }

src/uu/sum/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_sum"
-path = "sum.rs"
+path = "src/sum.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/sync/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_sync"
-path = "sync.rs"
+path = "src/sync.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/tac/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_tac"
-path = "tac.rs"
+path = "src/tac.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/tail/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_tail"
-path = "tail.rs"
+path = "src/tail.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/tee/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_tee"
-path = "tee.rs"
+path = "src/tee.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/test/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_test"
-path = "test.rs"
+path = "src/test.rs"
 
 [dependencies]
 libc = "0.2.42"

src/uu/timeout/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_timeout"
-path = "timeout.rs"
+path = "src/timeout.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/touch/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_touch"
-path = "touch.rs"
+path = "src/touch.rs"
 
 [dependencies]
 filetime = "0.2.1"

src/uu/tr/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_tr"
-path = "tr.rs"
+path = "src/tr.rs"
 
 [dependencies]
 bit-set = "0.5.0"

src/uu/true/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_true"
-path = "true.rs"
+path = "src/true.rs"
 
 [dependencies]
 uucore = "0.0.2"

src/uu/truncate/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_truncate"
-path = "truncate.rs"
+path = "src/truncate.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/tsort/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_tsort"
-path = "tsort.rs"
+path = "src/tsort.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/tty/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_tty"
-path = "tty.rs"
+path = "src/tty.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/uname/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_uname"
-path = "uname.rs"
+path = "src/uname.rs"
 
 [dependencies]
 clap = "2.32.0"

src/uu/unexpand/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_unexpand"
-path = "unexpand.rs"
+path = "src/unexpand.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/uniq/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_uniq"
-path = "uniq.rs"
+path = "src/uniq.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/unlink/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_unlink"
-path = "unlink.rs"
+path = "src/unlink.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/uptime/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_uptime"
-path = "uptime.rs"
+path = "src/uptime.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/users/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_users"
-path = "users.rs"
+path = "src/users.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/wc/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_wc"
-path = "wc.rs"
+path = "src/wc.rs"
 
 [dependencies]
 getopts = "0.2.18"

src/uu/who/Cargo.toml

@@ -7,7 +7,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_who"
-path = "who.rs"
+path = "src/who.rs"
 
 [dependencies]
 uucore = { version = "0.0.2", features = ["utmpx"] }

src/uu/whoami/Cargo.toml

@@ -8,7 +8,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_whoami"
-path = "whoami.rs"
+path = "src/whoami.rs"
 
 [dependencies]
 advapi32-sys = "0.2.0"

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<String>) -> i32 {
     let app = app_from_crate!();

src/uu/yes/Cargo.toml

@@ -8,7 +8,7 @@ build = "../#common/mkmain.rs"
 
 [lib]
 name = "uu_yes"
-path = "yes.rs"
+path = "src/yes.rs"
 
 [dependencies]
 clap = "2.32"

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