From a289b8350a3044d97c6ee46fe57364ebbdae060d Mon Sep 17 00:00:00 2001
From: Michael Goulet <michael@errs.io>
Date: Thu, 6 Jun 2024 09:01:35 -0400
Subject: [PATCH] Fix rustfmt

---
 src/tools/rustfmt/src/spanned.rs |  1 +
 src/tools/rustfmt/src/types.rs   | 14 +++++---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/tools/rustfmt/src/spanned.rs b/src/tools/rustfmt/src/spanned.rs
index 4aaf7fdb27fb0..28911f8af1dfb 100644
--- a/src/tools/rustfmt/src/spanned.rs
+++ b/src/tools/rustfmt/src/spanned.rs
@@ -181,6 +181,7 @@ impl Spanned for ast::GenericBound {
         match *self {
             ast::GenericBound::Trait(ref ptr, _) => ptr.span,
             ast::GenericBound::Outlives(ref l) => l.ident.span,
+            ast::GenericBound::Use(_, span) => span,
         }
     }
 }
diff --git a/src/tools/rustfmt/src/types.rs b/src/tools/rustfmt/src/types.rs
index 7d14d9e727ab5..786d0df2e5727 100644
--- a/src/tools/rustfmt/src/types.rs
+++ b/src/tools/rustfmt/src/types.rs
@@ -563,6 +563,7 @@ impl Rewrite for ast::GenericBound {
                     .map(|s| if has_paren { format!("({})", s) } else { s })
             }
             ast::GenericBound::Outlives(ref lifetime) => lifetime.rewrite(context, shape),
+            ast::GenericBound::Use(..) => None,
         }
     }
 }
@@ -843,11 +844,7 @@ impl Rewrite for ast::Ty {
                 rewrite_macro(mac, None, context, shape, MacroPosition::Expression)
             }
             ast::TyKind::ImplicitSelf => Some(String::from("")),
-            ast::TyKind::ImplTrait(_, ref it, ref captures) => {
-                // FIXME(precise_capturing): Implement formatting.
-                if captures.is_some() {
-                    return None;
-                }
+            ast::TyKind::ImplTrait(_, ref it) => {
                 // Empty trait is not a parser error.
                 if it.is_empty() {
                     return Some("impl".to_owned());
@@ -930,7 +927,7 @@ fn rewrite_bare_fn(
 
 fn is_generic_bounds_in_order(generic_bounds: &[ast::GenericBound]) -> bool {
     let is_trait = |b: &ast::GenericBound| match b {
-        ast::GenericBound::Outlives(..) => false,
+        ast::GenericBound::Outlives(..) | ast::GenericBound::Use(..) => false,
         ast::GenericBound::Trait(..) => true,
     };
     let is_lifetime = |b: &ast::GenericBound| !is_trait(b);
@@ -964,7 +961,7 @@ fn join_bounds_inner(
 
     let generic_bounds_in_order = is_generic_bounds_in_order(items);
     let is_bound_extendable = |s: &str, b: &ast::GenericBound| match b {
-        ast::GenericBound::Outlives(..) => true,
+        ast::GenericBound::Outlives(..) | ast::GenericBound::Use(..) => true,
         ast::GenericBound::Trait(..) => last_line_extendable(s),
     };
 
@@ -1110,8 +1107,7 @@ fn join_bounds_inner(
 
 pub(crate) fn opaque_ty(ty: &Option<ptr::P<ast::Ty>>) -> Option<&ast::GenericBounds> {
     ty.as_ref().and_then(|t| match &t.kind {
-        // FIXME(precise_capturing): Implement support here
-        ast::TyKind::ImplTrait(_, bounds, _) => Some(bounds),
+        ast::TyKind::ImplTrait(_, bounds) => Some(bounds),
         _ => None,
     })
 }