From 1143b1ab6c97ea36d8068d46db9e7cad781c3340 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Tue, 30 Nov 2021 09:14:21 -0800 Subject: [PATCH] cargo: run `cargo upgrade` For no particular reason other than to stay up to date. --- Cargo.lock | 123 +++++++++++++++++++------------------------------ Cargo.toml | 36 +++++++-------- lib/Cargo.toml | 34 +++++++------- 3 files changed, 82 insertions(+), 111 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 749106616..924346a64 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "ansi_term" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ "winapi", ] @@ -62,9 +62,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "blake2" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a5720225ef5daecf08657f23791354e1685a8c91a4c60c7f3d3b2892f978f4" +checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" dependencies = [ "crypto-mac", "digest 0.9.0", @@ -124,9 +124,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "cast" @@ -167,9 +167,9 @@ dependencies = [ [[package]] name = "clap" -version = "2.33.3" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", @@ -182,9 +182,9 @@ dependencies = [ [[package]] name = "config" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" +checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369" dependencies = [ "lazy_static", "nom", @@ -198,16 +198,16 @@ dependencies = [ [[package]] name = "criterion" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" +checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10" dependencies = [ "atty", "cast", "clap", "criterion-plot", "csv", - "itertools 0.10.1", + "itertools", "lazy_static", "num-traits 0.2.14", "oorandom", @@ -224,12 +224,12 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" +checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57" dependencies = [ "cast", - "itertools 0.9.0", + "itertools", ] [[package]] @@ -328,9 +328,9 @@ dependencies = [ [[package]] name = "dirs" -version = "3.0.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ "dirs-sys", ] @@ -400,9 +400,9 @@ dependencies = [ [[package]] name = "git2" -version = "0.13.20" +version = "0.13.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9831e983241f8c5591ed53f17d874833e2fa82cac2625f3888c50cbfe136cba" +checksum = "f29229cc1b24c0e6062f6e742aa3e256492a5323365e5ed3413599f8a5eff7d6" dependencies = [ "bitflags", "libc", @@ -463,15 +463,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.10.1" @@ -519,7 +510,7 @@ dependencies = [ "git2", "hex", "indoc", - "itertools 0.10.1", + "itertools", "jujutsu-lib", "maplit", "pest", @@ -550,7 +541,7 @@ dependencies = [ "dirs", "git2", "hex", - "itertools 0.10.1", + "itertools", "maplit", "num_cpus", "pest", @@ -595,9 +586,9 @@ checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" [[package]] name = "libgit2-sys" -version = "0.12.21+1.1.0" +version = "0.12.26+1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86271bacd72b2b9e854c3dcfb82efd538f15f870e4c11af66900effb462f6825" +checksum = "19e1c899248e606fbfe68dcb31d8b0176ebab833b103824af31bddf4b7457494" dependencies = [ "cc", "libc", @@ -633,16 +624,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "linked-hash-map" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd" -dependencies = [ - "serde 0.8.23", - "serde_test", -] - [[package]] name = "linked-hash-map" version = "0.5.4" @@ -871,27 +852,27 @@ dependencies = [ [[package]] name = "protobuf" -version = "2.24.1" +version = "2.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db50e77ae196458ccd3dc58a31ea1a90b0698ab1b7928d89f644c25d72070267" +checksum = "47c327e191621a2158159df97cdbc2e7074bb4e940275e35abf38eb3d2595754" dependencies = [ "bytes", ] [[package]] name = "protobuf-codegen" -version = "2.24.1" +version = "2.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09321cef9bee9ddd36884f97b7f7cc92a586cdc74205c4b3aeba65b5fc9c6f90" +checksum = "3df8c98c08bd4d6653c2dbae00bd68c1d1d82a360265a5b0bbc73d48c63cb853" dependencies = [ "protobuf", ] [[package]] name = "protobuf-codegen-pure" -version = "2.24.1" +version = "2.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1afb68a6d768571da3db86ce55f0f62966e0fc25eaf96acd070ea548a91b0d23" +checksum = "394a73e2a819405364df8d30042c0f1174737a763e0170497ec9d36f8a2ea8f7" dependencies = [ "protobuf", "protobuf-codegen", @@ -1095,7 +1076,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8" dependencies = [ "lazy_static", - "linked-hash-map 0.3.0", "num-traits 0.1.43", "regex", "serde 0.8.23", @@ -1124,24 +1104,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.64" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527" dependencies = [ "itoa", "ryu", "serde 1.0.126", ] -[[package]] -name = "serde_test" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5" -dependencies = [ - "serde 0.8.23", -] - [[package]] name = "sha-1" version = "0.8.2" @@ -1205,9 +1176,9 @@ dependencies = [ [[package]] name = "test-case" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b114ece25254e97bf48dd4bfc2a12bad0647adacfe4cae1247a9ca6ad302cec" +checksum = "c7cad0a06f9a61e94355aa3b3dc92d85ab9c83406722b1ca5e918d4297c12c23" dependencies = [ "cfg-if", "proc-macro2", @@ -1238,18 +1209,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.25" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.25" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", @@ -1480,9 +1451,9 @@ dependencies = [ [[package]] name = "whoami" -version = "1.1.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abacf325c958dfeaf1046931d37f2a901b6dfe0968ee965a29e94c6766b2af6" +checksum = "524b58fa5a20a2fb3014dd6358b70e6579692a56ef6fce928834e488f42f65e8" dependencies = [ "wasm-bindgen", "web-sys", @@ -1525,23 +1496,23 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" dependencies = [ - "linked-hash-map 0.5.4", + "linked-hash-map", ] [[package]] name = "zstd" -version = "0.6.1+zstd.1.4.9" +version = "0.9.0+zstd.1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de55e77f798f205d8561b8fe2ef57abfb6e0ff2abe7fd3c089e119cdb5631a3" +checksum = "07749a5dc2cb6b36661290245e350f15ec3bbb304e493db54a1d354480522ccd" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "3.0.1+zstd.1.4.9" +version = "4.1.1+zstd.1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1387cabcd938127b30ce78c4bf00b30387dddf704e3f0881dbc4ff62b5566f8c" +checksum = "c91c90f2c593b003603e5e0493c837088df4469da25aafff8bce42ba48caf079" dependencies = [ "libc", "zstd-sys", @@ -1549,9 +1520,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.4.20+zstd.1.4.9" +version = "1.6.1+zstd.1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e" +checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index c001e6f9d..4568cf629 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,31 +20,31 @@ path = "src/main.rs" members = ["lib"] [dependencies] -blake2 = "0.9.1" -bytes = "1.0.0" +blake2 = "0.9.2" +bytes = "1.1.0" chrono = "0.4.19" -clap = "2.33.3" -config = "0.10.1" -criterion = "0.3.3" -dirs = "3.0.1" -git2 = "0.13.14" -hex = "0.4.2" +clap = "2.34.0" +config = "0.11.0" +criterion = "0.3.5" +dirs = "4.0.0" +git2 = "0.13.24" +hex = "0.4.3" indoc = "1.0.3" itertools = "0.10.1" jujutsu-lib = { version = "=0.2.0", path = "lib"} maplit = "1.0.2" pest = "2.1.3" pest_derive = "2.1.0" -protobuf = { version = "2.22.1", features = ["with-bytes"] } -protobuf-codegen-pure = "2.22.1" -rand = "0.8.0" -serde_json = "1.0.60" -tempfile = "3.1.0" +protobuf = { version = "2.25.2", features = ["with-bytes"] } +protobuf-codegen-pure = "2.25.2" +rand = "0.8.4" +serde_json = "1.0.72" +tempfile = "3.2.0" textwrap = "0.14.2" -thiserror = "1.0.22" -uuid = { version = "0.8.1", features = ["v4"] } -zstd = "0.6.0" +thiserror = "1.0.30" +uuid = { version = "0.8.2", features = ["v4"] } +zstd = "0.9.0" [dev-dependencies] -test-case = "1.2.0" -regex = "1.4.2" +test-case = "1.2.1" +regex = "1.5.4" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index c5b75427d..9e79e91f0 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -13,32 +13,32 @@ readme = "../README.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -protobuf-codegen-pure = "2.22.1" +protobuf-codegen-pure = "2.25.2" [dependencies] backoff = "0.3.0" -blake2 = "0.9.1" -bytes = "1.0.0" -byteorder = "1.3.4" +blake2 = "0.9.2" +bytes = "1.1.0" +byteorder = "1.4.3" chrono = "0.4.19" -config = "0.10.1" -dirs = "3.0.1" -git2 = "0.13.14" -hex = "0.4.2" +config = "0.11.0" +dirs = "4.0.0" +git2 = "0.13.25" +hex = "0.4.3" itertools = "0.10.1" maplit = "1.0.2" pest = "2.1.3" pest_derive = "2.1.0" -protobuf = { version = "2.22.1", features = ["with-bytes"] } -rand = "0.8.0" +protobuf = { version = "2.25.2", features = ["with-bytes"] } +rand = "0.8.4" regex = "1.5.4" -serde_json = "1.0.60" -tempfile = "3.1.0" -thiserror = "1.0.22" -uuid = { version = "0.8.1", features = ["v4"] } -whoami = "1.0.1" -zstd = "0.6.0" +serde_json = "1.0.72" +tempfile = "3.2.0" +thiserror = "1.0.30" +uuid = { version = "0.8.2", features = ["v4"] } +whoami = "1.2.1" +zstd = "0.9.0" [dev-dependencies] num_cpus = "1.13.0" -test-case = "1.2.0" +test-case = "1.2.1"