Merge of #4796

ZcashFoundation · Aug 3, 2022 · 5b99631 · 5b99631
2 parents f534243 + 9ce6608
commit 5b99631
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tower-batch/Cargo.toml b/tower-batch/Cargo.toml
@@ -18,6 +18,10 @@ tracing-futures = "0.2.5"
 
 [dev-dependencies]
 color-eyre = "0.6.1"
+# This is a transitive dependency via color-eyre.
+# Enable a feature that makes tinyvec compile much faster.
+tinyvec = { version = "1.5.1", features = ["rustc_1_55"] }
+
 ed25519-zebra = "3.0.0"
 rand = { version = "0.8.5", package = "rand" }
 

diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml
@@ -85,12 +85,14 @@ tokio = { version = "1.20.1", features = ["tracing"], optional = true }
 zebra-test = { path = "../zebra-test/", optional = true }
 
 [dev-dependencies]
-
 # Benchmarks
 criterion = { version = "0.3.5", features = ["html_reports"] }
 
 # Error Handling & Formatting
 color-eyre = "0.6.1"
+# This is a transitive dependency via color-eyre.
+# Enable a feature that makes tinyvec compile much faster.
+tinyvec = { version = "1.5.1", features = ["rustc_1_55"] }
 spandoc = "0.2.2"
 tracing = "0.1.31"
 

diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml
@@ -52,6 +52,10 @@ proptest-derive = { version = "0.3.0", optional = true }
 
 [dev-dependencies]
 color-eyre = "0.6.1"
+# This is a transitive dependency via color-eyre.
+# Enable a feature that makes tinyvec compile much faster.
+tinyvec = { version = "1.5.1", features = ["rustc_1_55"] }
+
 hex = "0.4.3"
 proptest = "0.10.1"
 proptest-derive = "0.3.0"

diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml
@@ -39,6 +39,10 @@ proptest-derive = { version = "0.3.0", optional = true }
 
 [dev-dependencies]
 color-eyre = "0.6.1"
+# This is a transitive dependency via color-eyre.
+# Enable a feature that makes tinyvec compile much faster.
+tinyvec = { version = "1.5.1", features = ["rustc_1_55"] }
+
 once_cell = "1.13.0"
 spandoc = "0.2.2"
 

diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml
@@ -22,6 +22,10 @@ tower = { version = "0.4.13", features = ["util"] }
 futures = "0.3.21"
 
 color-eyre = "0.6.1"
+# This is a transitive dependency via color-eyre.
+# Enable a feature that makes tinyvec compile much faster.
+tinyvec = { version = "1.5.1", features = ["rustc_1_55"] }
+
 owo-colors = "3.4.0"
 spandoc = "0.2.2"
 thiserror = "1.0.31"

diff --git a/zebra-utils/Cargo.toml b/zebra-utils/Cargo.toml
@@ -8,8 +8,12 @@ edition = "2021"
 publish = false
 
 [dependencies]
-structopt = "0.3.26"
 color-eyre = "0.6.1"
+# This is a transitive dependency via color-eyre.
+# Enable a feature that makes tinyvec compile much faster.
+tinyvec = { version = "1.5.1", features = ["rustc_1_55"] }
+
+structopt = "0.3.26"
 hex = "0.4.3"
 serde_json = "1.0.83"
 tracing-error = "0.2.0"

diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml
@@ -92,6 +92,10 @@ tower = { version = "0.4.13", features = ["hedge", "limit"] }
 pin-project = "1.0.10"
 
 color-eyre = { version = "0.6.1", default_features = false, features = ["issue-url"] }
+# This is a transitive dependency via color-eyre.
+# Enable a feature that makes tinyvec compile much faster.
+tinyvec = { version = "1.5.1", features = ["rustc_1_55"] }
+
 thiserror = "1.0.31"
 
 tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }