Update to syn-2 am: 5dbe9b3628 am: a615e438e6 am: 842a3d2868 am: 22a9bf8b6d

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

Change-Id: Iccc4afb7dab3322f00052cff96566c8beafd2701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;
             }