aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Maurer <mmaurer@google.com>2023-05-27 02:52:16 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-27 02:52:16 +0000
commitfe37fe610e28b16eb430724a2a8bbd33dd808842 (patch)
tree7ec3acd366022886880ca458757bb07333a66e33
parent2b8250b74f64b4601207689bfd9b62e69285caf3 (diff)
parenta53cb1266680881d8cd1b6c15a98cbfc45c95e6a (diff)
downloadbindgen-fe37fe610e28b16eb430724a2a8bbd33dd808842.tar.gz
Update to syn-2 am: 06ea9e5af4 am: 01485df57e am: 12cc499db7 am: f0884fc0c4 am: 36b4165cc6 am: a53cb12666
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/bindgen/+/2520775 Change-Id: I3c3c512257a6415954a2ba5fbc1501376bcd2c05 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,
});
}