From 545fd6fbe483c50e7bea9dd12d9d6e317f1863ba Mon Sep 17 00:00:00 2001
From: Chih-Hung Hsieh <chh@google.com>
Date: Mon, 26 Oct 2020 13:16:48 -0700
Subject: Upgrade rust/crates/thiserror-impl to 1.0.21

Test: make
Change-Id: Ia5a7d8ef39a8e6904c0dd22f95a35e9c538cd51e
---
 .cargo_vcs_info.json | 2 +-
 Android.bp           | 4 ++--
 Cargo.toml           | 2 +-
 Cargo.toml.orig      | 2 +-
 METADATA             | 8 ++++----
 src/expand.rs        | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 16e6ee7..a0bee43 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "42b537acf08de385dcf6138f24e3274ff8a18148"
+    "sha1": "f757a0489b2cddfea15ab870b49f159ce1aa71cd"
   }
 }
diff --git a/Android.bp b/Android.bp
index 0dcb9ca..05b1130 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,7 +13,7 @@ rust_proc_macro {
 }
 
 // dependent_library ["feature_list"]
-//   proc-macro2-1.0.18 "default,proc-macro"
+//   proc-macro2-1.0.24 "default,proc-macro"
 //   quote-1.0.7 "default,proc-macro"
-//   syn-1.0.34 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
+//   syn-1.0.48 "clone-impls,default,derive,parsing,printing,proc-macro,quote"
 //   unicode-xid-0.2.1 "default"
diff --git a/Cargo.toml b/Cargo.toml
index 26a856d..b38f58a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "thiserror-impl"
-version = "1.0.20"
+version = "1.0.21"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 description = "Implementation detail of the `thiserror` crate"
 license = "MIT OR Apache-2.0"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index ebcfe35..ff97c59 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "thiserror-impl"
-version = "1.0.20"
+version = "1.0.21"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
diff --git a/METADATA b/METADATA
index 0c72b74..d2622e0 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.20.crate"
+    value: "https://static.crates.io/crates/thiserror-impl/thiserror-impl-1.0.21.crate"
   }
-  version: "1.0.20"
+  version: "1.0.21"
   license_type: NOTICE
   last_upgrade_date {
     year: 2020
-    month: 8
-    day: 27
+    month: 10
+    day: 26
   }
 }
diff --git a/src/expand.rs b/src/expand.rs
index 9235e8f..d712146 100644
--- a/src/expand.rs
+++ b/src/expand.rs
@@ -367,7 +367,7 @@ fn from_initializer(from_field: &Field, backtrace_field: Option<&Field>) -> Toke
             }
         } else {
             quote! {
-                #backtrace_member: std::backtrace::Backtrace::capture(),
+                #backtrace_member: std::convert::From::from(std::backtrace::Backtrace::capture()),
             }
         }
     });
-- 
cgit v1.2.3