diff options
| author | bors <bors@rust-lang.org> | 2021-09-22 19:40:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-09-22 19:40:13 +0000 |
| commit | 308dffd25cb55bbb4a1fbee9822cf82c6a5d012d (patch) | |
| tree | 73d3e17944183d82799540460c59c291baba211a /compiler/rustc_parse/src/parser | |
| parent | cfff31bc833070a00578bd6178160aeed56f28ba (diff) | |
| parent | 26c783811858dca1ac37d7ee113e0bd13891420a (diff) | |
| download | rust-308dffd25cb55bbb4a1fbee9822cf82c6a5d012d.tar.gz rust-308dffd25cb55bbb4a1fbee9822cf82c6a5d012d.zip | |
Auto merge of #89179 - the8472:rollup-moxrtaj, r=the8472
Rollup of 8 pull requests
Successful merges:
- #89036 (Fix missing `no_global_oom_handling` cfg-gating)
- #89041 (Work around invalid DWARF bugs for fat LTO)
- #89046 ("Fix" an overflow in byte position math)
- #89127 (Re-enable the `src/test/debuginfo/mutex.rs` test on Windows)
- #89133 (Fix ICE with `--cap-lints=allow` and `-Zfuel=...=0`)
- #89162 (rustc_index: Add some map-like APIs to `IndexVec`)
- #89164 (Document `--show-type-layout` in the rustdoc book)
- #89170 (Disable the leak sanitizer on Macos aarch64 for now)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src/parser')
| -rw-r--r-- | compiler/rustc_parse/src/parser/expr.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs index c62ea66b693..fe0468c6956 100644 --- a/compiler/rustc_parse/src/parser/expr.rs +++ b/compiler/rustc_parse/src/parser/expr.rs @@ -1084,6 +1084,7 @@ impl<'a> Parser<'a> { /// If we encounter a parser state that looks like the user has written a `struct` literal with /// parentheses instead of braces, recover the parser state and provide suggestions. + #[instrument(skip(self, seq, snapshot), level = "trace")] fn maybe_recover_struct_lit_bad_delims( &mut self, lo: Span, |