Use git dependencies for bytes, and use alt-failure crate in prost-de…

…rive as a workaround for feature-unification issues
tokio-rs · Sep 12, 2019 · e5d878c · e5d878c
1 parent 8e6d794
commit e5d878c
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -50,7 +50,7 @@ prost-derive = { version = "0.5.0", path = "prost-derive", default-features = fa
 [dev-dependencies]
 criterion = "0.2"
 env_logger = { version = "0.6", default-features = false }
-failure = "0.1"
+failure = { version = "0.1", default-features = false }
 log = "0.4"
 protobuf = { version = "0", path = "protobuf" }
 quickcheck = "0.8"

diff --git a/conformance/Cargo.toml b/conformance/Cargo.toml
@@ -6,7 +6,9 @@ publish = false
 edition = "2018"
 
 [dependencies]
-bytes = "0.5"
+#TODO bytes = { version = "0.5", default-features = false }
+# Not using patch because it makes it harder for downstream projects
+bytes = { git = "https://github.com/tokio-rs/bytes", rev = "c17e40115f5bb2a2db71ed90dceae6ec643dc024", default-features = false }
 env_logger = { version = "0.6", default-features = false }
 log = "0.3"
 prost = { path = ".." }

diff --git a/prost-derive/Cargo.toml b/prost-derive/Cargo.toml
@@ -14,7 +14,7 @@ edition = "2018"
 proc_macro = true
 
 [features]
-use_std = [ "failure/std" ]
+use_std = []
 # std feature means that prost-derive attempts to use std collections
 #
 # When this feature is disabled, we attempt to use alloc.
@@ -29,7 +29,7 @@ use_std = [ "failure/std" ]
 default = []
 
 [dependencies]
-failure = { version = "0.1", default-features = false }
+failure = { package = "alt-failure" , version = "0.1.5" }
 itertools = "0.8"
 proc-macro2 = "0.4.4"
 quote = "0.6.3"

diff --git a/tests-2015/Cargo.toml b/tests-2015/Cargo.toml
@@ -16,7 +16,9 @@ default = ["edition-2015"]
 edition-2015 = []
 
 [dependencies]
-bytes = "0.5"
+#TODO bytes = { version = "0.5", default-features = false }
+# Not using patch because it makes it harder for downstream projects
+bytes = { git = "https://github.com/tokio-rs/bytes", rev = "c17e40115f5bb2a2db71ed90dceae6ec643dc024", default-features = false }
 cfg-if = "0.1"
 prost = { path = ".." }
 prost-types = { path = "../prost-types" }

diff --git a/tests-alloc/Cargo.toml b/tests-alloc/Cargo.toml
@@ -14,7 +14,9 @@ name = "tests-alloc"
 path = "src/bin.rs"
 
 [dependencies]
-bytes = { version = "0.5", default-features = false }
+#TODO bytes = { version = "0.5", default-features = false }
+# Not using patch because it makes it harder for downstream projects
+bytes = { git = "https://github.com/tokio-rs/bytes", rev = "c17e40115f5bb2a2db71ed90dceae6ec643dc024", default-features = false }
 cfg-if = "0.1"
 prost = { path = "..", default-features = false }
 prost-derive = { path = "../prost-derive", default-features = false }

diff --git a/tests-infra/Cargo.toml b/tests-infra/Cargo.toml
@@ -9,6 +9,8 @@ edition = "2018"
 doctest = false
 
 [dependencies]
-bytes = { version = "0.5", default-features = false }
+#TODO bytes = { version = "0.5", default-features = false }
+# Not using patch because it makes it harder for downstream projects
+bytes = { git = "https://github.com/tokio-rs/bytes", rev = "c17e40115f5bb2a2db71ed90dceae6ec643dc024", default-features = false }
 cfg-if = "0.1"
 prost = { path = "..", default-features = false }
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -11,7 +11,9 @@ build = "src/build.rs"
 doctest = false
 
 [dependencies]
-bytes = "0.5"
+#TODO bytes = { version = "0.5", default-features = false }
+# Not using patch because it makes it harder for downstream projects
+bytes = { git = "https://github.com/tokio-rs/bytes", rev = "c17e40115f5bb2a2db71ed90dceae6ec643dc024", default-features = false }
 cfg-if = "0.1"
 prost = { path = ".." }
 prost-types = { path = "../prost-types" }