mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-25 05:29:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

cargo: upgrade to protobuf 2.22.1 to avoid workaround for rustfmt::skip

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-03-18 13:04:30 -07:00
parent 07c2b2316f
commit db4e8bc458
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Cargo.lock generated
View file

@ -895,27 +895,27 @@ dependencies = [
[[package]] [[package]]
name = "protobuf" name = "protobuf"
version = "2.22.0" version = "2.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73f72884896d22e0da0e5b266cb9a780b791f6c3b2f5beab6368d6cd4f0dbb86" checksum = "1b7f4a129bb3754c25a4e04032a90173c68f85168f77118ac4cb4936e7f06f92"
dependencies = [ dependencies = [
"bytes", "bytes",
] ]
[[package]] [[package]]
name = "protobuf-codegen" name = "protobuf-codegen"
version = "2.22.0" version = "2.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8217a1652dbc91d19c509c558234145faed729191a966896414e5889f62d543" checksum = "e5d2fa3a461857508103b914da60dd7b489c1a834967c2e214ecc1496f0c486a"
dependencies = [ dependencies = [
"protobuf", "protobuf",
] ]
[[package]] [[package]]
name = "protobuf-codegen-pure" name = "protobuf-codegen-pure"
version = "2.22.0" version = "2.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f239d71417bdc5f8d83c07aeb265f911346e5540a1a6c4285f9c3d1966ed6e3" checksum = "b3a2520307dbb0df861ed77603770dc23b0ec15e5048272416d6447de98e862b"
dependencies = [ dependencies = [
"protobuf", "protobuf",
"protobuf-codegen", "protobuf-codegen",

4
Cargo.toml
View file

@ -34,8 +34,8 @@ indoc = "1.0.3"
jujube-lib = { version = "=0.1.1", path = "lib"} jujube-lib = { version = "=0.1.1", path = "lib"}
pest = "2.1.3" pest = "2.1.3"
pest_derive = "2.1.0" pest_derive = "2.1.0"
protobuf = { version = "2.22.0", features = ["with-bytes"] } protobuf = { version = "2.22.1", features = ["with-bytes"] }
protobuf-codegen-pure = "2.22.0" protobuf-codegen-pure = "2.22.1"
serde_json = "1.0.60" serde_json = "1.0.60"
tempfile = "3.1.0" tempfile = "3.1.0"
thiserror = "1.0.22" thiserror = "1.0.22"

4
lib/Cargo.toml
View file

@ -13,7 +13,7 @@ readme = "../README.md"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[build-dependencies] [build-dependencies]
protobuf-codegen-pure = "2.22.0" protobuf-codegen-pure = "2.22.1"
[dependencies] [dependencies]
backoff = "0.2.1" backoff = "0.2.1"
@ -27,7 +27,7 @@ dirs = "3.0.1"
git2 = "0.13.14" git2 = "0.13.14"
hex = "0.4.2" hex = "0.4.2"
maplit = "1.0.2" maplit = "1.0.2"
protobuf = { version = "2.22.0", features = ["with-bytes"] } protobuf = { version = "2.22.1", features = ["with-bytes"] }
rand = "0.8.0" rand = "0.8.0"
serde_json = "1.0.60" serde_json = "1.0.60"
tempfile = "3.1.0" tempfile = "3.1.0"

2
lib/src/lib.rs
View file

@ -14,8 +14,6 @@
#![feature(get_mut_unchecked)] #![feature(get_mut_unchecked)]
#![feature(map_first_last)] #![feature(map_first_last)]
// Work around https://github.com/stepancheg/rust-protobuf/issues/551
#![allow(soft_unstable)]
#[cfg(test)] #[cfg(test)]
#[macro_use] #[macro_use]