From 8046980806841a10571a497bcdc8dbf1c3c08c7a Mon Sep 17 00:00:00 2001 From: Benjamin Sago Date: Sat, 10 Oct 2020 02:14:35 +0100 Subject: [PATCH] Mass version upgrade MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This upgrades the versions of everything, including upgrading almost all outdated dependencies. • number_prefix had some backwards-incompatible changes. It now feels more Rustful, and spells "Mebi" correctly. • term_grid stopped working when I upgraded it, worryingly, so I reverted it back. --- Cargo.lock | 177 +++++++++++++++++++------------------- Cargo.toml | 28 +++--- Justfile | 6 ++ src/output/render/size.rs | 10 +-- src/style/colours.rs | 4 +- 5 files changed, 115 insertions(+), 110 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d97cb2..c1db77b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,48 +2,51 @@ # It is not intended for manual editing. [[package]] name = "ansi_term" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaa72766c3585a1f812a3387a7e2c6cab780f899c2f43ff6ea06c8d071fcbb36" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.8", + "winapi", ] [[package]] name = "autocfg" -version = "0.1.5" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22130e92352b948e7e82a49cdb0aa94f2211761117f29e052dd397c1ac33542b" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "bitflags" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "byteorder" -version = "1.3.2" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" [[package]] name = "cc" -version = "1.0.37" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d" +checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" +dependencies = [ + "jobserver", +] [[package]] name = "cfg-if" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "datetime" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ce78cadfc77450e21ff8bd11ca6f8669949b3b0bd8af92f9c1ee4fb453db7b" +checksum = "d0fcb4df22ae812fa2f6d5e3b577247584cc67fce06ad0779168d1dd41cbcce3" dependencies = [ "iso8601", "libc", @@ -51,7 +54,7 @@ dependencies = [ "num-traits", "pad", "redox_syscall", - "winapi 0.3.8", + "winapi", ] [[package]] @@ -79,9 +82,9 @@ dependencies = [ [[package]] name = "git2" -version = "0.9.1" +version = "0.13.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924b2e7d2986e625dcad89e8a429a7b3adee3c3d71e585f4a66c4f7e78715e31" +checksum = "1e094214efbc7fdbbdee952147e493b00e99a4e52817492277e98967ae918165" dependencies = [ "bitflags", "libc", @@ -98,10 +101,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] -name = "idna" -version = "0.1.5" +name = "hermit-abi" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" +dependencies = [ + "libc", +] + +[[package]] +name = "idna" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" dependencies = [ "matches", "unicode-bidi", @@ -118,32 +130,31 @@ dependencies = [ ] [[package]] -name = "kernel32-sys" -version = "0.2.2" +name = "jobserver" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "libc", ] [[package]] name = "lazy_static" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.60" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d44e80633f007889c7eff624b709ab43c92d708caad982295768a7b13ca3b5eb" +checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743" [[package]] name = "libgit2-sys" -version = "0.8.1" +version = "0.12.13+1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941a41e23f77323b8c9d2ee118aec9ee39dfc176078c18b4757d3bad049d9ff7" +checksum = "069eea34f76ec15f2822ccf78fe0cdb8c9016764d0a12865278585a74dbdeae5" dependencies = [ "cc", "libc", @@ -153,9 +164,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.0.25" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" +checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655" dependencies = [ "cc", "libc", @@ -174,9 +185,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.7" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c275b6ad54070ac2d665eef9197db647b32239c9d244bfb6f041a766d00da5b3" +checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ "cfg-if", ] @@ -189,9 +200,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] name = "memchr" -version = "2.2.1" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" +checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" [[package]] name = "natord" @@ -211,42 +222,43 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.8" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" +checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.10.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" dependencies = [ + "hermit-abi", "libc", ] [[package]] name = "number_prefix" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "openssl-src" -version = "111.3.0+1.1.1c" +version = "111.11.0+1.1.1h" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ed5f31d294bdf5f7a4ba0a206c2754b0f60e9a63b7e3076babc5317873c797" +checksum = "380fe324132bea01f45239fadfec9343adb044615f29930d039bec1ae7b9fa5b" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.48" +version = "0.9.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5ba300217253bcc5dc68bed23d782affa45000193866e025329aa8a7a9f05b8" +checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" dependencies = [ "autocfg", "cc", @@ -258,30 +270,30 @@ dependencies = [ [[package]] name = "pad" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9b8de33465981073e32e1d75bb89ade49062bb853e7c97ec2c13439095563a" +checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3" dependencies = [ "unicode-width", ] [[package]] name = "percent-encoding" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pkg-config" -version = "0.3.14" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" +checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" [[package]] name = "redox_syscall" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "scoped_threadpool" @@ -289,12 +301,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" -[[package]] -name = "smallvec" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" - [[package]] name = "term_grid" version = "0.1.7" @@ -306,15 +312,20 @@ dependencies = [ [[package]] name = "term_size" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327" +checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" dependencies = [ - "kernel32-sys", "libc", - "winapi 0.2.8", + "winapi", ] +[[package]] +name = "tinyvec" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" + [[package]] name = "unicode-bidi" version = "0.3.4" @@ -326,24 +337,24 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.8" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" +checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" dependencies = [ - "smallvec", + "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] name = "url" -version = "1.7.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" dependencies = [ "idna", "matches", @@ -362,9 +373,9 @@ dependencies = [ [[package]] name = "vcpkg" -version = "0.2.7" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" +checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" [[package]] name = "version_check" @@ -374,26 +385,14 @@ checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" [[package]] name = "winapi" -version = "0.2.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ "winapi-i686-pc-windows-gnu", "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" diff --git a/Cargo.toml b/Cargo.toml index fcb94d5..b36a776 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,25 +22,25 @@ name = "exa" [dependencies] -ansi_term = "0.12.0" +ansi_term = "0.12" datetime = "0.5" -glob = "0.3.0" -lazy_static = "1.3.0" -libc = "0.2.51" -locale = "0.2.2" -log = "0.4.6" -natord = "1.0.9" -num_cpus = "1.10.0" -number_prefix = "0.3.0" -scoped_threadpool = "0.1.9" -term_grid = "0.1.7" -term_size = "0.3.1" -unicode-width = "0.1.5" +glob = "0.3" +lazy_static = "1.3" +libc = "0.2" +locale = "0.2" +log = "0.4" +natord = "1.0" +num_cpus = "1.10" +number_prefix = "0.4" +scoped_threadpool = "0.1" +term_grid = "0.1" +term_size = "0.3" +unicode-width = "0.1" users = "0.11" zoneinfo_compiled = "0.5" [dependencies.git2] -version = "0.9.1" +version = "0.13" optional = true default-features = false diff --git a/Justfile b/Justfile index d892165..b0df560 100644 --- a/Justfile +++ b/Justfile @@ -28,6 +28,12 @@ test-features: cargo hack test --feature-powerset -- --quiet +# updates dependency versions, and checks for outdated ones +@update: + cargo update + cargo outdated + + # prints versions of the necessary build tools @versions: rustc --version diff --git a/src/output/render/size.rs b/src/output/render/size.rs index b46caab..d44ecd3 100644 --- a/src/output/render/size.rs +++ b/src/output/render/size.rs @@ -9,7 +9,7 @@ use crate::output::table::SizeFormat; impl f::Size { pub fn render(&self, colours: &C, size_format: SizeFormat, numerics: &NumericLocale) -> TextCell { - use number_prefix::{Prefixed, Standalone, NumberPrefix, PrefixNames}; + use number_prefix::NumberPrefix; let size = match *self { f::Size::Some(s) => s, @@ -23,8 +23,8 @@ impl f::Size { SizeFormat::JustBytes => { // Use the binary prefix to select a style. let prefix = match NumberPrefix::binary(size as f64) { - Standalone(_) => None, - Prefixed(p, _) => Some(p), + NumberPrefix::Standalone(_) => None, + NumberPrefix::Prefixed(p, _) => Some(p), }; // But format the number directly using the locale. let string = numerics.format_int(size); @@ -33,8 +33,8 @@ impl f::Size { }; let (prefix, n) = match result { - Standalone(b) => return TextCell::paint(colours.size(None), b.to_string()), - Prefixed(p, n) => (p, n) + NumberPrefix::Standalone(b) => return TextCell::paint(colours.size(None), b.to_string()), + NumberPrefix::Prefixed(p, n) => (p, n) }; let symbol = prefix.symbol(); diff --git a/src/style/colours.rs b/src/style/colours.rs index e8012a9..debda16 100644 --- a/src/style/colours.rs +++ b/src/style/colours.rs @@ -434,7 +434,7 @@ impl render::SizeColours for Colours { match prefix { None => self.size.number_byte, Some(Kilo) | Some(Kibi) => self.size.number_kilo, - Some(Mega) | Some(Mibi) => self.size.number_mega, + Some(Mega) | Some(Mebi) => self.size.number_mega, Some(Giga) | Some(Gibi) => self.size.number_giga, Some(_) => self.size.number_huge, } @@ -445,7 +445,7 @@ impl render::SizeColours for Colours { match prefix { None => self.size.unit_byte, Some(Kilo) | Some(Kibi) => self.size.unit_kilo, - Some(Mega) | Some(Mibi) => self.size.unit_mega, + Some(Mega) | Some(Mebi) => self.size.unit_mega, Some(Giga) | Some(Gibi) => self.size.unit_giga, Some(_) => self.size.unit_huge, }