Skip to content

Commit

Permalink
Depend on raft-proto crate instead of raft (#411)
Browse files Browse the repository at this point in the history
* Use the raft-proto crate instead of raft

We now only depend on crates.io crates, cc #280

Signed-off-by: Nick Cameron <[email protected]>

* Update protobuf-build

Fixes a bunch of warnings

Signed-off-by: Nick Cameron <[email protected]>
  • Loading branch information
nrc committed Jun 26, 2019
1 parent a4759df commit 4614b96
Show file tree
Hide file tree
Showing 31 changed files with 40,655 additions and 16,124 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ prost-derive = "0.5"
bytes = "0.4"
futures = "0.1"
grpcio = { version = "0.5.0-alpha.1", features = ["prost-codec"] }
raft = { git = "https://github.com/pingcap/raft-rs.git", rev = "8e953b0d0c9cd2f98c94a42edc48ae3f09e967ff" }
raft-proto = "0.4"
lazy_static = "1.3"

[build-dependencies]
protobuf-build = "0.5.0"
protobuf-build = "0.6"
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fn main() {
}

fn generate_prost_rs(mod_names: &[String]) {
let mut text = "#![allow(dead_code)]\n\npub use raft::eraftpb;\n\n".to_owned();
let mut text = "#![allow(dead_code)]\n\npub use raft_proto::eraftpb;\n\n".to_owned();

for mod_name in mod_names {
text.push_str("pub mod ");
Expand Down
86 changes: 57 additions & 29 deletions src/prost.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions src/prost/coprocessor.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

149 changes: 120 additions & 29 deletions src/prost/deadlockpb.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4614b96

Please sign in to comment.