aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2020-11-25 19:24:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-25 19:24:43 +0000
commit21479602c3b9ecf70b65e6d9c26f25cc2e31619c (patch)
treecbacab070a29d721a5bcf8a98849e28d69cbfc69
parent5f36290b111053cca151d5726c75545d4fd9a05f (diff)
parent57694ec33f9b4726b9ee5b9705f364ea0acf5e24 (diff)
downloadprotobuf-codegen-21479602c3b9ecf70b65e6d9c26f25cc2e31619c.tar.gz
Upgrade rust/crates/protobuf-codegen to 2.18.1 am: b62512d3c6 am: 57694ec33f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/protobuf-codegen/+/1510356 Change-Id: I2abeb0fc28b199f2ca8d678cd5641918567926fe
-rw-r--r--.cargo_vcs_info.json2
-rw-r--r--Android.bp5
-rw-r--r--Cargo.lock6
-rw-r--r--Cargo.toml4
-rw-r--r--Cargo.toml.orig4
-rw-r--r--METADATA8
-rw-r--r--src/lib.rs2
7 files changed, 14 insertions, 17 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index e7b2111..2bb6739 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
{
"git": {
- "sha1": "dddcb17948d6ad78fe610af5a7f016d871d2a380"
+ "sha1": "09619bc3a85243f092e68ab9ba1f2c5573d5a85b"
}
}
diff --git a/Android.bp b/Android.bp
index 2ac2ac1..412db99 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,7 +2,6 @@
rust_library_host {
name: "libprotobuf_codegen",
- // has rustc warnings
crate_name: "protobuf_codegen",
srcs: ["src/lib.rs"],
edition: "2015",
@@ -13,7 +12,6 @@ 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"],
@@ -26,7 +24,6 @@ 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",
@@ -37,4 +34,4 @@ rust_binary_host {
}
// dependent_library ["feature_list"]
-// protobuf-2.18.0
+// protobuf-2.18.1
diff --git a/Cargo.lock b/Cargo.lock
index 84467c7..f5d8ba8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,13 +2,13 @@
# It is not intended for manual editing.
[[package]]
name = "protobuf"
-version = "2.18.0"
+version = "2.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d147edb77bcccbfc81fabffdc7bd50c13e103b15ca1e27515fe40de69a5776b"
+checksum = "da78e04bc0e40f36df43ecc6575e4f4b180e8156c4efd73f13d5619479b05696"
[[package]]
name = "protobuf-codegen"
-version = "2.18.0"
+version = "2.18.1"
dependencies = [
"protobuf",
]
diff --git a/Cargo.toml b/Cargo.toml
index 09a30b7..abfda3b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@
[package]
name = "protobuf-codegen"
-version = "2.18.0"
+version = "2.18.1"
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.0"
+version = "=2.18.1"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 01d1087..4124067 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "protobuf-codegen"
-version = "2.18.0"
+version = "2.18.1"
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.0" }
+protobuf = { path = "../protobuf", version = "=2.18.1" }
[[bin]]
diff --git a/METADATA b/METADATA
index b44593d..a3beffb 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.18.0.crate"
+ value: "https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.18.1.crate"
}
- version: "2.18.0"
+ version: "2.18.1"
license_type: NOTICE
last_upgrade_date {
year: 2020
- month: 10
- day: 6
+ month: 11
+ day: 24
}
}
diff --git a/src/lib.rs b/src/lib.rs
index 8e519d4..8011bc1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -192,7 +192,7 @@ fn gen_file(
{
let mut w = CodeWriter::new(&mut v);
- w.write_generated_by("rust-protobuf", "2.18.0");
+ w.write_generated_by("rust-protobuf", "2.18.1");
w.write_line(&format!("//! Generated file from `{}`", file.get_name()));
if customize.inside_protobuf != Some(true) {
w.write_line("");