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 | 332dffb1f9964cdfcaa91853e4a65ccf6567138f (patch) | |
| tree | 97f7561841304091171be0bdfbf33a2f728ed7c6 /compiler/rustc_monomorphize/src | |
| parent | bdf520fd419cd4dea184332f57206f1cf5ca3e8f (diff) | |
| download | rust-332dffb1f9964cdfcaa91853e4a65ccf6567138f.tar.gz rust-332dffb1f9964cdfcaa91853e4a65ccf6567138f.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 'compiler/rustc_monomorphize/src')
0 files changed, 0 insertions, 0 deletions
