commit ba676d39792ea3518f8b822cc0c2626eb908905c
author Haibo Huang <hhb@google.com> Wed Aug 12 13:52:13 2020 -0700
committer Chih-Hung Hsieh <chh@google.com> Mon Aug 17 16:45:01 2020 -0700
tree 371f9b2367f6772ff5d046a1ecc559b0e0126834
parent 35dedf6a776ce77be6026b45a88fc3710c2209a0

Upgrade rust/crates/protobuf-codegen to 2.17.0

* Android.bp was regenerated. New rurstc warnings were found.
* Keep local change in src/lib.rs; set rust-protobuf version to "2.17.0".

Change-Id: I84fd880955dad26e4490b5110bd44573fde0da02
Test: make

src/extensions.rs

diff --git a/src/extensions.rs b/src/extensions.rs
index 637e18f..0740fdb 100644
--- a/src/extensions.rs
+++ b/src/extensions.rs
@@ -1,6 +1,7 @@
 use super::code_writer::CodeWriter;
 use super::rust_types_values::*;
 use field::rust_field_name_for_protobuf_field_name;
+use inside::protobuf_crate_path;
 use protobuf::descriptor::*;
 use protobuf_name::ProtobufAbsolutePath;
 use scope::RootScope;
@@ -20,6 +21,7 @@
             self.file,
             true,
             self.root_scope,
+            &self.customize,
         )
     }
 
@@ -40,6 +42,7 @@
                 self.file,
                 true,
                 self.root_scope,
+                &self.customize,
             );
             match self.field.get_field_type() {
                 FieldDescriptorProto_Type::TYPE_MESSAGE => {
@@ -59,7 +62,11 @@
         } else {
             "Optional"
         };
-        let field_type = format!("::protobuf::ext::ExtField{}", suffix);
+        let field_type = format!(
+            "{}::ext::ExtField{}",
+            protobuf_crate_path(&self.customize),
+            suffix
+        );
         w.pub_const(
             rust_field_name_for_protobuf_field_name(self.field.get_name()).get(),
             &format!(