Parenthesize other cases that require parens around impl Trait

dtolnay · Jun 2, 2022 · bcdc758 · bcdc758
1 parent 3a4b7c2
commit bcdc758
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/lifetime.rs b/src/lifetime.rs
@@ -2,8 +2,8 @@ use proc_macro2::{Span, TokenStream};
 use std::mem;
 use syn::visit_mut::{self, VisitMut};
 use syn::{
-    parse_quote_spanned, token, Expr, GenericArgument, Lifetime, Receiver, Type, TypeImplTrait,
-    TypeParen, TypeReference,
+    parse_quote_spanned, token, Expr, GenericArgument, Lifetime, Receiver, ReturnType, Type,
+    TypeBareFn, TypeImplTrait, TypeParen, TypePtr, TypeReference,
 };
 
 pub struct CollectLifetimes {
@@ -85,6 +85,18 @@ impl VisitMut for AddLifetimeToImplTrait {
         visit_mut::visit_type_reference_mut(self, ty);
     }
 
+    fn visit_type_ptr_mut(&mut self, ty: &mut TypePtr) {
+        parenthesize_impl_trait(&mut ty.elem, ty.star_token.span);
+        visit_mut::visit_type_ptr_mut(self, ty);
+    }
+
+    fn visit_type_bare_fn_mut(&mut self, ty: &mut TypeBareFn) {
+        if let ReturnType::Type(arrow, return_type) = &mut ty.output {
+            parenthesize_impl_trait(return_type, arrow.spans[0]);
+        }
+        visit_mut::visit_type_bare_fn_mut(self, ty);
+    }
+
     fn visit_expr_mut(&mut self, _e: &mut Expr) {
         // Do not recurse into impl Traits inside of an array length expression.
         //

diff --git a/tests/test.rs b/tests/test.rs
@@ -1447,5 +1447,6 @@ pub mod issue204 {
     #[async_trait]
     pub trait Trait {
         async fn f(arg: &impl Trait);
+        async fn g(arg: *const impl Trait);
     }
 }