From ad75cef3e34bb7e8c09d9074957f2e89c7587b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=9C=AA=E6=9D=A5?= <xuweilai2@huawei.com>
Date: Tue, 2 Apr 2024 15:05:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8Dsyn=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E8=87=B32.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 徐未来 <xuweilai2@huawei.com>
---
 bindgen/Cargo.toml                                    | 2 +-
 bindgen/codegen/postprocessing/merge_extern_blocks.rs | 2 ++
 bindgen/codegen/postprocessing/sort_semantically.rs   | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bindgen/Cargo.toml b/bindgen/Cargo.toml
index bc53be5d..bcc46e45 100644
--- a/bindgen/Cargo.toml
+++ b/bindgen/Cargo.toml
@@ -32,7 +32,7 @@ lazycell = "1"
 lazy_static = "1"
 peeking_take_while = "0.1.2"
 quote = { version = "1", default-features = false }
-syn = { version = "1.0.99", features = ["full", "extra-traits", "visit-mut"]}
+syn = { version = "2.0", features = ["full", "extra-traits", "visit-mut"]}
 regex = { version = "1.5", default-features = false , features = ["std", "unicode"] }
 which = { version = "4.2.1", optional = true, default-features = false }
 shlex = "1"
diff --git a/bindgen/codegen/postprocessing/merge_extern_blocks.rs b/bindgen/codegen/postprocessing/merge_extern_blocks.rs
index 05e7e9ef..eb91683e 100644
--- a/bindgen/codegen/postprocessing/merge_extern_blocks.rs
+++ b/bindgen/codegen/postprocessing/merge_extern_blocks.rs
@@ -20,6 +20,7 @@ impl VisitMut for Visitor {
                     attrs,
                     abi,
                     brace_token,
+                    unsafety,
                     items: extern_block_items,
                 }) = item
                 {
@@ -45,6 +46,7 @@ impl VisitMut for Visitor {
                             attrs,
                             abi,
                             brace_token,
+                            unsafety,
                             items: extern_block_items,
                         });
                     }
diff --git a/bindgen/codegen/postprocessing/sort_semantically.rs b/bindgen/codegen/postprocessing/sort_semantically.rs
index 4f23ab73..71fb75c4 100644
--- a/bindgen/codegen/postprocessing/sort_semantically.rs
+++ b/bindgen/codegen/postprocessing/sort_semantically.rs
@@ -29,7 +29,6 @@ impl VisitMut for Visitor {
                 Item::ExternCrate(_) => 13,
                 Item::ForeignMod(_) => 14,
                 Item::Macro(_) => 15,
-                Item::Macro2(_) => 16,
                 _ => 18,
             });
         }
-- 
Gitee