diff options
| author | Nicholas Nethercote <n.nethercote@gmail.com> | 2022-07-28 10:31:04 +1000 |
|---|---|---|
| committer | Nicholas Nethercote <n.nethercote@gmail.com> | 2022-07-29 15:52:15 +1000 |
| commit | af72f7a17f01a2d61490556e32c91c2d98416c9b (patch) | |
| tree | 4b1256f4db301b1a38d1bad33b0b35fab0d7ab36 /tests/mir-opt/lower_array_len.array_bound_mut.NormalizeArrayLen.diff | |
| parent | f026688c2abd95fdfabe50ace0a422004d4c47d5 (diff) | |
| download | rust-af72f7a17f01a2d61490556e32c91c2d98416c9b.tar.gz rust-af72f7a17f01a2d61490556e32c91c2d98416c9b.zip | |
Remove `TreeAndSpacing`.
A `TokenStream` contains a `Lrc<Vec<(TokenTree, Spacing)>>`. But this is
not quite right. `Spacing` makes sense for `TokenTree::Token`, but does
not make sense for `TokenTree::Delimited`, because a
`TokenTree::Delimited` cannot be joined with another `TokenTree`.
This commit fixes this problem, by adding `Spacing` to `TokenTree::Token`,
changing `TokenStream` to contain a `Lrc<Vec<TokenTree>>`, and removing the
`TreeAndSpacing` typedef.
The commit removes these two impls:
- `impl From<TokenTree> for TokenStream`
- `impl From<TokenTree> for TreeAndSpacing`
These were useful, but also resulted in code with many `.into()` calls
that was hard to read, particularly for anyone not highly familiar with
the relevant types. This commit makes some other changes to compensate:
- `TokenTree::token()` becomes `TokenTree::token_{alone,joint}()`.
- `TokenStream::token_{alone,joint}()` are added.
- `TokenStream::delimited` is added.
This results in things like this:
```rust
TokenTree::token(token::Semi, stmt.span).into()
```
changing to this:
```rust
TokenStream::token_alone(token::Semi, stmt.span)
```
This makes the type of the result, and its spacing, clearer.
These changes also simplifies `Cursor` and `CursorRef`, because they no longer
need to distinguish between `next` and `next_with_spacing`.
Diffstat (limited to 'tests/mir-opt/lower_array_len.array_bound_mut.NormalizeArrayLen.diff')
0 files changed, 0 insertions, 0 deletions
