Skip to content

Commit bce0e5f

Browse files
committed
Consistently use Self in the return of From impls
1 parent 3915aee commit bce0e5f

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

src/fallback.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ impl Debug for TokenStream {
234234

235235
#[cfg(use_proc_macro)]
236236
impl From<proc_macro::TokenStream> for TokenStream {
237-
fn from(inner: proc_macro::TokenStream) -> TokenStream {
237+
fn from(inner: proc_macro::TokenStream) -> Self {
238238
inner
239239
.to_string()
240240
.parse()
@@ -244,7 +244,7 @@ impl From<proc_macro::TokenStream> for TokenStream {
244244

245245
#[cfg(use_proc_macro)]
246246
impl From<TokenStream> for proc_macro::TokenStream {
247-
fn from(inner: TokenStream) -> proc_macro::TokenStream {
247+
fn from(inner: TokenStream) -> Self {
248248
inner
249249
.to_string()
250250
.parse()
@@ -253,7 +253,7 @@ impl From<TokenStream> for proc_macro::TokenStream {
253253
}
254254

255255
impl From<TokenTree> for TokenStream {
256-
fn from(tree: TokenTree) -> TokenStream {
256+
fn from(tree: TokenTree) -> Self {
257257
let mut stream = RcVecBuilder::new();
258258
push_token_from_proc_macro(stream.as_mut(), tree);
259259
TokenStream {

src/lib.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -231,14 +231,14 @@ impl FromStr for TokenStream {
231231

232232
#[cfg(use_proc_macro)]
233233
impl From<proc_macro::TokenStream> for TokenStream {
234-
fn from(inner: proc_macro::TokenStream) -> TokenStream {
234+
fn from(inner: proc_macro::TokenStream) -> Self {
235235
TokenStream::_new(inner.into())
236236
}
237237
}
238238

239239
#[cfg(use_proc_macro)]
240240
impl From<TokenStream> for proc_macro::TokenStream {
241-
fn from(inner: TokenStream) -> proc_macro::TokenStream {
241+
fn from(inner: TokenStream) -> Self {
242242
inner.inner.into()
243243
}
244244
}
@@ -574,25 +574,25 @@ impl TokenTree {
574574
}
575575

576576
impl From<Group> for TokenTree {
577-
fn from(g: Group) -> TokenTree {
577+
fn from(g: Group) -> Self {
578578
TokenTree::Group(g)
579579
}
580580
}
581581

582582
impl From<Ident> for TokenTree {
583-
fn from(g: Ident) -> TokenTree {
583+
fn from(g: Ident) -> Self {
584584
TokenTree::Ident(g)
585585
}
586586
}
587587

588588
impl From<Punct> for TokenTree {
589-
fn from(g: Punct) -> TokenTree {
589+
fn from(g: Punct) -> Self {
590590
TokenTree::Punct(g)
591591
}
592592
}
593593

594594
impl From<Literal> for TokenTree {
595-
fn from(g: Literal) -> TokenTree {
595+
fn from(g: Literal) -> Self {
596596
TokenTree::Literal(g)
597597
}
598598
}

src/wrapper.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,13 @@ impl Display for TokenStream {
131131
}
132132

133133
impl From<proc_macro::TokenStream> for TokenStream {
134-
fn from(inner: proc_macro::TokenStream) -> TokenStream {
134+
fn from(inner: proc_macro::TokenStream) -> Self {
135135
TokenStream::Compiler(DeferredTokenStream::new(inner))
136136
}
137137
}
138138

139139
impl From<TokenStream> for proc_macro::TokenStream {
140-
fn from(inner: TokenStream) -> proc_macro::TokenStream {
140+
fn from(inner: TokenStream) -> Self {
141141
match inner {
142142
TokenStream::Compiler(inner) => inner.into_token_stream(),
143143
TokenStream::Fallback(inner) => inner.to_string().parse().unwrap(),
@@ -146,7 +146,7 @@ impl From<TokenStream> for proc_macro::TokenStream {
146146
}
147147

148148
impl From<fallback::TokenStream> for TokenStream {
149-
fn from(inner: fallback::TokenStream) -> TokenStream {
149+
fn from(inner: fallback::TokenStream) -> Self {
150150
TokenStream::Fallback(inner)
151151
}
152152
}
@@ -170,7 +170,7 @@ fn into_compiler_token(token: TokenTree) -> proc_macro::TokenTree {
170170
}
171171

172172
impl From<TokenTree> for TokenStream {
173-
fn from(token: TokenTree) -> TokenStream {
173+
fn from(token: TokenTree) -> Self {
174174
if inside_proc_macro() {
175175
TokenStream::Compiler(DeferredTokenStream::new(into_compiler_token(token).into()))
176176
} else {
@@ -263,13 +263,13 @@ impl LexError {
263263
}
264264

265265
impl From<proc_macro::LexError> for LexError {
266-
fn from(e: proc_macro::LexError) -> LexError {
266+
fn from(e: proc_macro::LexError) -> Self {
267267
LexError::Compiler(e)
268268
}
269269
}
270270

271271
impl From<fallback::LexError> for LexError {
272-
fn from(e: fallback::LexError) -> LexError {
272+
fn from(e: fallback::LexError) -> Self {
273273
LexError::Fallback(e)
274274
}
275275
}
@@ -539,13 +539,13 @@ impl Span {
539539
}
540540

541541
impl From<proc_macro::Span> for crate::Span {
542-
fn from(proc_span: proc_macro::Span) -> crate::Span {
542+
fn from(proc_span: proc_macro::Span) -> Self {
543543
crate::Span::_new(Span::Compiler(proc_span))
544544
}
545545
}
546546

547547
impl From<fallback::Span> for Span {
548-
fn from(inner: fallback::Span) -> Span {
548+
fn from(inner: fallback::Span) -> Self {
549549
Span::Fallback(inner)
550550
}
551551
}
@@ -929,7 +929,7 @@ impl Literal {
929929
}
930930

931931
impl From<fallback::Literal> for Literal {
932-
fn from(s: fallback::Literal) -> Literal {
932+
fn from(s: fallback::Literal) -> Self {
933933
Literal::Fallback(s)
934934
}
935935
}

0 commit comments

Comments
 (0)