Upgrade rust/crates/protobuf-codegen to 2.25.1
Test: make
Change-Id: Ic4275dc64149c6400b6668693e0df455c7d5b9b0
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 1911953..051cfa6 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
{
"git": {
- "sha1": "645d02b122c3c19309d1c56dee7f771829e36d76"
+ "sha1": "d65abd3c6cee1dacef1448146b488ee168492a7d"
}
}
diff --git a/Android.bp b/Android.bp
index a6b18de..27c822e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies --tests.
+// This file is generated by cargo2android.py --run --tests.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -23,6 +23,8 @@
rust_library_host {
name: "libprotobuf_codegen",
crate_name: "protobuf_codegen",
+ cargo_env_compat: true,
+ cargo_pkg_version: "2.25.1",
srcs: ["src/lib.rs"],
edition: "2015",
rustlibs: [
@@ -33,6 +35,8 @@
rust_test_host {
name: "protobuf-codegen_host_test_src_lib",
crate_name: "protobuf_codegen",
+ cargo_env_compat: true,
+ cargo_pkg_version: "2.25.1",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
@@ -48,6 +52,8 @@
rust_binary_host {
name: "protoc-gen-rust",
crate_name: "protoc_gen_rust",
+ cargo_env_compat: true,
+ cargo_pkg_version: "2.25.1",
srcs: ["src/bin/protoc-gen-rust.rs"],
edition: "2015",
rustlibs: [
@@ -55,6 +61,3 @@
"libprotobuf_codegen",
],
}
-
-// dependent_library ["feature_list"]
-// protobuf-2.25.0
diff --git a/Cargo.lock b/Cargo.lock
index 6931493..23a2ce0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,13 +4,13 @@
[[package]]
name = "protobuf"
-version = "2.25.0"
+version = "2.25.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020f86b07722c5c4291f7c723eac4676b3892d47d9a7708dc2779696407f039b"
+checksum = "23129d50f2c9355ced935fce8a08bd706ee2e7ce2b3b33bf61dace0e379ac63a"
[[package]]
name = "protobuf-codegen"
-version = "2.25.0"
+version = "2.25.1"
dependencies = [
"protobuf",
]
diff --git a/Cargo.toml b/Cargo.toml
index 7de1119..9221304 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@
[package]
name = "protobuf-codegen"
-version = "2.25.0"
+version = "2.25.1"
authors = ["Stepan Koltsov <[email protected]>"]
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/"
@@ -33,4 +33,4 @@
path = "src/bin/protobuf-bin-gen-rust-do-not-use.rs"
test = false
[dependencies.protobuf]
-version = "=2.25.0"
+version = "=2.25.1"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 08df3a1..c223967 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "protobuf-codegen"
-version = "2.25.0"
+version = "2.25.1"
authors = ["Stepan Koltsov <[email protected]>"]
license = "MIT"
homepage = "https://github.com/stepancheg/rust-protobuf/"
@@ -17,7 +17,7 @@
bench = false
[dependencies]
-protobuf = { path = "../protobuf", version = "=2.25.0" }
+protobuf = { path = "../protobuf", version = "=2.25.1" }
[[bin]]
diff --git a/METADATA b/METADATA
index c0f176f..5ebf251 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.25.0.crate"
+ value: "https://static.crates.io/crates/protobuf-codegen/protobuf-codegen-2.25.1.crate"
}
- version: "2.25.0"
+ version: "2.25.1"
license_type: NOTICE
last_upgrade_date {
year: 2021
- month: 8
- day: 9
+ month: 9
+ day: 22
}
}
diff --git a/src/lib.rs b/src/lib.rs
index c8e0b5d..0a0316c 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.25.0");
+ w.write_generated_by("rust-protobuf", "2.25.1");
w.write_line(&format!("//! Generated file from `{}`", file.get_name()));
if customize.inside_protobuf != Some(true) {
w.write_line("");
