diff --git a/Cargo.lock b/Cargo.lock index eede31d8e..6f7a88f6a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -138,6 +138,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" +[[package]] +name = "bytes" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f8e949d755f9d79112b5bb46938e0ef9d3804a0b16dfab13aafcaa5f0fa72" + [[package]] name = "cast" version = "0.2.3" @@ -353,11 +359,10 @@ dependencies = [ [[package]] name = "dirs" -version = "2.0.2" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff" dependencies = [ - "cfg-if", "dirs-sys", ] @@ -415,10 +420,21 @@ dependencies = [ ] [[package]] -name = "git2" -version = "0.13.11" +name = "getrandom" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e094214efbc7fdbbdee952147e493b00e99a4e52817492277e98967ae918165" +checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "git2" +version = "0.13.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "186dd99cc77576e58344ad614fa9bb27bad9d048f85de3ca850c1f4e8b048260" dependencies = [ "bitflags", "libc", @@ -496,7 +512,7 @@ name = "jj" version = "0.1.0" dependencies = [ "blake2", - "bytes", + "bytes 1.0.0", "chrono", "clap", "config", @@ -525,7 +541,7 @@ version = "0.1.0" dependencies = [ "blake2", "byteorder", - "bytes", + "bytes 1.0.0", "chrono", "config", "diff", @@ -535,7 +551,7 @@ dependencies = [ "maplit", "protobuf", "protobuf-codegen-pure", - "rand", + "rand 0.8.0", "serde_json", "tempfile", "test-case", @@ -590,9 +606,9 @@ checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743" [[package]] name = "libgit2-sys" -version = "0.12.13+1.0.1" +version = "0.12.16+1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069eea34f76ec15f2822ccf78fe0cdb8c9016764d0a12865278585a74dbdeae5" +checksum = "9f91b2f931ee975a98155195be8cd82d02e8e029d7d793d2bac1b8181ac97020" dependencies = [ "cc", "libc", @@ -856,27 +872,27 @@ dependencies = [ [[package]] name = "protobuf" -version = "2.18.0" +version = "2.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d147edb77bcccbfc81fabffdc7bd50c13e103b15ca1e27515fe40de69a5776b" +checksum = "da78e04bc0e40f36df43ecc6575e4f4b180e8156c4efd73f13d5619479b05696" dependencies = [ - "bytes", + "bytes 0.5.6", ] [[package]] name = "protobuf-codegen" -version = "2.18.0" +version = "2.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e81f70c25aab9506f87253c55f7cdcd8917635d5597382958d20025c211bbbd" +checksum = "49b2b929363268881afe6d24351e8b711ea5a1901a5e1549d3723ebcc5d3696d" dependencies = [ "protobuf", ] [[package]] name = "protobuf-codegen-pure" -version = "2.18.0" +version = "2.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af8d72d9e14fd41a954f4d5b310396151437c83d2bfcbf19d3073af90e46288" +checksum = "02a4b843fcc85f42b9f717a34481b9a323527f1b6ac62b20776514c044fc7da9" dependencies = [ "protobuf", "protobuf-codegen", @@ -897,11 +913,23 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom", + "getrandom 0.1.15", "libc", - "rand_chacha", - "rand_core", - "rand_hc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc 0.2.0", +] + +[[package]] +name = "rand" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76330fb486679b4ace3670f117bbc9e16204005c4bde9c4bd372f45bed34f12" +dependencies = [ + "libc", + "rand_chacha 0.3.0", + "rand_core 0.6.0", + "rand_hc 0.3.0", ] [[package]] @@ -911,7 +939,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.0", ] [[package]] @@ -920,7 +958,16 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom", + "getrandom 0.1.15", +] + +[[package]] +name = "rand_core" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8b34ba8cfb21243bd8df91854c830ff0d785fff2e82ebd4434c2644cb9ada18" +dependencies = [ + "getrandom 0.2.0", ] [[package]] @@ -929,7 +976,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" dependencies = [ - "rand_core", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_hc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +dependencies = [ + "rand_core 0.6.0", ] [[package]] @@ -969,16 +1025,16 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" dependencies = [ - "getrandom", + "getrandom 0.1.15", "redox_syscall", "rust-argon2", ] [[package]] name = "regex" -version = "1.3.9" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" dependencies = [ "aho-corasick", "memchr", @@ -997,9 +1053,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.18" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" +checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" [[package]] name = "remove_dir_all" @@ -1121,9 +1177,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.58" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a230ea9107ca2220eea9d46de97eddcb04cd00e92d13dda78e478dd33fa82bd4" +checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779" dependencies = [ "itoa", "ryu", @@ -1171,9 +1227,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "syn" -version = "1.0.43" +version = "1.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2e59c50ed8f6b050b071aa7b6865293957a9af6b58b94f97c1c9434ad440ea" +checksum = "a571a711dddd09019ccc628e1b17fe87c59b09d513c06c026877aa708334f37a" dependencies = [ "proc-macro2", "quote", @@ -1188,7 +1244,7 @@ checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ "cfg-if", "libc", - "rand", + "rand 0.7.3", "redox_syscall", "remove_dir_all", "winapi", @@ -1217,18 +1273,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42" +checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab" +checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" dependencies = [ "proc-macro2", "quote", @@ -1345,7 +1401,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" dependencies = [ - "rand", + "rand 0.7.3", ] [[package]] @@ -1455,9 +1511,13 @@ dependencies = [ [[package]] name = "whoami" -version = "0.9.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884773ab69074615cb8f8425d0e53f11710786158704fca70f53e71b0e05504" +checksum = "e35495e7faf4c657051a8e9725d9c37ac57879e915be3ed55bb401af84382035" +dependencies = [ + "wasm-bindgen", + "web-sys", +] [[package]] name = "winapi" @@ -1501,18 +1561,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.5.3+zstd.1.4.5" +version = "0.6.0+zstd.1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b32eaf771efa709e8308605bbf9319bf485dc1503179ec0469b611937c0cd8" +checksum = "d4e44664feba7f2f1a9f300c1f6157f2d1bfc3c15c6f3cf4beabf3f5abe9c237" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "2.0.5+zstd.1.4.5" +version = "3.0.0+zstd.1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfb642e0d27f64729a639c52db457e0ae906e7bc6f5fe8f5c453230400f1055" +checksum = "d9447afcd795693ad59918c7bbffe42fdd6e467d708f3537e3dc14dc598c573f" dependencies = [ "libc", "zstd-sys", @@ -1520,9 +1580,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.4.17+zstd.1.4.5" +version = "1.4.19+zstd.1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b89249644df056b522696b1bb9e7c18c87e8ffa3e2f0dc3b0155875d6498f01b" +checksum = "ec24a9273d24437afb8e71b16f3d9a5d569193cccdb7896213b59f552f387674" dependencies = [ "cc", "glob", diff --git a/Cargo.toml b/Cargo.toml index a3c7284a7..fea0a7b18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,25 +12,25 @@ path = "lib" [dependencies] blake2 = "0.9.1" -bytes = "0.5" -chrono = "0.4" -clap = "2.33" -config = "0.10" -criterion = "0.3.2" -diff = "0.1" -dirs = "2.0" -git2 = "0.13" -hex = "0.4" -indoc = "1.0" -pest = "2.1" -pest_derive = "2.1" -protobuf = { version = "2.12", features = ["with-bytes"] } -protobuf-codegen-pure = "2.12" -serde_json = "1.0" -tempfile = "3.1" -uuid = { version = "0.8", features = ["v4"] } -zstd = "0.5" +bytes = "1.0.0" +chrono = "0.4.19" +clap = "2.33.3" +config = "0.10.1" +criterion = "0.3.3" +diff = "0.1.12" +dirs = "3.0.1" +git2 = "0.13.14" +hex = "0.4.2" +indoc = "1.0.3" +pest = "2.1.3" +pest_derive = "2.1.0" +protobuf = { version = "2.18.1", features = ["with-bytes"] } +protobuf-codegen-pure = "2.18.1" +serde_json = "1.0.60" +tempfile = "3.1.0" +uuid = { version = "0.8.1", features = ["v4"] } +zstd = "0.6.0" [dev-dependencies] test-case = "1.0.0" -regex = "1.3.9" +regex = "1.4.2" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 350850fbb..fc1d585b5 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -7,27 +7,27 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -protobuf-codegen-pure = "2.12" +protobuf-codegen-pure = "2.18.1" [dependencies] blake2 = "0.9.1" -bytes = "0.5" +bytes = "1.0.0" byteorder = "1.3.4" -chrono = "0.4" -config = "0.10" -diff = "0.1" -dirs = "2.0" -git2 = "0.13" -hex = "0.4" +chrono = "0.4.19" +config = "0.10.1" +diff = "0.1.12" +dirs = "3.0.1" +git2 = "0.13.14" +hex = "0.4.2" maplit = "1.0.2" -protobuf = { version = "2.12", features = ["with-bytes"] } -rand = "0.7.3" -serde_json = "1.0" -tempfile = "3.1" -thiserror = "1.0" -uuid = { version = "0.8", features = ["v4"] } -whoami = "0.9.0" -zstd = "0.5" +protobuf = { version = "2.18.1", features = ["with-bytes"] } +rand = "0.8.0" +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" [dev-dependencies] test-case = "1.0.0"