diff --git a/Makefile b/Makefile index 884f90863..1ec3b5612 100644 --- a/Makefile +++ b/Makefile @@ -159,7 +159,7 @@ build/uutils: uutils/uutils.rs build/mkuutils $(addprefix build/, $(addsuffix .t $(RUSTC) $(RUSTCFLAGS) -L build/ --dep-info $@.d build/gen/uutils.rs -o $@ # Dependencies -LIBCRYPTO = $(shell $(RUSTC) --crate-file-name --crate-type rlib deps/rust-crypto/src/rust-crypto/lib.rs) +LIBCRYPTO = $(shell $(RUSTC) --print-file-name --crate-type rlib deps/rust-crypto/src/rust-crypto/lib.rs) -include build/rust-crypto.d build/$(LIBCRYPTO): | build $(RUSTC) $(RUSTCFLAGS) --crate-type rlib --dep-info build/rust-crypto.d deps/rust-crypto/src/rust-crypto/lib.rs --out-dir build/ diff --git a/base64/base64.rs b/base64/base64.rs index 231e2ee42..fe20cfeb1 100644 --- a/base64/base64.rs +++ b/base64/base64.rs @@ -1,4 +1,4 @@ -#![crate_id(name="base64", vers="1.0.0", author="Jordy Dickinson")] +#![crate_name = "base64"] /* * This file is part of the uutils coreutils package. diff --git a/basename/basename.rs b/basename/basename.rs index ef5b38f2d..079fa9acb 100644 --- a/basename/basename.rs +++ b/basename/basename.rs @@ -1,5 +1,5 @@ #![feature(macro_rules)] -#![crate_id(name="basename", vers="1.0.0", author="Jimmy Lu")] +#![crate_name = "basename"] /* * This file is part of the uutils coreutils package. diff --git a/cat/cat.rs b/cat/cat.rs index 4f539d516..01395bf55 100644 --- a/cat/cat.rs +++ b/cat/cat.rs @@ -1,4 +1,4 @@ -#![crate_id(name="cat", vers="1.0.0", author="Seldaek")] +#![crate_name = "cat"] #![feature(unsafe_destructor)] /* diff --git a/chroot/chroot.rs b/chroot/chroot.rs index dfd6177ff..09d6a18c5 100644 --- a/chroot/chroot.rs +++ b/chroot/chroot.rs @@ -1,4 +1,4 @@ -#![crate_id = "chroot#1.0.0"] +#![crate_name = "chroot"] /* * This file is part of the uutils coreutils package. * diff --git a/cksum/cksum.rs b/cksum/cksum.rs index acf341fba..2757e447b 100644 --- a/cksum/cksum.rs +++ b/cksum/cksum.rs @@ -1,4 +1,4 @@ -#![crate_id(name="cksum", vers="1.0.0", author="Michael Gehring")] +#![crate_name = "cksum"] #![feature(macro_rules)] /* diff --git a/comm/comm.rs b/comm/comm.rs index 44180428d..7f0017cc6 100644 --- a/comm/comm.rs +++ b/comm/comm.rs @@ -1,4 +1,4 @@ -#![crate_id(name="comm", vers="1.0.0", author="Michael Gehring")] +#![crate_name = "comm"] /* * This file is part of the uutils coreutils package. diff --git a/cp/cp.rs b/cp/cp.rs index f059d6772..52912feac 100644 --- a/cp/cp.rs +++ b/cp/cp.rs @@ -1,4 +1,4 @@ -#![crate_id(name="cp", vers="1.0.0", author="Jordy Dickinson")] +#![crate_name = "cp"] #![feature(macro_rules)] #![feature(phase)] diff --git a/cut/cut.rs b/cut/cut.rs index b5ef40a12..1addd7a04 100644 --- a/cut/cut.rs +++ b/cut/cut.rs @@ -1,4 +1,4 @@ -#![crate_id(name="cut", vers="1.0.0", author="Rolf Morel")] +#![crate_name = "cut"] /* * This file is part of the uutils coreutils package. diff --git a/dirname/dirname.rs b/dirname/dirname.rs index 429ebafd8..af22bede9 100644 --- a/dirname/dirname.rs +++ b/dirname/dirname.rs @@ -1,4 +1,4 @@ -#![crate_id(name="dirname", vers="1.0.0", author="Derek Chiang")] +#![crate_name = "dirname"] /* * This file is part of the uutils coreutils package. diff --git a/du/du.rs b/du/du.rs index 652de8146..67436d3e8 100644 --- a/du/du.rs +++ b/du/du.rs @@ -1,4 +1,4 @@ -#![crate_id(name="du", vers="1.0.0", author="Derek Chiang")] +#![crate_name = "du"] /* * This file is part of the uutils coreutils package. diff --git a/echo/echo.rs b/echo/echo.rs index 2f8c76a13..b734919ef 100644 --- a/echo/echo.rs +++ b/echo/echo.rs @@ -1,5 +1,5 @@ #![feature(macro_rules)] -#![crate_id(name="echo", vers="1.0.0", author="Derek Chiang")] +#![crate_name = "echo"] /* * This file is part of the uutils coreutils package. diff --git a/env/env.rs b/env/env.rs index bcc00e781..cb48acf5c 100644 --- a/env/env.rs +++ b/env/env.rs @@ -1,4 +1,4 @@ -#![crate_id(name="env", vers="1.0.0", author="LeoTestard")] +#![crate_name = "env"] /* * This file is part of the uutils coreutils package. diff --git a/factor/factor.rs b/factor/factor.rs index f1a2468fe..c5df8d0c0 100644 --- a/factor/factor.rs +++ b/factor/factor.rs @@ -1,4 +1,4 @@ -#![crate_id(name="factor", vers="1.0.0", author="T. Jameson Little")] +#![crate_name = "factor"] #![feature(macro_rules)] /* diff --git a/false/false.rs b/false/false.rs index f6f3dfe92..4ff95cdfa 100644 --- a/false/false.rs +++ b/false/false.rs @@ -1,4 +1,4 @@ -#![crate_id = "uufalse#1.0.0"] +#![crate_name = "uufalse"] /* * This file is part of the uutils coreutils package. diff --git a/fmt/fmt.rs b/fmt/fmt.rs index 9d461860a..be3a278ef 100644 --- a/fmt/fmt.rs +++ b/fmt/fmt.rs @@ -1,4 +1,4 @@ -#![crate_id(name="fmt", vers="0.0.3", author="kwantam")] +#![crate_name = "fmt"] /* * This file is part of `fmt` from the uutils coreutils package. * diff --git a/fold/fold.rs b/fold/fold.rs index 04f99af89..fb6ba4881 100644 --- a/fold/fold.rs +++ b/fold/fold.rs @@ -1,4 +1,4 @@ -#![crate_id(name = "fold", vers = "1.0.0", author = "Arcterus")] +#![crate_name = "fold"] /* * This file is part of the uutils coreutils package. diff --git a/groups/groups.rs b/groups/groups.rs index 1a0a3bb53..833c10bc3 100644 --- a/groups/groups.rs +++ b/groups/groups.rs @@ -1,4 +1,4 @@ -#![crate_id(name="groups", vers="1.0.0", author="Alan Andrade")] +#![crate_name = "groups"] /* * This file is part of the uutils coreutils package. * diff --git a/hashsum/hashsum.rs b/hashsum/hashsum.rs index ed11ba9f7..83e60cbe2 100644 --- a/hashsum/hashsum.rs +++ b/hashsum/hashsum.rs @@ -1,4 +1,4 @@ -#![crate_id = "hashsum#1.0.0"] +#![crate_name = "hashsum"] /* * This file is part of the uutils coreutils package. diff --git a/head/head.rs b/head/head.rs index 4e90cfaa5..4d25d827b 100644 --- a/head/head.rs +++ b/head/head.rs @@ -1,4 +1,4 @@ -#![crate_id(name="head", vers="1.0.0", author="Alan Andrade")] +#![crate_name = "head"] /* * This file is part of the uutils coreutils package. * diff --git a/hostid/hostid.rs b/hostid/hostid.rs index 70d78f316..818cf4fe6 100644 --- a/hostid/hostid.rs +++ b/hostid/hostid.rs @@ -1,4 +1,4 @@ -#![crate_id(name="hostid", vers="0.0.1", author="Maciej Dziardziel")] +#![crate_name = "hostid"] #![feature(macro_rules)] #![feature(phase)] diff --git a/hostname/hostname.rs b/hostname/hostname.rs index 632f73e3d..c2f0540bd 100644 --- a/hostname/hostname.rs +++ b/hostname/hostname.rs @@ -1,4 +1,4 @@ -#![crate_id(name="hostname", vers="1.0.0", author="Alan Andrade")] +#![crate_name = "hostname"] /* * This file is part of the uutils coreutils package. * diff --git a/id/id.rs b/id/id.rs index 1eaa06f39..51f10683d 100644 --- a/id/id.rs +++ b/id/id.rs @@ -1,4 +1,4 @@ -#![crate_id(name="id", version="1.0.0", author="Alan Andrade")] +#![crate_name = "id"] /* * This file is part of the uutils coreutils package. diff --git a/kill/kill.rs b/kill/kill.rs index 40d053335..663d07718 100644 --- a/kill/kill.rs +++ b/kill/kill.rs @@ -1,4 +1,4 @@ -#![crate_id(name="kill", vers="0.0.1", author="Maciej Dziardziel")] +#![crate_name = "kill"] #![feature(macro_rules)] #![feature(phase)] diff --git a/link/link.rs b/link/link.rs index 5f0e8a94f..61285c7e2 100644 --- a/link/link.rs +++ b/link/link.rs @@ -1,4 +1,4 @@ -#![crate_id(name="link", vers="1.0.0", author="Michael Gehring")] +#![crate_name = "link"] #![feature(macro_rules)] /* diff --git a/logname/logname.rs b/logname/logname.rs index 4f32aa5ea..e60b9c609 100644 --- a/logname/logname.rs +++ b/logname/logname.rs @@ -1,4 +1,4 @@ -#![crate_id(name="logname", version="1.0.0", author="Benoit Benedetti")] +#![crate_name = "logname"] /* * This file is part of the uutils coreutils package. diff --git a/mkdir/mkdir.rs b/mkdir/mkdir.rs index fe90ff26f..0ec032538 100644 --- a/mkdir/mkdir.rs +++ b/mkdir/mkdir.rs @@ -1,4 +1,4 @@ -#![crate_id(name="mkdir", vers="1.0.0", author="Nicholas Juszczak")] +#![crate_name = "mkdir"] /* * This file is part of the uutils coreutils package. diff --git a/mkfifo/mkfifo.rs b/mkfifo/mkfifo.rs index b8e0f56f0..cdb7d2281 100644 --- a/mkfifo/mkfifo.rs +++ b/mkfifo/mkfifo.rs @@ -1,4 +1,4 @@ -#![crate_id(name="mkfifo", vers="1.0.0", author="Michael Gehring")] +#![crate_name = "mkfifo"] #![feature(macro_rules)] /* diff --git a/nl/nl.rs b/nl/nl.rs index 7716fe75f..3c72e8bba 100644 --- a/nl/nl.rs +++ b/nl/nl.rs @@ -1,4 +1,4 @@ -#![crate_id(name="nl", vers="1.0.0", author="Tobias Schottdorf")] +#![crate_name = "nl"] #![feature(macro_rules)] /* * This file is part of the uutils coreutils package. diff --git a/nohup/nohup.rs b/nohup/nohup.rs index 87d48f90f..854655c8c 100644 --- a/nohup/nohup.rs +++ b/nohup/nohup.rs @@ -1,4 +1,4 @@ -#![crate_id = "nohup#1.0.0"] +#![crate_name = "nohup"] /* * This file is part of the uutils coreutils package. diff --git a/paste/paste.rs b/paste/paste.rs index 18e5f8023..fa3b6b353 100644 --- a/paste/paste.rs +++ b/paste/paste.rs @@ -1,4 +1,4 @@ -#![crate_id(name = "paste", vers = "1.0.0", author = "Arcterus")] +#![crate_name = "paste"] /* * This file is part of the uutils coreutils package. diff --git a/printenv/printenv.rs b/printenv/printenv.rs index 80fe06c22..6630e42a4 100644 --- a/printenv/printenv.rs +++ b/printenv/printenv.rs @@ -1,4 +1,4 @@ -#![crate_id(name="printenv", vers="1.0.0", author="Seldaek")] +#![crate_name = "printenv"] /* * This file is part of the uutils coreutils package. diff --git a/pwd/pwd.rs b/pwd/pwd.rs index b5f7c485e..8dcb38d13 100644 --- a/pwd/pwd.rs +++ b/pwd/pwd.rs @@ -1,4 +1,4 @@ -#![crate_id(name="pwd", vers="1.0.0", author="Heather Cynede")] +#![crate_name = "pwd"] /* * This file is part of the uutils coreutils package. diff --git a/realpath/realpath.rs b/realpath/realpath.rs index a17302fa5..9d0e2e3b0 100644 --- a/realpath/realpath.rs +++ b/realpath/realpath.rs @@ -1,4 +1,4 @@ -#![crate_id = "realpath#1.0.0"] +#![crate_name= "realpath"] /* * This file is part of the uutils coreutils package. diff --git a/relpath/relpath.rs b/relpath/relpath.rs index 7ae9acd90..234c1c649 100644 --- a/relpath/relpath.rs +++ b/relpath/relpath.rs @@ -1,4 +1,4 @@ -#![crate_id = "relpath#1.0.0"] +#![crate_name = "relpath"] /* * This file is part of the uutils coreutils package. diff --git a/rm/rm.rs b/rm/rm.rs index 04d6461bc..203cfc870 100644 --- a/rm/rm.rs +++ b/rm/rm.rs @@ -1,4 +1,4 @@ -#![crate_id(name="rm", vers="1.0.0", author="Arcterus")] +#![crate_name = "rm"] /* * This file is part of the uutils coreutils package. diff --git a/rmdir/rmdir.rs b/rmdir/rmdir.rs index 61cd4d947..5976ff66d 100644 --- a/rmdir/rmdir.rs +++ b/rmdir/rmdir.rs @@ -1,4 +1,4 @@ -#![crate_id(name="rmdir", vers="1.0.0", author="Arcterus")] +#![crate_name = "rmdir"] /* * This file is part of the uutils coreutils package. diff --git a/seq/seq.rs b/seq/seq.rs index 994db7b82..34ea1efd6 100644 --- a/seq/seq.rs +++ b/seq/seq.rs @@ -1,4 +1,4 @@ -#![crate_id(name="seq", vers="1.0.0", author="Daniel MacDougall")] +#![crate_name = "seq"] #![feature(macro_rules)] diff --git a/sleep/sleep.rs b/sleep/sleep.rs index 9ddfd7b0b..1a325a910 100644 --- a/sleep/sleep.rs +++ b/sleep/sleep.rs @@ -1,4 +1,4 @@ -#![crate_id(name="sleep", vers="1.0.0", author="Arcterus")] +#![crate_name = "sleep"] /* * This file is part of the uutils coreutils package. diff --git a/split/split.rs b/split/split.rs index 500ed267f..f40e23325 100644 --- a/split/split.rs +++ b/split/split.rs @@ -1,4 +1,4 @@ -#![crate_id(name="split", vers="1.0.0", author="Akira Hayakawa")] +#![crate_name = "split"] /* * This file is part of the uutils coreutils package. diff --git a/sum/sum.rs b/sum/sum.rs index 85beff844..c235944f5 100644 --- a/sum/sum.rs +++ b/sum/sum.rs @@ -1,4 +1,4 @@ -#![crate_id(name="sum", vers="1.0.0", author="T. Jameson Little")] +#![crate_name = "sum"] #![feature(macro_rules)] /* diff --git a/sync/sync.rs b/sync/sync.rs index 15b1ad809..e08fd2097 100644 --- a/sync/sync.rs +++ b/sync/sync.rs @@ -1,4 +1,4 @@ -#![crate_id = "uusync#1.0.0"] +#![crate_name = "uusync"] /* * This file is part of the uutils coreutils package. * diff --git a/tac/tac.rs b/tac/tac.rs index a0694b5b2..001bf1fea 100644 --- a/tac/tac.rs +++ b/tac/tac.rs @@ -1,4 +1,4 @@ -#![crate_id(name = "tac", vers = "1.0.0", author = "Arcterus")] +#![crate_name = "tac"] /* * This file is part of the uutils coreutils package. diff --git a/tail/tail.rs b/tail/tail.rs index 1d9f6873d..b0c5f0044 100644 --- a/tail/tail.rs +++ b/tail/tail.rs @@ -1,4 +1,4 @@ -#![crate_id(name="tail", vers="1.0.0", author="Morten Olsen Lysgaard")] +#![crate_name = "tail"] /* * This file is part of the uutils coreutils package. * diff --git a/tee/tee.rs b/tee/tee.rs index 88746d040..b63eb868b 100644 --- a/tee/tee.rs +++ b/tee/tee.rs @@ -1,4 +1,4 @@ -#![crate_id(name="tee", vers="1.0.0", author="Aleksander Bielawski")] +#![crate_name = "tee"] #![license="MIT"] #![feature(phase)] #![feature(macro_rules)] diff --git a/touch/touch.rs b/touch/touch.rs index cf4f7f8f0..b0b44ab52 100644 --- a/touch/touch.rs +++ b/touch/touch.rs @@ -1,4 +1,4 @@ -#![crate_id(name="touch", vers="1.0.0", author="Nick Platt")] +#![crate_name = "touch"] #![feature(macro_rules)] /* diff --git a/tr/tr.rs b/tr/tr.rs index 76ef85906..dbe783662 100644 --- a/tr/tr.rs +++ b/tr/tr.rs @@ -1,4 +1,4 @@ -#![crate_id(name="tr", vers="1.0.0", author="Michael Gehring")] +#![crate_name = "tr"] #![feature(macro_rules)] /* diff --git a/true/true.rs b/true/true.rs index c4bcc4b8e..598e185b6 100644 --- a/true/true.rs +++ b/true/true.rs @@ -1,4 +1,4 @@ -#![crate_id = "uutrue#1.0.0"] +#![crate_name= "uutrue"] /* * This file is part of the uutils coreutils package. diff --git a/truncate/truncate.rs b/truncate/truncate.rs index f448ffea5..1698b616f 100644 --- a/truncate/truncate.rs +++ b/truncate/truncate.rs @@ -1,4 +1,4 @@ -#![crate_id(name="truncate", vers="1.0.0", author="Arcterus")] +#![crate_name = "truncate"] /* * This file is part of the uutils coreutils package. diff --git a/tty/tty.rs b/tty/tty.rs index c664e471b..0147c790b 100644 --- a/tty/tty.rs +++ b/tty/tty.rs @@ -1,4 +1,4 @@ -#![crate_id(name="tty", version="1.0.0", author="Alan Andrade")] +#![crate_name = "tty"] /* diff --git a/uname/uname.rs b/uname/uname.rs index c8f4787e0..910de9a5d 100644 --- a/uname/uname.rs +++ b/uname/uname.rs @@ -1,4 +1,4 @@ -#![crate_id(name="uname", version="1.0.0", author="joaoxsouls")] +#![crate_name = "uname"] /* * This file is part of the uutils coreutils package. diff --git a/unlink/unlink.rs b/unlink/unlink.rs index 2f3847706..e358bf112 100644 --- a/unlink/unlink.rs +++ b/unlink/unlink.rs @@ -1,4 +1,4 @@ -#![crate_id(name="unlink", vers="1.0.0", author="zvms")] +#![crate_name = "unlink"] /* * This file is part of the uutils coreutils package. diff --git a/uptime/uptime.rs b/uptime/uptime.rs index e21f068a2..774d46e78 100644 --- a/uptime/uptime.rs +++ b/uptime/uptime.rs @@ -1,4 +1,4 @@ -#![crate_id(name="uptime", vers="1.0.0", author="José Neder")] +#![crate_name = "uptime"] /* * This file is part of the uutils coreutils package. diff --git a/users/users.rs b/users/users.rs index 69a4f2194..1d4ad6ce6 100644 --- a/users/users.rs +++ b/users/users.rs @@ -1,4 +1,4 @@ -#![crate_id(name="users", vers="1.0.0", author="KokaKiwi")] +#![crate_name = "users"] /* * This file is part of the uutils coreutils package. diff --git a/uutils/uutils.rs b/uutils/uutils.rs index 15011ae56..fdb6a97ae 100644 --- a/uutils/uutils.rs +++ b/uutils/uutils.rs @@ -1,4 +1,4 @@ -#![crate_id(name="uutils", vers="1.0.0", author="Michael Gehring")] +#![crate_name = "uutils"] /* * This file is part of the uutils coreutils package. diff --git a/wc/wc.rs b/wc/wc.rs index b9726cff2..a3f01ca3c 100644 --- a/wc/wc.rs +++ b/wc/wc.rs @@ -1,4 +1,4 @@ -#![crate_id(name="wc", vers="1.0.0", author="Boden Garman")] +#![crate_name = "wc"] /* * This file is part of the uutils coreutils package. diff --git a/whoami/whoami.rs b/whoami/whoami.rs index ea56b9da8..70104f718 100644 --- a/whoami/whoami.rs +++ b/whoami/whoami.rs @@ -1,4 +1,4 @@ -#![crate_id(name="whoami", version="1.0.0", author="KokaKiwi")] +#![crate_name = "whoami"] /* * This file is part of the uutils coreutils package. diff --git a/yes/yes.rs b/yes/yes.rs index 5b827abe7..fd1669fe3 100644 --- a/yes/yes.rs +++ b/yes/yes.rs @@ -1,4 +1,4 @@ -#![crate_id(name="yes", vers="1.0.0", author="Seldaek")] +#![crate_name = "yes"] /* * This file is part of the uutils coreutils package.