fixup! [Deps] Downgrade bindgen to unyanked 0.54.0, upgrade others. c…

…lang-sys 1.0.0/0.23.0 collision prevented bindgen upgrade Closes: aptos-labs#5762
Botnarvladimir · Aug 28, 2020 · 7ff9e48 · 7ff9e48
1 parent 1fd600e
commit 7ff9e48
Show file tree

Hide file tree

Showing 111 changed files with 1,013 additions and 930 deletions.
diff --git a/.dependabot/config.yml b/.dependabot/config.yml
@@ -9,6 +9,12 @@ update_configs:
           dependency_name: "codespan*"
       - match:
           dependency_name: "libfuzzer-sys*"
+      - match:
+          dependency_name: "ureq*"
+      - match:
+          dependency_name: "rustls*"
+      - match:
+          dependency_name: "bindgen*"
     allowed_updates:
       - match:
           update_type: "security"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/json-rpc/Cargo.toml b/client/json-rpc/Cargo.toml
@@ -12,8 +12,8 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.32"
 hex = "0.4.2"
-reqwest = { version = "0.10.7", features = ["blocking", "json"], default_features = false }
-serde = { version = "1.0.114", default-features = false }
+reqwest = { version = "0.10.8", features = ["blocking", "json"], default_features = false }
+serde = { version = "1.0.115", default-features = false }
 serde_json = "1.0.57"
 
 lcs = { path = "../../common/lcs", version = "0.1.0", package = "libra-canonical-serialization" }

diff --git a/client/libra-dev/Cargo.toml b/client/libra-dev/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 edition = "2018"
 
 [dependencies]
-libc = "0.2.74"
+libc = "0.2.76"
 static_assertions = "1.1.0"
 
 lcs = { path = "../../common/lcs", version = "0.1.0", package = "libra-canonical-serialization" }
@@ -24,7 +24,7 @@ transaction-builder = { path = "../../language/transaction-builder", version = "
 rand = "0.7.3"
 
 [build-dependencies]
-bindgen = "0.54.1"
+bindgen = "0.54.0"
 
 [lib]
 crate-type = ["staticlib", "cdylib"]
diff --git a/client/swiss-knife/Cargo.toml b/client/swiss-knife/Cargo.toml
@@ -10,11 +10,11 @@ publish = false
 edition = "2018"
 
 [dependencies]
-structopt = "0.3.15"
+structopt = "0.3.17"
 rand = "0.7.3"
 hex = "0.4.2"
 serde_json = "1.0.57"
-serde = { version = "1.0.114", features = ["derive"] }
+serde = { version = "1.0.115", features = ["derive"] }
 
 lcs = { path = "../../common/lcs", version = "0.1.0", package = "libra-canonical-serialization" }
 libra-types = { path = "../../types", version = "0.1.0" }

diff --git a/common/bitvec/Cargo.toml b/common/bitvec/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 libra-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }
 proptest = { version = "0.10.1", default-features = true, optional = true }
 proptest-derive = { version = "0.2.0", optional = true }
-serde = { version = "1.0.114", features = ["derive"] }
+serde = { version = "1.0.115", features = ["derive"] }
 serde_bytes = "0.11.5"
 
 [dev-dependencies]

diff --git a/common/channel/Cargo.toml b/common/channel/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.32"
 futures = "0.3.5"
-once_cell = "1.4.0"
+once_cell = "1.4.1"
 libra-logger = { path = "../logger", version = "0.1.0" }
 libra-metrics = { path = "../metrics", version = "0.1.0" }
 libra-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }

diff --git a/common/crash-handler/Cargo.toml b/common/crash-handler/Cargo.toml
@@ -15,4 +15,4 @@ toml = "0.5.6"
 
 libra-logger = { path = "../logger", version = "0.1.0" }
 libra-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }
-serde = { version = "1.0.114", features = ["derive"] }
+serde = { version = "1.0.115", features = ["derive"] }
diff --git a/common/datatest-stable/Cargo.toml b/common/datatest-stable/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2018"
 [dependencies]
 regex = "1.3.9"
 walkdir = "2.3.1"
-structopt = "0.3.15"
+structopt = "0.3.17"
 termcolor = "1.1.0"
 libra-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }
 

diff --git a/common/debug-interface/Cargo.toml b/common/debug-interface/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.32"
 tokio = { version = "0.2.22", features = ["full"] }
-reqwest = { version = "0.10.7", features = ["blocking", "json"], default_features = false }
+reqwest = { version = "0.10.8", features = ["blocking", "json"], default_features = false }
 warp = "0.2.4"
 
 libra-logger = { path = "../logger", version = "0.1.0" }

diff --git a/common/inject-error/Cargo.toml b/common/inject-error/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "inject-error"
+version = "0.1.0"
+authors = ["Libra Association <[email protected]>"]
+edition = "2018"
+publish = false
+license = "Apache-2.0"
+
+[lib]
+proc-macro = true
+
+[[bin]]
+name = "test"
+required-features = ["enable-inject-error"]
+
+[dependencies]
+quote = "1.0.7"
+syn = { version = "1.0.39", features = ["full", "extra-traits"] }
+libra-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }
+# dependencies for the test binary
+anyhow = "1.0.32"
+rand = "0.7.3"
+
+[features]
+# only used by the example binary
+enable-inject-error = []
diff --git a/common/lcs/Cargo.toml b/common/lcs/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 libra-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }
 thiserror = "1.0.20"
-serde = { version = "1.0.114", features = ["derive"] }
+serde = { version = "1.0.115", features = ["derive"] }
 
 [dev-dependencies]
 criterion = "0.3.3"

diff --git a/common/libradoc/Cargo.toml b/common/libradoc/Cargo.toml
@@ -14,13 +14,13 @@ serde-reflection = "0.3.1"
 serde-generate = "0.13.0"
 anyhow = "1.0.32"
 regex = "1.3.9"
-structopt = "0.3.15"
-once_cell = "1.4.0"
+structopt = "0.3.17"
+once_cell = "1.4.1"
 
 libra-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" }
 
 [dev-dependencies]
-serde = { version = "1.0.114", features = ["derive"] }
+serde = { version = "1.0.115", features = ["derive"] }
 tempfile = "3.1.0"
 
 [features]

diff --git a/common/logger/Cargo.toml b/common/logger/Cargo.toml
@@ -12,15 +12,15 @@ edition = "2018"
 # Do NOT add any inter-project dependencies.
 # This is to avoid ever having a circular dependency with the libra-logger crate.
 [dependencies]
-chrono = "0.4.13"
+chrono = "0.4.15"
 env_logger = { version = "0.7.1", default-features = false }
 hex = "0.4.2"
 libra-time = { path = "../time", version = "0.1.0"}
 libra-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }
 log = "0.4.11"
-once_cell = "1.4.0"
+once_cell = "1.4.1"
 rand = "0.7.3"
-serde = { version = "1.0.114", features = ["derive"] }
+serde = { version = "1.0.115", features = ["derive"] }
 serde_json = "1.0.57"
 prometheus = { version = "0.9.0", default-features = false }
 [features]
diff --git a/common/metrics/Cargo.toml b/common/metrics/Cargo.toml
@@ -15,7 +15,7 @@ futures = "0.3.5"
 hyper = "0.13.7"
 libra-logger = { path = "../logger", version = "0.1.0" }
 libra-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }
-once_cell = "1.4.0"
+once_cell = "1.4.1"
 prometheus = { version = "0.9.0", default-features = false }
 serde_json = "1.0.57"
 tokio = "0.2.22"

diff --git a/common/nibble/Cargo.toml b/common/nibble/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 libra-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }
 proptest = { version = "0.10.1", optional = true }
-serde = { version = "1.0.114", features = ["derive"] }
+serde = { version = "1.0.115", features = ["derive"] }
 
 [features]
 default = []

diff --git a/common/num-variants/Cargo.toml b/common/num-variants/Cargo.toml
@@ -10,7 +10,7 @@ license = "Apache-2.0"
 proc-macro = true
 
 [dependencies]
-syn = "1.0.37"
+syn = "1.0.39"
 quote = "1.0.7"
 proc-macro2 = "1.0.19"
 libra-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }
diff --git a/common/trace/Cargo.toml b/common/trace/Cargo.toml
@@ -10,14 +10,14 @@ publish = false
 edition = "2018"
 
 [dependencies]
-chrono = "0.4.13"
-structopt = "0.3.15"
+chrono = "0.4.15"
+structopt = "0.3.17"
 tokio = { version = "0.2.22", features = ["full"] }
 serde_json = "1.0.57"
-serde = "1.0.114"
+serde = "1.0.115"
 anyhow = "1.0.32"
-reqwest = { version = "0.10.7", features = ["blocking", "json"], default_features = false }
-once_cell = "1.4.0"
+reqwest = { version = "0.10.8", features = ["blocking", "json"], default_features = false }
+once_cell = "1.4.1"
 
 libra-logger = { path = "../../common/logger", version = "0.1.0" }
 libra-metrics = { path = "../metrics", version = "0.1.0" }

diff --git a/common/workspace-builder/Cargo.toml b/common/workspace-builder/Cargo.toml
@@ -10,6 +10,6 @@ publish = false
 edition = "2018"
 
 [dependencies]
-once_cell = "1.4.0"
+once_cell = "1.4.1"
 libra-logger = { path = "../logger", version = "0.1.0" }
 libra-workspace-hack = { path = "../workspace-hack", version = "0.1.0" }
diff --git a/common/workspace-hack/Cargo.toml b/common/workspace-hack/Cargo.toml
@@ -11,12 +11,12 @@ edition = "2018"
 
 [dependencies]
 bytes = { version = "0.5.6", features = ["serde", "std"] }
-cc = { version = "1.0.58", features = ["jobserver", "parallel"] }
+cc = { version = "1.0.59", features = ["jobserver", "parallel"] }
 log = { version = "0.4.11", features = ["serde", "std"] }
 memchr = { version = "2.3.3", features = ["std", "use_std"] }
 num-traits = { version = "0.2.12", features = ["std"] }
 petgraph = { version = "0.5.1", features = ["graphmap", "matrix_graph", "stable_graph"] }
-serde = { version = "1.0.114", features = ["derive", "rc"] }
+serde = { version = "1.0.115", features = ["derive", "rc"] }
 sha-1 = { version = "0.9.1", features = ["std"] }
 subtle = { version = "2.2.3", features = ["i128", "std"] }
-syn = { version = "1.0.37", features = ["clone-impls", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
+syn = { version = "1.0.39", features = ["clone-impls", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
diff --git a/config/Cargo.toml b/config/Cargo.toml
@@ -12,9 +12,9 @@ edition = "2018"
 [dependencies]
 get_if_addrs = { version = "0.5.3", default-features = false }
 log = { version = "0.4.11", features = ["serde"] }
-mirai-annotations = "1.9.1"
+mirai-annotations = "1.10.1"
 rand = "0.7.3"
-serde = { version = "1.0.114", features = ["rc"], default-features = false }
+serde = { version = "1.0.115", features = ["rc"], default-features = false }
 serde_yaml = "0.8.13"
 thiserror = "1.0.20"
 

diff --git a/config/config-builder/Cargo.toml b/config/config-builder/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 anyhow = "1.0.32"
 hex = "0.4.2"
 rand = "0.7.3"
-structopt = "0.3.15"
+structopt = "0.3.17"
 thiserror = "1.0.20"
 
 executor = { path = "../../execution/executor", version = "0.1.0" }

diff --git a/config/management/Cargo.toml b/config/management/Cargo.toml
@@ -11,9 +11,9 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.32"
-serde = { version = "1.0.114", features = ["rc"], default-features = false }
+serde = { version = "1.0.115", features = ["rc"], default-features = false }
 serde_yaml = "0.8.13"
-structopt = "0.3.15"
+structopt = "0.3.17"
 thiserror = "1.0.20"
 toml = { version = "0.5.6", default-features = false }
 

diff --git a/config/management/genesis/Cargo.toml b/config/management/genesis/Cargo.toml
@@ -11,8 +11,8 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.32"
-serde = { version = "1.0.114", features = ["rc"], default-features = false }
-structopt = "0.3.15"
+serde = { version = "1.0.115", features = ["rc"], default-features = false }
+structopt = "0.3.17"
 thiserror = "1.0.20"
 toml = { version = "0.5.6", default-features = false }
 

diff --git a/config/management/network-address-encryption/Cargo.toml b/config/management/network-address-encryption/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 base64 = "0.12.3"
-serde = { version = "1.0.114", features = ["rc"], default-features = false }
+serde = { version = "1.0.115", features = ["rc"], default-features = false }
 thiserror = "1.0.20"
 
 move-core-types = { path = "../../../language/move-core/types", version = "0.1.0" }

diff --git a/config/management/operational/Cargo.toml b/config/management/operational/Cargo.toml
@@ -12,9 +12,9 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.32"
 hex = "0.4.2"
-serde = { version = "1.0.114", features = ["rc"], default-features = false }
+serde = { version = "1.0.115", features = ["rc"], default-features = false }
 serde_json = "1.0.57"
-structopt = "0.3.15"
+structopt = "0.3.17"
 thiserror = "1.0.20"
 toml = { version = "0.5.6", default-features = false }
 

diff --git a/config/seed-peer-generator/Cargo.toml b/config/seed-peer-generator/Cargo.toml
@@ -14,7 +14,7 @@ anyhow = "1.0.32"
 hex = "0.4.2"
 rand = "0.7.3"
 serde_yaml = "0.8.13"
-structopt = "0.3.15"
+structopt = "0.3.17"
 thiserror = "1.0.20"
 
 executor = { path = "../../execution/executor", version = "0.1.0" }

diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
@@ -11,19 +11,19 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.32"
-async-trait = "0.1.36"
+async-trait = "0.1.38"
 byteorder = { version = "1.3.4", default-features = false }
 bytes = "0.5.6"
 fail = "0.4.0"
 futures = "0.3.5"
 itertools = { version = "0.9.0", default-features = false }
-mirai-annotations = { version = "1.9.1", default-features = false }
-num-derive = { version = "0.3.1", default-features = false }
+mirai-annotations = { version = "1.10.1", default-features = false }
+num-derive = { version = "0.3.2", default-features = false }
 num-traits = { version = "0.2.12", default-features = false }
-once_cell = "1.4.0"
+once_cell = "1.4.1"
 proptest = { version = "0.10.1", optional = true }
 rand = { version = "0.7.3", default-features = false }
-serde = { version = "1.0.114", default-features = false }
+serde = { version = "1.0.115", default-features = false }
 serde_json = "1.0.57"
 termion = { version = "1.5.5", default-features = false }
 thiserror = "1.0.20"

diff --git a/consensus/consensus-types/Cargo.toml b/consensus/consensus-types/Cargo.toml
@@ -8,9 +8,9 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.32"
-mirai-annotations = { version = "1.9.1", default-features = false }
+mirai-annotations = { version = "1.10.1", default-features = false }
 proptest = { version = "0.10.1", optional = true }
-serde = { version = "1.0.114", default-features = false }
+serde = { version = "1.0.115", default-features = false }
 
 lcs = { path = "../../common/lcs", version = "0.1.0", package = "libra-canonical-serialization" }
 libra-crypto = { path = "../../crypto/crypto", version = "0.1.0" }

diff --git a/consensus/safety-rules/Cargo.toml b/consensus/safety-rules/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.32"
-once_cell = "1.4.0"
+once_cell = "1.4.1"
 rand = { version = "0.7.3", default-features = false }
 proptest = { version = "0.10.1", optional = true }
 
@@ -27,7 +27,7 @@ libra-time = { path = "../../common/time", version = "0.1.0" }
 libra-types = { path = "../../types", version = "0.1.0" }
 libra-vault-client = { path = "../../secure/storage/vault", version = "0.1.0" }
 libra-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" }
-serde = { version = "1.0.114", default-features = false }
+serde = { version = "1.0.115", default-features = false }
 thiserror = "1.0.20"
 
 [dev-dependencies]

diff --git a/crypto/crypto-derive/Cargo.toml b/crypto/crypto-derive/Cargo.toml
@@ -13,7 +13,7 @@ proc-macro = true
 
 [dependencies]
 libra-workspace-hack = { path = "../../common/workspace-hack", version = "0.1.0" }
-syn = { version = "1.0.37", features = ["derive"] }
+syn = { version = "1.0.39", features = ["derive"] }
 quote = "1.0.7"
 proc-macro2 = "1.0.19"