aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Maurer <mmaurer@google.com>2023-05-26 23:02:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-26 23:02:41 +0000
commit53d9d586d653a351d423c48e9fc1feb11932c687 (patch)
tree031676919df9499055cd64b2037df1f547c43208
parent21af497609ef49d39fe2397b80c7c3b79c4b5663 (diff)
parent173b82ac15e3aedb1f30adf03f710aafb6e8f3e2 (diff)
downloadno-panic-53d9d586d653a351d423c48e9fc1feb11932c687.tar.gz
Update to syn-2 am: ace13297f3 am: 173b82ac15
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/no-panic/+/2523578 Change-Id: Ifda72dd775da4d242adf277bcbec3cf72f32d2a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--patches/syn-2.diff14
-rw-r--r--src/lib.rs3
2 files changed, 15 insertions, 2 deletions
diff --git a/patches/syn-2.diff b/patches/syn-2.diff
new file mode 100644
index 0000000..f552d50
--- /dev/null
+++ b/patches/syn-2.diff
@@ -0,0 +1,14 @@
+diff --git a/src/lib.rs b/src/lib.rs
+index d0be8b4..4b9981e 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -239,8 +239,7 @@ fn expand_no_panic(mut function: ItemFn) -> TokenStream2 {
+ let has_inline = function
+ .attrs
+ .iter()
+- .flat_map(Attribute::parse_meta)
+- .any(|meta| meta.path().is_ident("inline"));
++ .any(|attr| attr.meta.path().is_ident("inline"));
+ if !has_inline {
+ function.attrs.push(parse_quote!(#[inline]));
+ }
diff --git a/src/lib.rs b/src/lib.rs
index d0be8b4..4b9981e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -239,8 +239,7 @@ fn expand_no_panic(mut function: ItemFn) -> TokenStream2 {
let has_inline = function
.attrs
.iter()
- .flat_map(Attribute::parse_meta)
- .any(|meta| meta.path().is_ident("inline"));
+ .any(|attr| attr.meta.path().is_ident("inline"));
if !has_inline {
function.attrs.push(parse_quote!(#[inline]));
}