aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Maurer <mmaurer@google.com>2023-05-26 20:22:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-26 20:22:57 +0000
commita615e438e637675c22a75f41fc24283a0703f9b6 (patch)
tree30e337998d47031fce3797b487984b3ee406d68d
parentf941cedee4218cd3627e29be592d40725f25562b (diff)
parent5dbe9b3628cc13b0c12edab32386d67d05d38d16 (diff)
downloadmerge_derive-a615e438e637675c22a75f41fc24283a0703f9b6.tar.gz
Update to syn-2 am: 5dbe9b3628
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2520381 Change-Id: I0230eb9e65060c2fd3ce5870c29c2468e981400f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--patches/syn-2.patch13
-rw-r--r--src/lib.rs2
2 files changed, 14 insertions, 1 deletions
diff --git a/patches/syn-2.patch b/patches/syn-2.patch
new file mode 100644
index 0000000..226c027
--- /dev/null
+++ b/patches/syn-2.patch
@@ -0,0 +1,13 @@
+diff --git a/src/lib.rs b/src/lib.rs
+index 75732f9..3727bf6 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -119,7 +119,7 @@ impl<'a, I: Iterator<Item = &'a syn::Attribute>> From<I> for FieldAttrs {
+ let mut field_attrs = Self::default();
+
+ for attr in iter {
+- if !attr.path.is_ident("merge") {
++ if !attr.path().is_ident("merge") {
+ continue;
+ }
+
diff --git a/src/lib.rs b/src/lib.rs
index 75732f9..3727bf6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -119,7 +119,7 @@ impl<'a, I: Iterator<Item = &'a syn::Attribute>> From<I> for FieldAttrs {
let mut field_attrs = Self::default();
for attr in iter {
- if !attr.path.is_ident("merge") {
+ if !attr.path().is_ident("merge") {
continue;
}