Skip to content

Commit 80ef0d7

Browse files
authored
Revert "Cargo.toml: Avoid huge diff generation at version bump (#11131)" (#11259)
This reverts commit 70ce572.
1 parent 53200b3 commit 80ef0d7

4 files changed

Lines changed: 139 additions & 118 deletions

File tree

Cargo.toml

Lines changed: 114 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -464,12 +464,12 @@ fluent-bundle = "0.16.0"
464464
unic-langid = "0.9.6"
465465
fluent-syntax = "0.12.0"
466466

467-
uucore = { package = "uucore", path = "src/uucore" }
468-
uucore_procs = { package = "uucore_procs", path = "src/uucore_procs" }
469-
uu_ls = { path = "src/uu/ls" }
470-
uu_base32 = { path = "src/uu/base32" }
471-
uu_checksum_common = { path = "src/uu/checksum_common" }
472-
uutests = { package = "uutests", path = "tests/uutests" }
467+
uucore = { version = "0.7.0", package = "uucore", path = "src/uucore" }
468+
uucore_procs = { version = "0.7.0", package = "uucore_procs", path = "src/uucore_procs" }
469+
uu_ls = { version = "0.7.0", path = "src/uu/ls" }
470+
uu_base32 = { version = "0.7.0", path = "src/uu/base32" }
471+
uu_checksum_common = { version = "0.7.0", path = "src/uu/checksum_common" }
472+
uutests = { version = "0.7.0", package = "uutests", path = "tests/uutests" }
473473

474474
[dependencies]
475475
clap_complete = { workspace = true, optional = true }
@@ -485,115 +485,115 @@ zip = { workspace = true, optional = true }
485485

486486

487487
# * uutils
488-
uu_test = { optional = true, package = "uu_test", path = "src/uu/test" }
488+
uu_test = { optional = true, version = "0.7.0", package = "uu_test", path = "src/uu/test" }
489489
#
490-
arch = { optional = true, package = "uu_arch", path = "src/uu/arch" }
491-
base32 = { optional = true, package = "uu_base32", path = "src/uu/base32" }
492-
base64 = { optional = true, package = "uu_base64", path = "src/uu/base64" }
493-
basename = { optional = true, package = "uu_basename", path = "src/uu/basename" }
494-
basenc = { optional = true, package = "uu_basenc", path = "src/uu/basenc" }
495-
cat = { optional = true, package = "uu_cat", path = "src/uu/cat" }
496-
chcon = { optional = true, package = "uu_chcon", path = "src/uu/chcon" }
497-
chgrp = { optional = true, package = "uu_chgrp", path = "src/uu/chgrp" }
498-
chmod = { optional = true, package = "uu_chmod", path = "src/uu/chmod" }
499-
chown = { optional = true, package = "uu_chown", path = "src/uu/chown" }
500-
chroot = { optional = true, package = "uu_chroot", path = "src/uu/chroot" }
501-
cksum = { optional = true, package = "uu_cksum", path = "src/uu/cksum" }
502-
b2sum = { optional = true, package = "uu_b2sum", path = "src/uu/b2sum" }
503-
md5sum = { optional = true, package = "uu_md5sum", path = "src/uu/md5sum" }
504-
sha1sum = { optional = true, package = "uu_sha1sum", path = "src/uu/sha1sum" }
505-
sha224sum = { optional = true, package = "uu_sha224sum", path = "src/uu/sha224sum" }
506-
sha256sum = { optional = true, package = "uu_sha256sum", path = "src/uu/sha256sum" }
507-
sha384sum = { optional = true, package = "uu_sha384sum", path = "src/uu/sha384sum" }
508-
sha512sum = { optional = true, package = "uu_sha512sum", path = "src/uu/sha512sum" }
509-
comm = { optional = true, package = "uu_comm", path = "src/uu/comm" }
510-
cp = { optional = true, package = "uu_cp", path = "src/uu/cp" }
511-
csplit = { optional = true, package = "uu_csplit", path = "src/uu/csplit" }
512-
cut = { optional = true, package = "uu_cut", path = "src/uu/cut" }
513-
date = { optional = true, package = "uu_date", path = "src/uu/date" }
514-
dd = { optional = true, package = "uu_dd", path = "src/uu/dd" }
515-
df = { optional = true, package = "uu_df", path = "src/uu/df" }
516-
dir = { optional = true, package = "uu_dir", path = "src/uu/dir" }
517-
dircolors = { optional = true, package = "uu_dircolors", path = "src/uu/dircolors" }
518-
dirname = { optional = true, package = "uu_dirname", path = "src/uu/dirname" }
519-
du = { optional = true, package = "uu_du", path = "src/uu/du" }
520-
echo = { optional = true, package = "uu_echo", path = "src/uu/echo" }
521-
env = { optional = true, package = "uu_env", path = "src/uu/env" }
522-
expand = { optional = true, package = "uu_expand", path = "src/uu/expand" }
523-
expr = { optional = true, package = "uu_expr", path = "src/uu/expr" }
524-
factor = { optional = true, package = "uu_factor", path = "src/uu/factor" }
525-
false = { optional = true, package = "uu_false", path = "src/uu/false" }
526-
fmt = { optional = true, package = "uu_fmt", path = "src/uu/fmt" }
527-
fold = { optional = true, package = "uu_fold", path = "src/uu/fold" }
528-
groups = { optional = true, package = "uu_groups", path = "src/uu/groups" }
529-
head = { optional = true, package = "uu_head", path = "src/uu/head" }
530-
hostid = { optional = true, package = "uu_hostid", path = "src/uu/hostid" }
531-
hostname = { optional = true, package = "uu_hostname", path = "src/uu/hostname" }
532-
id = { optional = true, package = "uu_id", path = "src/uu/id" }
533-
install = { optional = true, package = "uu_install", path = "src/uu/install" }
534-
join = { optional = true, package = "uu_join", path = "src/uu/join" }
535-
kill = { optional = true, package = "uu_kill", path = "src/uu/kill" }
536-
link = { optional = true, package = "uu_link", path = "src/uu/link" }
537-
ln = { optional = true, package = "uu_ln", path = "src/uu/ln" }
538-
ls = { optional = true, package = "uu_ls", path = "src/uu/ls" }
539-
logname = { optional = true, package = "uu_logname", path = "src/uu/logname" }
540-
mkdir = { optional = true, package = "uu_mkdir", path = "src/uu/mkdir" }
541-
mkfifo = { optional = true, package = "uu_mkfifo", path = "src/uu/mkfifo" }
542-
mknod = { optional = true, package = "uu_mknod", path = "src/uu/mknod" }
543-
mktemp = { optional = true, package = "uu_mktemp", path = "src/uu/mktemp" }
544-
more = { optional = true, package = "uu_more", path = "src/uu/more" }
545-
mv = { optional = true, package = "uu_mv", path = "src/uu/mv" }
546-
nice = { optional = true, package = "uu_nice", path = "src/uu/nice" }
547-
nl = { optional = true, package = "uu_nl", path = "src/uu/nl" }
548-
nohup = { optional = true, package = "uu_nohup", path = "src/uu/nohup" }
549-
nproc = { optional = true, package = "uu_nproc", path = "src/uu/nproc" }
550-
numfmt = { optional = true, package = "uu_numfmt", path = "src/uu/numfmt" }
551-
od = { optional = true, package = "uu_od", path = "src/uu/od" }
552-
paste = { optional = true, package = "uu_paste", path = "src/uu/paste" }
553-
pathchk = { optional = true, package = "uu_pathchk", path = "src/uu/pathchk" }
554-
pinky = { optional = true, package = "uu_pinky", path = "src/uu/pinky" }
555-
pr = { optional = true, package = "uu_pr", path = "src/uu/pr" }
556-
printenv = { optional = true, package = "uu_printenv", path = "src/uu/printenv" }
557-
printf = { optional = true, package = "uu_printf", path = "src/uu/printf" }
558-
ptx = { optional = true, package = "uu_ptx", path = "src/uu/ptx" }
559-
pwd = { optional = true, package = "uu_pwd", path = "src/uu/pwd" }
560-
readlink = { optional = true, package = "uu_readlink", path = "src/uu/readlink" }
561-
realpath = { optional = true, package = "uu_realpath", path = "src/uu/realpath" }
562-
rm = { optional = true, package = "uu_rm", path = "src/uu/rm" }
563-
rmdir = { optional = true, package = "uu_rmdir", path = "src/uu/rmdir" }
564-
runcon = { optional = true, package = "uu_runcon", path = "src/uu/runcon" }
565-
seq = { optional = true, package = "uu_seq", path = "src/uu/seq" }
566-
shred = { optional = true, package = "uu_shred", path = "src/uu/shred" }
567-
shuf = { optional = true, package = "uu_shuf", path = "src/uu/shuf" }
568-
sleep = { optional = true, package = "uu_sleep", path = "src/uu/sleep" }
569-
sort = { optional = true, package = "uu_sort", path = "src/uu/sort" }
570-
split = { optional = true, package = "uu_split", path = "src/uu/split" }
571-
stat = { optional = true, package = "uu_stat", path = "src/uu/stat" }
572-
stdbuf = { optional = true, package = "uu_stdbuf", path = "src/uu/stdbuf" }
573-
stty = { optional = true, package = "uu_stty", path = "src/uu/stty" }
574-
sum = { optional = true, package = "uu_sum", path = "src/uu/sum" }
575-
sync = { optional = true, package = "uu_sync", path = "src/uu/sync" }
576-
tac = { optional = true, package = "uu_tac", path = "src/uu/tac" }
577-
tail = { optional = true, package = "uu_tail", path = "src/uu/tail" }
578-
tee = { optional = true, package = "uu_tee", path = "src/uu/tee" }
579-
timeout = { optional = true, package = "uu_timeout", path = "src/uu/timeout" }
580-
touch = { optional = true, package = "uu_touch", path = "src/uu/touch" }
581-
tr = { optional = true, package = "uu_tr", path = "src/uu/tr" }
582-
true = { optional = true, package = "uu_true", path = "src/uu/true" }
583-
truncate = { optional = true, package = "uu_truncate", path = "src/uu/truncate" }
584-
tsort = { optional = true, package = "uu_tsort", path = "src/uu/tsort" }
585-
tty = { optional = true, package = "uu_tty", path = "src/uu/tty" }
586-
uname = { optional = true, package = "uu_uname", path = "src/uu/uname" }
587-
unexpand = { optional = true, package = "uu_unexpand", path = "src/uu/unexpand" }
588-
uniq = { optional = true, package = "uu_uniq", path = "src/uu/uniq" }
589-
unlink = { optional = true, package = "uu_unlink", path = "src/uu/unlink" }
590-
uptime = { optional = true, package = "uu_uptime", path = "src/uu/uptime" }
591-
users = { optional = true, package = "uu_users", path = "src/uu/users" }
592-
vdir = { optional = true, package = "uu_vdir", path = "src/uu/vdir" }
593-
wc = { optional = true, package = "uu_wc", path = "src/uu/wc" }
594-
who = { optional = true, package = "uu_who", path = "src/uu/who" }
595-
whoami = { optional = true, package = "uu_whoami", path = "src/uu/whoami" }
596-
yes = { optional = true, package = "uu_yes", path = "src/uu/yes" }
490+
arch = { optional = true, version = "0.7.0", package = "uu_arch", path = "src/uu/arch" }
491+
base32 = { optional = true, version = "0.7.0", package = "uu_base32", path = "src/uu/base32" }
492+
base64 = { optional = true, version = "0.7.0", package = "uu_base64", path = "src/uu/base64" }
493+
basename = { optional = true, version = "0.7.0", package = "uu_basename", path = "src/uu/basename" }
494+
basenc = { optional = true, version = "0.7.0", package = "uu_basenc", path = "src/uu/basenc" }
495+
cat = { optional = true, version = "0.7.0", package = "uu_cat", path = "src/uu/cat" }
496+
chcon = { optional = true, version = "0.7.0", package = "uu_chcon", path = "src/uu/chcon" }
497+
chgrp = { optional = true, version = "0.7.0", package = "uu_chgrp", path = "src/uu/chgrp" }
498+
chmod = { optional = true, version = "0.7.0", package = "uu_chmod", path = "src/uu/chmod" }
499+
chown = { optional = true, version = "0.7.0", package = "uu_chown", path = "src/uu/chown" }
500+
chroot = { optional = true, version = "0.7.0", package = "uu_chroot", path = "src/uu/chroot" }
501+
cksum = { optional = true, version = "0.7.0", package = "uu_cksum", path = "src/uu/cksum" }
502+
b2sum = { optional = true, version = "0.7.0", package = "uu_b2sum", path = "src/uu/b2sum" }
503+
md5sum = { optional = true, version = "0.7.0", package = "uu_md5sum", path = "src/uu/md5sum" }
504+
sha1sum = { optional = true, version = "0.7.0", package = "uu_sha1sum", path = "src/uu/sha1sum" }
505+
sha224sum = { optional = true, version = "0.7.0", package = "uu_sha224sum", path = "src/uu/sha224sum" }
506+
sha256sum = { optional = true, version = "0.7.0", package = "uu_sha256sum", path = "src/uu/sha256sum" }
507+
sha384sum = { optional = true, version = "0.7.0", package = "uu_sha384sum", path = "src/uu/sha384sum" }
508+
sha512sum = { optional = true, version = "0.7.0", package = "uu_sha512sum", path = "src/uu/sha512sum" }
509+
comm = { optional = true, version = "0.7.0", package = "uu_comm", path = "src/uu/comm" }
510+
cp = { optional = true, version = "0.7.0", package = "uu_cp", path = "src/uu/cp" }
511+
csplit = { optional = true, version = "0.7.0", package = "uu_csplit", path = "src/uu/csplit" }
512+
cut = { optional = true, version = "0.7.0", package = "uu_cut", path = "src/uu/cut" }
513+
date = { optional = true, version = "0.7.0", package = "uu_date", path = "src/uu/date" }
514+
dd = { optional = true, version = "0.7.0", package = "uu_dd", path = "src/uu/dd" }
515+
df = { optional = true, version = "0.7.0", package = "uu_df", path = "src/uu/df" }
516+
dir = { optional = true, version = "0.7.0", package = "uu_dir", path = "src/uu/dir" }
517+
dircolors = { optional = true, version = "0.7.0", package = "uu_dircolors", path = "src/uu/dircolors" }
518+
dirname = { optional = true, version = "0.7.0", package = "uu_dirname", path = "src/uu/dirname" }
519+
du = { optional = true, version = "0.7.0", package = "uu_du", path = "src/uu/du" }
520+
echo = { optional = true, version = "0.7.0", package = "uu_echo", path = "src/uu/echo" }
521+
env = { optional = true, version = "0.7.0", package = "uu_env", path = "src/uu/env" }
522+
expand = { optional = true, version = "0.7.0", package = "uu_expand", path = "src/uu/expand" }
523+
expr = { optional = true, version = "0.7.0", package = "uu_expr", path = "src/uu/expr" }
524+
factor = { optional = true, version = "0.7.0", package = "uu_factor", path = "src/uu/factor" }
525+
false = { optional = true, version = "0.7.0", package = "uu_false", path = "src/uu/false" }
526+
fmt = { optional = true, version = "0.7.0", package = "uu_fmt", path = "src/uu/fmt" }
527+
fold = { optional = true, version = "0.7.0", package = "uu_fold", path = "src/uu/fold" }
528+
groups = { optional = true, version = "0.7.0", package = "uu_groups", path = "src/uu/groups" }
529+
head = { optional = true, version = "0.7.0", package = "uu_head", path = "src/uu/head" }
530+
hostid = { optional = true, version = "0.7.0", package = "uu_hostid", path = "src/uu/hostid" }
531+
hostname = { optional = true, version = "0.7.0", package = "uu_hostname", path = "src/uu/hostname" }
532+
id = { optional = true, version = "0.7.0", package = "uu_id", path = "src/uu/id" }
533+
install = { optional = true, version = "0.7.0", package = "uu_install", path = "src/uu/install" }
534+
join = { optional = true, version = "0.7.0", package = "uu_join", path = "src/uu/join" }
535+
kill = { optional = true, version = "0.7.0", package = "uu_kill", path = "src/uu/kill" }
536+
link = { optional = true, version = "0.7.0", package = "uu_link", path = "src/uu/link" }
537+
ln = { optional = true, version = "0.7.0", package = "uu_ln", path = "src/uu/ln" }
538+
ls = { optional = true, version = "0.7.0", package = "uu_ls", path = "src/uu/ls" }
539+
logname = { optional = true, version = "0.7.0", package = "uu_logname", path = "src/uu/logname" }
540+
mkdir = { optional = true, version = "0.7.0", package = "uu_mkdir", path = "src/uu/mkdir" }
541+
mkfifo = { optional = true, version = "0.7.0", package = "uu_mkfifo", path = "src/uu/mkfifo" }
542+
mknod = { optional = true, version = "0.7.0", package = "uu_mknod", path = "src/uu/mknod" }
543+
mktemp = { optional = true, version = "0.7.0", package = "uu_mktemp", path = "src/uu/mktemp" }
544+
more = { optional = true, version = "0.7.0", package = "uu_more", path = "src/uu/more" }
545+
mv = { optional = true, version = "0.7.0", package = "uu_mv", path = "src/uu/mv" }
546+
nice = { optional = true, version = "0.7.0", package = "uu_nice", path = "src/uu/nice" }
547+
nl = { optional = true, version = "0.7.0", package = "uu_nl", path = "src/uu/nl" }
548+
nohup = { optional = true, version = "0.7.0", package = "uu_nohup", path = "src/uu/nohup" }
549+
nproc = { optional = true, version = "0.7.0", package = "uu_nproc", path = "src/uu/nproc" }
550+
numfmt = { optional = true, version = "0.7.0", package = "uu_numfmt", path = "src/uu/numfmt" }
551+
od = { optional = true, version = "0.7.0", package = "uu_od", path = "src/uu/od" }
552+
paste = { optional = true, version = "0.7.0", package = "uu_paste", path = "src/uu/paste" }
553+
pathchk = { optional = true, version = "0.7.0", package = "uu_pathchk", path = "src/uu/pathchk" }
554+
pinky = { optional = true, version = "0.7.0", package = "uu_pinky", path = "src/uu/pinky" }
555+
pr = { optional = true, version = "0.7.0", package = "uu_pr", path = "src/uu/pr" }
556+
printenv = { optional = true, version = "0.7.0", package = "uu_printenv", path = "src/uu/printenv" }
557+
printf = { optional = true, version = "0.7.0", package = "uu_printf", path = "src/uu/printf" }
558+
ptx = { optional = true, version = "0.7.0", package = "uu_ptx", path = "src/uu/ptx" }
559+
pwd = { optional = true, version = "0.7.0", package = "uu_pwd", path = "src/uu/pwd" }
560+
readlink = { optional = true, version = "0.7.0", package = "uu_readlink", path = "src/uu/readlink" }
561+
realpath = { optional = true, version = "0.7.0", package = "uu_realpath", path = "src/uu/realpath" }
562+
rm = { optional = true, version = "0.7.0", package = "uu_rm", path = "src/uu/rm" }
563+
rmdir = { optional = true, version = "0.7.0", package = "uu_rmdir", path = "src/uu/rmdir" }
564+
runcon = { optional = true, version = "0.7.0", package = "uu_runcon", path = "src/uu/runcon" }
565+
seq = { optional = true, version = "0.7.0", package = "uu_seq", path = "src/uu/seq" }
566+
shred = { optional = true, version = "0.7.0", package = "uu_shred", path = "src/uu/shred" }
567+
shuf = { optional = true, version = "0.7.0", package = "uu_shuf", path = "src/uu/shuf" }
568+
sleep = { optional = true, version = "0.7.0", package = "uu_sleep", path = "src/uu/sleep" }
569+
sort = { optional = true, version = "0.7.0", package = "uu_sort", path = "src/uu/sort" }
570+
split = { optional = true, version = "0.7.0", package = "uu_split", path = "src/uu/split" }
571+
stat = { optional = true, version = "0.7.0", package = "uu_stat", path = "src/uu/stat" }
572+
stdbuf = { optional = true, version = "0.7.0", package = "uu_stdbuf", path = "src/uu/stdbuf" }
573+
stty = { optional = true, version = "0.7.0", package = "uu_stty", path = "src/uu/stty" }
574+
sum = { optional = true, version = "0.7.0", package = "uu_sum", path = "src/uu/sum" }
575+
sync = { optional = true, version = "0.7.0", package = "uu_sync", path = "src/uu/sync" }
576+
tac = { optional = true, version = "0.7.0", package = "uu_tac", path = "src/uu/tac" }
577+
tail = { optional = true, version = "0.7.0", package = "uu_tail", path = "src/uu/tail" }
578+
tee = { optional = true, version = "0.7.0", package = "uu_tee", path = "src/uu/tee" }
579+
timeout = { optional = true, version = "0.7.0", package = "uu_timeout", path = "src/uu/timeout" }
580+
touch = { optional = true, version = "0.7.0", package = "uu_touch", path = "src/uu/touch" }
581+
tr = { optional = true, version = "0.7.0", package = "uu_tr", path = "src/uu/tr" }
582+
true = { optional = true, version = "0.7.0", package = "uu_true", path = "src/uu/true" }
583+
truncate = { optional = true, version = "0.7.0", package = "uu_truncate", path = "src/uu/truncate" }
584+
tsort = { optional = true, version = "0.7.0", package = "uu_tsort", path = "src/uu/tsort" }
585+
tty = { optional = true, version = "0.7.0", package = "uu_tty", path = "src/uu/tty" }
586+
uname = { optional = true, version = "0.7.0", package = "uu_uname", path = "src/uu/uname" }
587+
unexpand = { optional = true, version = "0.7.0", package = "uu_unexpand", path = "src/uu/unexpand" }
588+
uniq = { optional = true, version = "0.7.0", package = "uu_uniq", path = "src/uu/uniq" }
589+
unlink = { optional = true, version = "0.7.0", package = "uu_unlink", path = "src/uu/unlink" }
590+
uptime = { optional = true, version = "0.7.0", package = "uu_uptime", path = "src/uu/uptime" }
591+
users = { optional = true, version = "0.7.0", package = "uu_users", path = "src/uu/users" }
592+
vdir = { optional = true, version = "0.7.0", package = "uu_vdir", path = "src/uu/vdir" }
593+
wc = { optional = true, version = "0.7.0", package = "uu_wc", path = "src/uu/wc" }
594+
who = { optional = true, version = "0.7.0", package = "uu_who", path = "src/uu/who" }
595+
whoami = { optional = true, version = "0.7.0", package = "uu_whoami", path = "src/uu/whoami" }
596+
yes = { optional = true, version = "0.7.0", package = "uu_yes", path = "src/uu/yes" }
597597

598598
# this breaks clippy linting with: "tests/by-util/test_factor_benches.rs: No such file or directory (os error 2)"
599599
# factor_benches = { optional = true, version = "0.0.0", package = "uu_factor_benches", path = "tests/benches/factor" }

fuzz/uufuzz/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ console = "0.16.0"
1313
libc = "0.2.153"
1414
rand = { version = "0.9.0", features = ["small_rng"] }
1515
similar = "2.5.0"
16-
uucore = { path = "../../src/uucore", features = ["parser"] }
16+
uucore = { version = "0.7.0", path = "../../src/uucore", features = ["parser"] }
1717
tempfile = "3.15.0"

src/uu/stdbuf/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ path = "src/stdbuf.rs"
2121

2222
[dependencies]
2323
clap = { workspace = true }
24-
libstdbuf = { package = "uu_stdbuf_libstdbuf", path = "src/libstdbuf" }
24+
libstdbuf = { package = "uu_stdbuf_libstdbuf", version = "0.7.0", path = "src/libstdbuf" }
2525
tempfile = { workspace = true }
2626
uucore = { workspace = true, features = ["parser-size"] }
2727
thiserror = { workspace = true }

0 commit comments

Comments
 (0)