diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-08-12 15:49:48 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-08-12 15:49:48 +0100 |
commit | 6dba0e1c4de3b225556f7fce70518c8ebff170a6 (patch) | |
tree | 1bf923c652e0bdb325240e27bb07e3c552a1aa07 /crates/ra_proc_macro_srv/src/rustc_server.rs | |
parent | 147547e7b85e80e2e30aa1a5ba4d9d0969908398 (diff) | |
parent | 550d7fbe3cbf2af4a47fca6c9bbefaf798cd7b7b (diff) |
Merge #5725
5725: Rename ra_tt -> tt
r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_proc_macro_srv/src/rustc_server.rs')
-rw-r--r-- | crates/ra_proc_macro_srv/src/rustc_server.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_proc_macro_srv/src/rustc_server.rs b/crates/ra_proc_macro_srv/src/rustc_server.rs index cc32d5a6d..d534d1337 100644 --- a/crates/ra_proc_macro_srv/src/rustc_server.rs +++ b/crates/ra_proc_macro_srv/src/rustc_server.rs | |||
@@ -1,15 +1,14 @@ | |||
1 | //! Rustc proc-macro server implementation with ra_tt | 1 | //! Rustc proc-macro server implementation with tt |
2 | //! | 2 | //! |
3 | //! Based on idea from https://github.com/fedochet/rust-proc-macro-expander | 3 | //! Based on idea from https://github.com/fedochet/rust-proc-macro-expander |
4 | //! The lib-proc-macro server backend is `TokenStream`-agnostic, such that | 4 | //! The lib-proc-macro server backend is `TokenStream`-agnostic, such that |
5 | //! we could provide any TokenStream implementation. | 5 | //! we could provide any TokenStream implementation. |
6 | //! The original idea from fedochet is using proc-macro2 as backend, | 6 | //! The original idea from fedochet is using proc-macro2 as backend, |
7 | //! we use ra_tt instead for better intergation with RA. | 7 | //! we use tt instead for better intergation with RA. |
8 | //! | 8 | //! |
9 | //! FIXME: No span and source file information is implemented yet | 9 | //! FIXME: No span and source file information is implemented yet |
10 | 10 | ||
11 | use crate::proc_macro::bridge::{self, server}; | 11 | use crate::proc_macro::bridge::{self, server}; |
12 | use ra_tt as tt; | ||
13 | 12 | ||
14 | use std::collections::{Bound, HashMap}; | 13 | use std::collections::{Bound, HashMap}; |
15 | use std::hash::Hash; | 14 | use std::hash::Hash; |
@@ -153,9 +152,10 @@ pub struct TokenStreamBuilder { | |||
153 | 152 | ||
154 | /// Public implementation details for the `TokenStream` type, such as iterators. | 153 | /// Public implementation details for the `TokenStream` type, such as iterators. |
155 | pub mod token_stream { | 154 | pub mod token_stream { |
156 | use super::{tt, TokenStream, TokenTree}; | ||
157 | use std::str::FromStr; | 155 | use std::str::FromStr; |
158 | 156 | ||
157 | use super::{TokenStream, TokenTree}; | ||
158 | |||
159 | /// An iterator over `TokenStream`'s `TokenTree`s. | 159 | /// An iterator over `TokenStream`'s `TokenTree`s. |
160 | /// The iteration is "shallow", e.g., the iterator doesn't recurse into delimited groups, | 160 | /// The iteration is "shallow", e.g., the iterator doesn't recurse into delimited groups, |
161 | /// and returns whole groups as token trees. | 161 | /// and returns whole groups as token trees. |