Upgrade rust/crates/protobuf-codegen to 2.23.0
Test: make
Change-Id: If547ecb7da5e165d468f21b9304b815841b8b383
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 @@
}
// 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 @@
[[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 @@
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 @@
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 @@
}
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 @@
{
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 @@
/// 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 }
}
