Skip to content

Commit 1f42358

Browse files
committed
Deduplicate token stream respanner
1 parent 033114a commit 1f42358

3 files changed

Lines changed: 20 additions & 37 deletions

File tree

‎serde_derive/src/internals/attr.rs‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
use internals::respan::respan;
12
use internals::symbol::*;
23
use internals::{ungroup, Ctxt};
3-
use proc_macro2::{Group, Spacing, Span, TokenStream, TokenTree};
4+
use proc_macro2::{Spacing, Span, TokenStream, TokenTree};
45
use quote::ToTokens;
56
use std::borrow::Cow;
67
use std::collections::BTreeSet;
@@ -1949,20 +1950,5 @@ where
19491950

19501951
fn spanned_tokens(s: &syn::LitStr) -> parse::Result<TokenStream> {
19511952
let stream = syn::parse_str(&s.value())?;
1952-
Ok(respan_token_stream(stream, s.span()))
1953-
}
1954-
1955-
fn respan_token_stream(stream: TokenStream, span: Span) -> TokenStream {
1956-
stream
1957-
.into_iter()
1958-
.map(|token| respan_token_tree(token, span))
1959-
.collect()
1960-
}
1961-
1962-
fn respan_token_tree(mut token: TokenTree, span: Span) -> TokenTree {
1963-
if let TokenTree::Group(g) = &mut token {
1964-
*g = Group::new(g.delimiter(), respan_token_stream(g.stream(), span));
1965-
}
1966-
token.set_span(span);
1967-
token
1953+
Ok(respan(stream, s.span()))
19681954
}

‎serde_derive/src/internals/receiver.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
use super::respan::respan;
1+
use internals::respan::respan;
22
use proc_macro2::Span;
3+
use quote::ToTokens;
34
use std::mem;
45
use syn::punctuated::Punctuated;
56
use syn::visit_mut::{self, VisitMut};
@@ -20,7 +21,9 @@ struct ReplaceReceiver<'a>(&'a TypePath);
2021

2122
impl ReplaceReceiver<'_> {
2223
fn self_ty(&self, span: Span) -> TypePath {
23-
respan(self.0, span)
24+
let tokens = self.0.to_token_stream();
25+
let respanned = respan(tokens, span);
26+
syn::parse2(respanned).unwrap()
2427
}
2528

2629
fn self_to_qself(&self, qself: &mut Option<QSelf>, path: &mut Path) {
Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
1-
use proc_macro2::{Span, TokenStream};
2-
use quote::ToTokens;
3-
use syn::parse::Parse;
1+
use proc_macro2::{Group, Span, TokenStream, TokenTree};
42

5-
pub(crate) fn respan<T>(node: &T, span: Span) -> T
6-
where
7-
T: ToTokens + Parse,
8-
{
9-
let tokens = node.to_token_stream();
10-
let respanned = respan_tokens(tokens, span);
11-
syn::parse2(respanned).unwrap()
12-
}
13-
14-
fn respan_tokens(tokens: TokenStream, span: Span) -> TokenStream {
15-
tokens
3+
pub(crate) fn respan(stream: TokenStream, span: Span) -> TokenStream {
4+
stream
165
.into_iter()
17-
.map(|mut token| {
18-
token.set_span(span);
19-
token
20-
})
6+
.map(|token| respan_token(token, span))
217
.collect()
228
}
9+
10+
fn respan_token(mut token: TokenTree, span: Span) -> TokenTree {
11+
if let TokenTree::Group(g) = &mut token {
12+
*g = Group::new(g.delimiter(), respan(g.stream(), span));
13+
}
14+
token.set_span(span);
15+
token
16+
}

0 commit comments

Comments
 (0)