mirror of
https://github.com/rust-lang/rust.git
synced 2025-06-19 19:17:31 +00:00
1202bbaf48
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`.
r? `@petrochenkov`
|
||
|---|---|---|
| .. | ||
| assert | ||
| deriving | ||
| format_foreign | ||
| asm.rs | ||
| assert.rs | ||
| cfg_accessible.rs | ||
| cfg_eval.rs | ||
| cfg.rs | ||
| cmdline_attrs.rs | ||
| compile_error.rs | ||
| concat_bytes.rs | ||
| concat_idents.rs | ||
| concat.rs | ||
| derive.rs | ||
| edition_panic.rs | ||
| env.rs | ||
| format_foreign.rs | ||
| format.rs | ||
| global_allocator.rs | ||
| lib.rs | ||
| log_syntax.rs | ||
| proc_macro_harness.rs | ||
| source_util.rs | ||
| standard_library_imports.rs | ||
| test_harness.rs | ||
| test.rs | ||
| trace_macros.rs | ||
| util.rs | ||