Merge "Regenerate .bp and replace env!("...") expressions" am: 3e7a4060f4 am: f515502965 am: 8db7ce732d am: 08de407d53

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bindgen/+/1485262

Change-Id: I2eed6cf4b18d13aa4c07864c50859db0ed93a8fa

3 files changed, 22 insertions, 22 deletions

diff --git a/Android.bp b/Android.bp
index 7bfcaac..aacf281 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,31 +81,31 @@ rust_library_host {
 
 // dependent_library ["feature_list"]
 //   ansi_term-0.11.0
-//   atty-0.2.13
-//   bitflags-1.2.0 "default"
-//   byteorder-1.3.2 "default,std"
+//   atty-0.2.14
+//   bitflags-1.2.1 "default"
 //   cexpr-0.4.0
 //   cfg-if-0.1.10
-//   clang-sys-1.0.0 "clang_3_5,clang_3_6,clang_3_7,clang_3_8,clang_3_9,clang_4_0,clang_5_0,clang_6_0,libloading,runtime"
-//   clap-2.33.0 "ansi_term,atty,color,default,strsim,suggestions,vec_map"
+//   cfg-if-1.0.0
+//   clang-sys-1.0.1 "clang_3_5,clang_3_6,clang_3_7,clang_3_8,clang_3_9,clang_4_0,clang_5_0,clang_6_0,libloading,runtime"
+//   clap-2.33.3 "ansi_term,atty,color,default,strsim,suggestions,vec_map"
 //   glob-0.3.0
 //   lazy_static-1.4.0
-//   lazycell-1.2.1
-//   libc-0.2.66 "default,std"
-//   libloading-0.6.2
-//   memchr-2.2.1 "use_std"
-//   nom-5.1.1 "alloc,std"
+//   lazycell-1.3.0
+//   libc-0.2.80 "default,std"
+//   libloading-0.6.5
+//   memchr-2.3.4 "std,use_std"
+//   nom-5.1.2 "alloc,std"
 //   peeking_take_while-0.1.2
-//   proc-macro2-1.0.4
-//   quote-1.0.2
-//   regex-1.3.1 "std,unicode,unicode-age,unicode-bool,unicode-case,unicode-gencat,unicode-perl,unicode-script,unicode-segment"
-//   regex-syntax-0.6.12 "unicode-age,unicode-bool,unicode-case,unicode-gencat,unicode-perl,unicode-script,unicode-segment"
-//   rustc-hash-1.0.1
+//   proc-macro2-1.0.24
+//   quote-1.0.7
+//   regex-1.4.2 "std,unicode,unicode-age,unicode-bool,unicode-case,unicode-gencat,unicode-perl,unicode-script,unicode-segment"
+//   regex-syntax-0.6.21 "unicode,unicode-age,unicode-bool,unicode-case,unicode-gencat,unicode-perl,unicode-script,unicode-segment"
+//   rustc-hash-1.1.0 "default,std"
 //   shlex-0.1.1
 //   strsim-0.8.0
 //   textwrap-0.11.0
-//   unicode-width-0.1.6 "default"
-//   unicode-xid-0.2.0 "default"
-//   vec_map-0.8.1
-//   version_check-0.9.1
-//   which-3.0.0
+//   unicode-width-0.1.8 "default"
+//   unicode-xid-0.2.1 "default"
+//   vec_map-0.8.2
+//   version_check-0.9.2
+//   which-3.1.1
diff --git a/src/lib.rs b/src/lib.rs
index 08b9381..8302b08 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2150,7 +2150,7 @@ impl Bindings {
     /// Write these bindings as source text to the given `Write`able.
     pub fn write<'a>(&self, mut writer: Box<dyn Write + 'a>) -> io::Result<()> {
         if !self.options.disable_header_comment {
-            let version = option_env!("CARGO_PKG_VERSION");
+            let version = Some("0.55.1");
             let header = format!(
                 "/* automatically generated by rust-bindgen {} */\n\n",
                 version.unwrap_or("(unknown version)")
diff --git a/src/options.rs b/src/options.rs
index a850dbb..e2978c6 100644
--- a/src/options.rs
+++ b/src/options.rs
@@ -23,7 +23,7 @@ where
     );
 
     let matches = App::new("bindgen")
-        .version(option_env!("CARGO_PKG_VERSION").unwrap_or("unknown"))
+        .version(Some("0.55.1").unwrap_or("unknown"))
         .about("Generates Rust bindings from C/C++ headers.")
         .usage("bindgen [FLAGS] [OPTIONS] <header> -- <clang-args>...")
         .args(&[