Skip to content

Commit bcdc758

Browse files
committed
Parenthesize other cases that require parens around impl Trait
1 parent 3a4b7c2 commit bcdc758

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

src/lifetime.rs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use proc_macro2::{Span, TokenStream};
22
use std::mem;
33
use syn::visit_mut::{self, VisitMut};
44
use syn::{
5-
parse_quote_spanned, token, Expr, GenericArgument, Lifetime, Receiver, Type, TypeImplTrait,
6-
TypeParen, TypeReference,
5+
parse_quote_spanned, token, Expr, GenericArgument, Lifetime, Receiver, ReturnType, Type,
6+
TypeBareFn, TypeImplTrait, TypeParen, TypePtr, TypeReference,
77
};
88

99
pub struct CollectLifetimes {
@@ -85,6 +85,18 @@ impl VisitMut for AddLifetimeToImplTrait {
8585
visit_mut::visit_type_reference_mut(self, ty);
8686
}
8787

88+
fn visit_type_ptr_mut(&mut self, ty: &mut TypePtr) {
89+
parenthesize_impl_trait(&mut ty.elem, ty.star_token.span);
90+
visit_mut::visit_type_ptr_mut(self, ty);
91+
}
92+
93+
fn visit_type_bare_fn_mut(&mut self, ty: &mut TypeBareFn) {
94+
if let ReturnType::Type(arrow, return_type) = &mut ty.output {
95+
parenthesize_impl_trait(return_type, arrow.spans[0]);
96+
}
97+
visit_mut::visit_type_bare_fn_mut(self, ty);
98+
}
99+
88100
fn visit_expr_mut(&mut self, _e: &mut Expr) {
89101
// Do not recurse into impl Traits inside of an array length expression.
90102
//

tests/test.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,5 +1447,6 @@ pub mod issue204 {
14471447
#[async_trait]
14481448
pub trait Trait {
14491449
async fn f(arg: &impl Trait);
1450+
async fn g(arg: *const impl Trait);
14501451
}
14511452
}

0 commit comments

Comments
 (0)