From 673640d26de07e37ba34f6f77542f822fa72d54e Mon Sep 17 00:00:00 2001
From: "Felix S. Klock II" <pnkfelix@pnkfx.org>
Date: Mon, 7 Mar 2022 16:37:35 -0500
Subject: [PATCH] placate rustfmt in rustfmt.

---
 src/tools/rustfmt/src/parse/parser.rs | 8 +-------
 src/tools/rustfmt/src/visitor.rs      | 4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/tools/rustfmt/src/parse/parser.rs b/src/tools/rustfmt/src/parse/parser.rs
index ec051d93710..268c72649a6 100644
--- a/src/tools/rustfmt/src/parse/parser.rs
+++ b/src/tools/rustfmt/src/parse/parser.rs
@@ -113,13 +113,7 @@ impl<'a> Parser<'a> {
         let result = catch_unwind(AssertUnwindSafe(|| {
             let mut parser = new_parser_from_file(sess.inner(), path, Some(span));
             match parser.parse_mod(&TokenKind::Eof) {
-                Ok((a,
-                    i,
-                    ast::ModSpans {
-                        inner_span,
-                        inject_use_span: _
-                    }
-                )) => Some((a, i, inner_span)),
+                Ok((a, i, spans)) => Some((a, i, spans.inner_span)),
                 Err(mut e) => {
                     e.emit();
                     if sess.can_reset_errors() {
diff --git a/src/tools/rustfmt/src/visitor.rs b/src/tools/rustfmt/src/visitor.rs
index dcf096294f1..3ebfa551d1c 100644
--- a/src/tools/rustfmt/src/visitor.rs
+++ b/src/tools/rustfmt/src/visitor.rs
@@ -916,9 +916,9 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
         self.push_str(&ident_str);
 
         if let ast::ModKind::Loaded(ref items, ast::Inline::Yes, ref spans) = mod_kind {
-            let ast::ModSpans{
+            let ast::ModSpans {
                 inner_span,
-                inject_use_span: _
+                inject_use_span: _,
             } = *spans;
             match self.config.brace_style() {
                 BraceStyle::AlwaysNextLine => {