use git dependencies instead of patch

tokio-rs · Sep 12, 2019 · 8e6d794 · 8e6d794
1 parent 21b5866
commit 8e6d794
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -42,7 +42,9 @@ std = ["prost-derive/use_std"]
    # so that generated files will not have std:: either, and will use alloc crate instead
 
 [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 }
 prost-derive = { version = "0.5.0", path = "prost-derive", default-features = false, optional = true }
 
 [dev-dependencies]
@@ -59,7 +61,3 @@ name = "varint"
 [[bench]]
 name = "benchmark"
 harness = false
-
-# TODO: Remove this after bytes releases 0.5, and before we make a release
-[patch.crates-io]
-bytes = { git = "https://github.com/tokio-rs/bytes", rev = "c17e40115f5bb2a2db71ed90dceae6ec643dc024" }
diff --git a/prost-build/Cargo.toml b/prost-build/Cargo.toml
@@ -11,7 +11,9 @@ description = "A Protocol Buffers implementation for the Rust Language."
 edition = "2018"
 
 [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 }
 heck = "0.3"
 itertools = "0.8"
 log = "0.4"

diff --git a/prost-types/Cargo.toml b/prost-types/Cargo.toml
@@ -19,5 +19,7 @@ default = ["std"]
 std = []
 
 [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 }
 prost = { version = "0.5.0", path = "..", default-features = false }
diff --git a/protobuf/Cargo.toml b/protobuf/Cargo.toml
@@ -6,7 +6,9 @@ publish = false
 edition = "2018"
 
 [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 }
 prost = { path = "..", default-features = false }
 prost-types = { path = "../prost-types", default-features = false }