Skip to content

Commit

Permalink
Update proc-macro2 to 1.0.70
Browse files Browse the repository at this point in the history
Summary:
This release includes a fix to `proc_macro2::Ident::new` to report invalid input at the call site using #[track_caller], instead of inside proc-macro2 code.

This affects LLVM staging (which is LLVM 18) because old bindgen (<0.62.0) is incompatible with Clang 16+, manifesting as panicks in `Ident::new`. See {D40685340}.

**Before:**

```
Action failed: fbsource//third-party/rust:loopdev-0.4.0-build-script-run (buildscript)
thread 'main' panicked at '"enum_(unnamed_at_/usr/include/linux/loop_h_21_1)" is not a valid Ident', third-party/rust/vendor/proc-macro2-1.0.69/src/fallback.rs:817:9

Action failed: fbsource//third-party/rust:virt-sys-0.1.0-build-script-run (buildscript)
thread 'main' panicked at '"_virTypedParameter_union_(unnamed_at___/__/__/__/__/__/fbcode/ca3f1b68f56b9220/third-party-buck/platform010/build/libvirt/__include__/include/include/libvirt/libvirt-common_h_206_5)" is not a valid Ident', third-party/rust/vendor/proc-macro2-1.0.69/src/fallback.rs:817:9
```

**After:**

```
Action failed: fbsource//third-party/rust:loopdev-0.4.0-build-script-run (buildscript)
thread 'main' panicked at '"enum_(unnamed_at_/usr/include/linux/loop_h_21_1)" is not a valid Ident', third-party/rust/vendor/bindgen-0.59.2/src/ir/context.rs:878:9

Action failed: fbsource//third-party/rust:virt-sys-0.1.0-build-script-run (buildscript)
thread 'main' panicked at '"_virTypedParameter_union_(unnamed_at___/__/__/__/__/__/fbcode/ca3f1b68f56b9220/third-party-buck/platform010/build/libvirt/__include__/include/include/libvirt/libvirt-common_h_206_5)" is not a valid Ident', third-party/rust/vendor/bindgen-0.59.2/src/ir/context.rs:878:9
```

Of course, that panic still needs to be fixed properly. I will pursue that next. But at least the location of the faulty code is reported correctly.

Reviewed By: zertosh

Differential Revision: D51633230

fbshipit-source-id: db9794ed4ea70f773925bdaf9a11de289d2aa25c
  • Loading branch information
David Tolnay authored and facebook-github-bot committed Nov 28, 2023
1 parent 75ddb53 commit 265b633
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion vendor/ocaml/interop/macro_test_util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ test = false
doctest = false

[dependencies]
proc-macro2 = { version = "1.0.64", features = ["span-locations"] }
proc-macro2 = { version = "1.0.70", features = ["span-locations"] }
2 changes: 1 addition & 1 deletion vendor/ocaml/interop/ocamlrep_derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ doctest = false
proc-macro = true

[dependencies]
proc-macro2 = { version = "1.0.64", features = ["span-locations"] }
proc-macro2 = { version = "1.0.70", features = ["span-locations"] }
quote = "1.0.29"
syn = { version = "1.0.109", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
synstructure = "0.12"
Expand Down
2 changes: 1 addition & 1 deletion vendor/ocaml/interop/shim/third-party/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ hex = "0.4.3"
indexmap = { version = "1.9.2", features = ["arbitrary", "rayon", "serde-1"] }
md-5 = "0.10"
once_cell = "1.12"
proc-macro2 = { version = "1.0.64", features = ["span-locations"] }
proc-macro2 = { version = "1.0.70", features = ["span-locations"] }
quote = "1.0.29"
regex = "1.9.2"
rustc-hash = "1.1.0"
Expand Down

0 comments on commit 265b633

Please sign in to comment.