rust/compiler/rustc_parse/src/parser/attr_wrapper.rs, branch 1.81.0https://github.com/rust-lang/rust
http://git.dreamy.place/mirrors/rust/atom?h=1.81.02024-07-19T05:25:55+00:00Overhaul comments in `collect_tokens_trailing_token`.2024-07-19T05:25:55+00:00Nicholas Nethercoten.nethercote@gmail.com2024-07-15T00:37:27+00:00urn:sha1:1dd566a6d099aba748d0ff758df2db8446d4f941
Adding details, clarifying lots of little things, etc. In particular,
the commit adds details of an example. I find this very helpful, because
it's taken me a long time to understand how this code works.
Move `inner_attr` code downwards.2024-07-19T05:25:54+00:00Nicholas Nethercoten.nethercote@gmail.com2024-07-15T00:33:21+00:00urn:sha1:f9c7ca70cb3a10e0113113d054b9214b98455ae5
This puts it just before the `replace_ranges` initialization, which
makes sense because the two variables are closely related.
Remove `final_attrs` local variable.2024-07-19T05:25:54+00:00Nicholas Nethercoten.nethercote@gmail.com2024-07-12T06:03:51+00:00urn:sha1:1f67cf9e63258c57d35e8d75a2dcfa5f2e4b5cf3
It's no shorter than `ret.attrs()`, and `ret.attrs()` is used multiple
times earlier in the function.
Simplify `CaptureState::inner_attr_ranges`.2024-07-19T05:25:54+00:00Nicholas Nethercoten.nethercote@gmail.com2024-07-12T05:47:16+00:00urn:sha1:757f73f506a48ff96de54c0cb8c79a25ffbc70d9
The `Option`s within the `ReplaceRange`s within the hashmap are always
`None`. This PR omits them and inserts them when they are extracted from
the hashmap.
Remove `TrailingToken`.2024-07-18T07:28:49+00:00Nicholas Nethercoten.nethercote@gmail.com2024-07-16T14:12:24+00:00urn:sha1:487802d6c8a74ee375d2f71e3ff97cea11cc9c18
It's used in `Parser::collect_tokens_trailing_token` to decide whether
to capture a trailing token. But the callers actually know whether to
capture a trailing token, so it's simpler for them to just pass in a
bool.
Also, the `TrailingToken::Gt` case was weird, because it didn't result
in a trailing token being captured. It could have been subsumed by the
`TrailingToken::MaybeComma` case, and it effectively is in the new code.
Rollup merge of #127558 - nnethercote:more-Attribute-cleanups, r=petrochenkov2024-07-14T03:19:46+00:00Jubilee46493976+workingjubilee@users.noreply.github.com2024-07-14T03:19:46+00:00urn:sha1:125343e7abbef6717996cceef6d56479318f6032
More attribute cleanups
A follow-up to #127308.
r? ```@petrochenkov```
Change empty replace range condition.2024-07-10T04:41:39+00:00Nicholas Nethercoten.nethercote@gmail.com2024-07-10T04:41:39+00:00urn:sha1:8a390bae06dbb5686b581797b8f46cb0353dc255
The new condition is equivalent in practice, but it's much more obvious
that it would result in an empty range, because the condition lines up
with the contents of the iterator.
Move `Spacing` into `FlatToken`.2024-07-09T11:54:32+00:00Nicholas Nethercoten.nethercote@gmail.com2024-07-08T09:32:21+00:00urn:sha1:f5527949f2e819c056551a25d8fab7008facf6da
It's only needed for the `FlatToken::Token` variant. This makes things a
little more concise.
Split the stack in `make_attr_token_stream`.2024-07-08T09:04:13+00:00Nicholas Nethercoten.nethercote@gmail.com2024-07-08T08:05:18+00:00urn:sha1:a88c4d67d9ea8a9f450638f207be867fa984bfce
It makes for shorter code, and fewer allocations.
Use iterator normally in `make_attr_token_stream`.2024-07-08T09:04:13+00:00Nicholas Nethercoten.nethercote@gmail.com2024-07-08T07:41:05+00:00urn:sha1:b16201317eefa9054d545dc5237b1bc830448258
In a `for` loop, instead of a `while` loop.