diff options
author | Haibo Huang <hhb@google.com> | 2021-01-07 18:06:37 -0800 |
---|---|---|
committer | Haibo Huang <hhb@google.com> | 2021-01-07 18:06:37 -0800 |
commit | b7f1d00f9fdeaa9aa85a3c8c36e650fdefaef8bc (patch) | |
tree | 5ea79b828479a200518a147fd67c1ada30f75452 | |
parent | 57694ec33f9b4726b9ee5b9705f364ea0acf5e24 (diff) | |
download | protobuf-codegen-b7f1d00f9fdeaa9aa85a3c8c36e650fdefaef8bc.tar.gz |
Upgrade rust/crates/protobuf-codegen to 2.20.0
Test: make
Change-Id: I2aaabad83af5a304ad847943933dbe5a116ec575
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Android.bp | 5 | ||||
-rw-r--r-- | Cargo.lock | 6 | ||||
-rw-r--r-- | Cargo.toml | 4 | ||||
-rw-r--r-- | Cargo.toml.orig | 4 | ||||
-rw-r--r-- | METADATA | 10 | ||||
-rw-r--r-- | src/lib.rs | 4 |
7 files changed, 19 insertions, 16 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index 2bb6739..97d68b2 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,5 +1,5 @@ { "git": { - "sha1": "09619bc3a85243f092e68ab9ba1f2c5573d5a85b" + "sha1": "1e5368c80fd4272ada7d2ed7c6be783376bb5080" } } @@ -2,6 +2,7 @@ rust_library_host { name: "libprotobuf_codegen", + // has rustc warnings crate_name: "protobuf_codegen", srcs: ["src/lib.rs"], edition: "2015", @@ -12,6 +13,7 @@ rust_library_host { rust_test_host { name: "protobuf-codegen_host_test_src_lib", + // has rustc warnings crate_name: "protobuf_codegen", srcs: ["src/lib.rs"], test_suites: ["general-tests"], @@ -24,6 +26,7 @@ rust_test_host { rust_binary_host { name: "protoc-gen-rust", + // has rustc warnings crate_name: "protoc_gen_rust", srcs: ["src/bin/protoc-gen-rust.rs"], edition: "2015", @@ -34,4 +37,4 @@ rust_binary_host { } // dependent_library ["feature_list"] -// protobuf-2.18.1 +// protobuf-2.20.0 @@ -2,13 +2,13 @@ # It is not intended for manual editing. [[package]] name = "protobuf" -version = "2.18.1" +version = "2.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da78e04bc0e40f36df43ecc6575e4f4b180e8156c4efd73f13d5619479b05696" +checksum = "86473d5f16580f10b131a0bf0afb68f8e029d1835d33a00f37281b05694e5312" [[package]] name = "protobuf-codegen" -version = "2.18.1" +version = "2.20.0" dependencies = [ "protobuf", ] @@ -12,7 +12,7 @@ [package] name = "protobuf-codegen" -version = "2.18.1" +version = "2.20.0" authors = ["Stepan Koltsov <stepan.koltsov@gmail.com>"] description = "Code generator for rust-protobuf.\n\nIncludes a library and `protoc-gen-rust` binary.\n\nSee `protoc-rust` and `protobuf-codegen-pure` crates.\n" homepage = "https://github.com/stepancheg/rust-protobuf/" @@ -34,4 +34,4 @@ name = "protobuf-bin-gen-rust-do-not-use" path = "src/bin/protobuf-bin-gen-rust-do-not-use.rs" test = false [dependencies.protobuf] -version = "=2.18.1" +version = "=2.20.0" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 4124067..1f02fd0 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "protobuf-codegen" -version = "2.18.1" +version = "2.20.0" authors = ["Stepan Koltsov <stepan.koltsov@gmail.com>"] license = "MIT" homepage = "https://github.com/stepancheg/rust-protobuf/" @@ -17,7 +17,7 @@ See `protoc-rust` and `protobuf-codegen-pure` crates. bench = false [dependencies] -protobuf = { path = "../protobuf", version = "=2.18.1" } +protobuf = { path = "../protobuf", version = "=2.20.0" } [[bin]] @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.18.1.crate" + value: "https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.20.0.crate" } - version: "2.18.1" + version: "2.20.0" license_type: NOTICE last_upgrade_date { - year: 2020 - month: 11 - day: 24 + year: 2021 + month: 1 + day: 7 } } @@ -144,7 +144,7 @@ fn write_file_descriptor_data( ), |w| { w.write_line(&format!( - "{}::parse_from_bytes(file_descriptor_proto_data).unwrap()", + "{}::Message::parse_from_bytes(file_descriptor_proto_data).unwrap()", protobuf_crate_path(customize) )); }, @@ -192,7 +192,7 @@ fn gen_file( { let mut w = CodeWriter::new(&mut v); - w.write_generated_by("rust-protobuf", "2.18.1"); + w.write_generated_by("rust-protobuf", "2.20.0"); w.write_line(&format!("//! Generated file from `{}`", file.get_name())); if customize.inside_protobuf != Some(true) { w.write_line(""); |