diff options
author | Chih-Hung Hsieh <chh@google.com> | 2020-10-28 14:08:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-28 14:08:10 +0000 |
commit | c3f43cf7aff37e47dac5235d6c485cc13a1b7b11 (patch) | |
tree | 065dc5c480f8aefeed5676357fc1990a8b3ca6df | |
parent | 74a2428c5b0c55341599f1d4c1d4312a022a22ba (diff) | |
parent | 61a4270898fc358903f131bb5f55b549fc5f05e4 (diff) | |
download | thiserror-impl-c3f43cf7aff37e47dac5235d6c485cc13a1b7b11.tar.gz |
Upgrade rust/crates/thiserror-impl to 1.0.21 am: 545fd6fbe4 am: edb47677a3 am: 72339e581a am: 61a4270898
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1474959
Change-Id: I8062f0bb697023a0490115be25bc6a0cc064014f
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | Cargo.toml.orig | 2 | ||||
-rw-r--r-- | METADATA | 8 | ||||
-rw-r--r-- | 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" } } @@ -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" @@ -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" @@ -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()), } } }); |