aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-05-20 13:48:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-20 13:48:49 +0000
commit595c77723bbddee82ea0ada9dc7a8d7ad4b8c4d6 (patch)
tree7f97e023b2aeb93b01adeba355e1f7e251827bac
parentfabfe66e3916d2533c3e806840143ccbe4c34366 (diff)
parentf7e7e7cd6c0c375a189d02fd2875b5d7a741f4d0 (diff)
downloadprotobuf-codegen-595c77723bbddee82ea0ada9dc7a8d7ad4b8c4d6.tar.gz
Upgrade rust/crates/protobuf-codegen to 2.23.0 am: cb467aef5c am: d43fed9e73 am: fb0c21d2ef am: f7e7e7cd6c
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/protobuf-codegen/+/1712829 Change-Id: I265f02a2dc228990a533fcc89b7bccfec177578f
-rw-r--r--.cargo_vcs_info.json2
-rw-r--r--Android.bp2
-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
-rw-r--r--src/protobuf_name.rs4
8 files changed, 16 insertions, 16 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 0be67b3..fd60efa 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
{
"git": {
- "sha1": "3eabf141db9d0d69961ba8a1eaf2907c7aeb8ff9"
+ "sha1": "0d3e6a3e72f0276f7c09ca119873f3ba7404a459"
}
}
diff --git a/Android.bp b/Android.bp
index e180529..b72b70e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,4 +57,4 @@ rust_binary_host {
}
// dependent_library ["feature_list"]
-// protobuf-2.22.1
+// protobuf-2.23.0
diff --git a/Cargo.lock b/Cargo.lock
index 8d6fde0..df48d45 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,13 +4,13 @@ version = 3
[[package]]
name = "protobuf"
-version = "2.22.1"
+version = "2.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b7f4a129bb3754c25a4e04032a90173c68f85168f77118ac4cb4936e7f06f92"
+checksum = "45604fc7a88158e7d514d8e22e14ac746081e7a70d7690074dd0029ee37458d6"
[[package]]
name = "protobuf-codegen"
-version = "2.22.1"
+version = "2.23.0"
dependencies = [
"protobuf",
]
diff --git a/Cargo.toml b/Cargo.toml
index b594d67..d8aa116 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@
[package]
name = "protobuf-codegen"
-version = "2.22.1"
+version = "2.23.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.22.1"
+version = "=2.23.0"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 07931fd..9341bf6 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "protobuf-codegen"
-version = "2.22.1"
+version = "2.23.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.22.1" }
+protobuf = { path = "../protobuf", version = "=2.23.0" }
[[bin]]
diff --git a/METADATA b/METADATA
index e905992..b7b1d94 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.22.1.crate"
+ value: "https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.23.0.crate"
}
- version: "2.22.1"
+ version: "2.23.0"
license_type: NOTICE
last_upgrade_date {
year: 2021
- month: 4
- day: 1
+ month: 5
+ day: 19
}
}
diff --git a/src/lib.rs b/src/lib.rs
index 3458957..7473103 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.22.1");
+ w.write_generated_by("rust-protobuf", "2.23.0");
w.write_line(&format!("//! Generated file from `{}`", file.get_name()));
if customize.inside_protobuf != Some(true) {
w.write_line("");
diff --git a/src/protobuf_name.rs b/src/protobuf_name.rs
index 03163e3..c40a69c 100644
--- a/src/protobuf_name.rs
+++ b/src/protobuf_name.rs
@@ -245,8 +245,8 @@ impl ProtobufAbsolutePath {
/// From string.
pub fn new(path: String) -> ProtobufAbsolutePath {
- assert!(path.is_empty() || path.starts_with("."), path);
- assert!(!path.ends_with("."), path);
+ assert!(path.is_empty() || path.starts_with("."), "{}", path);
+ assert!(!path.ends_with("."), "{}", path);
ProtobufAbsolutePath { path }
}