From 74876ef4e9b29184787f6d8f3ba447e78def3a47 Mon Sep 17 00:00:00 2001
From: "Felix S. Klock II" <pnkfelix@pnkfx.org>
Date: Thu, 3 Mar 2022 18:45:25 -0500
Subject: [PATCH] Associate multiple with a crate too.

---
 src/modules.rs | 4 ++--
 src/visitor.rs | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/modules.rs b/src/modules.rs
index d4bddd957858..64d96a5c6a6e 100644
--- a/src/modules.rs
+++ b/src/modules.rs
@@ -124,7 +124,7 @@ pub(crate) fn visit_crate(
         mut self,
         krate: &'ast ast::Crate,
     ) -> Result<FileModMap<'ast>, ModuleResolutionError> {
-        let root_filename = self.parse_sess.span_to_filename(krate.span);
+        let root_filename = self.parse_sess.span_to_filename(krate.spans.inner_span);
         self.directory.path = match root_filename {
             FileName::Real(ref p) => p.parent().unwrap_or(Path::new("")).to_path_buf(),
             _ => PathBuf::new(),
@@ -135,7 +135,7 @@ pub(crate) fn visit_crate(
             self.visit_mod_from_ast(&krate.items)?;
         }
 
-        let snippet_provider = self.parse_sess.snippet_provider(krate.span);
+        let snippet_provider = self.parse_sess.snippet_provider(krate.spans.inner_span);
 
         self.file_map.insert(
             root_filename,
diff --git a/src/visitor.rs b/src/visitor.rs
index 57a58c604846..c44b2fc6ae35 100644
--- a/src/visitor.rs
+++ b/src/visitor.rs
@@ -915,7 +915,8 @@ fn format_mod(
         let ident_str = rewrite_ident(&self.get_context(), ident).to_owned();
         self.push_str(&ident_str);
 
-        if let ast::ModKind::Loaded(ref items, ast::Inline::Yes, ast::ModSpans{ inner_span }) = mod_kind {
+        if let ast::ModKind::Loaded(ref items, ast::Inline::Yes, ref spans) = mod_kind {
+            let ast::ModSpans { inner_span } = *spans;
             match self.config.brace_style() {
                 BraceStyle::AlwaysNextLine => {
                     let indent_str = self.block_indent.to_string_with_newline(self.config);