aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Maurer <mmaurer@google.com>2023-05-27 00:57:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-27 00:57:51 +0000
commit36b4165cc680b61f6872cdd9884f13f1e4880e5f (patch)
tree7ec3acd366022886880ca458757bb07333a66e33
parent971fa1cd387982843d857bd24989462a496e4c81 (diff)
parentf0884fc0c4a525619e0d0ca0a697d7555b49de6b (diff)
downloadbindgen-36b4165cc680b61f6872cdd9884f13f1e4880e5f.tar.gz
Update to syn-2 am: 06ea9e5af4 am: 01485df57e am: 12cc499db7 am: f0884fc0c4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bindgen/+/2520775 Change-Id: I2accbeacea1b21b2d59c23ee041d41eea7610524 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Cargo.toml2
-rw-r--r--codegen/postprocessing/merge_extern_blocks.rs2
-rw-r--r--codegen/postprocessing/sort_semantically.rs1
3 files changed, 3 insertions, 2 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 15868cd..a0119c4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -87,7 +87,7 @@ version = "1.0.1"
version = "1"
[dependencies.syn]
-version = "1.0.99"
+version = "2"
features = [
"full",
"extra-traits",
diff --git a/codegen/postprocessing/merge_extern_blocks.rs b/codegen/postprocessing/merge_extern_blocks.rs
index 05e7e9e..8dacedf 100644
--- a/codegen/postprocessing/merge_extern_blocks.rs
+++ b/codegen/postprocessing/merge_extern_blocks.rs
@@ -21,6 +21,7 @@ impl VisitMut for Visitor {
abi,
brace_token,
items: extern_block_items,
+ unsafety,
}) = item
{
let mut exists = false;
@@ -46,6 +47,7 @@ impl VisitMut for Visitor {
abi,
brace_token,
items: extern_block_items,
+ unsafety,
});
}
} else {
diff --git a/codegen/postprocessing/sort_semantically.rs b/codegen/postprocessing/sort_semantically.rs
index 4f23ab7..71fb75c 100644
--- a/codegen/postprocessing/sort_semantically.rs
+++ b/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,
});
}