Rollup merge of #86274 - alexander-melentyev:spaces, r=bjorn3

[rust.git] / src / formatting.rs

diff --git a/src/formatting.rs b/src/formatting.rs
index e42864a50556fa758920b090994eb80b2d274e47..b69ecdc5cb8ae2985065bf54c5872d0528f1ac69 100644 (file)
--- a/src/formatting.rs
+++ b/src/formatting.rs
@@ -92,7 +92,7 @@ fn format_project<T: FormatHandler>(
     let mut context = FormatContext::new(&krate, report, parse_session, config, handler);
     let files = modules::ModResolver::new(
         &context.parse_session,
-        directory_ownership.unwrap_or(DirectoryOwnership::UnownedViaMod),
+        directory_ownership.unwrap_or(DirectoryOwnership::UnownedViaBlock),
         !input_is_stdin && !config.skip_children(),
     )
     .visit_crate(&krate)?;
@@ -145,7 +145,7 @@ fn format_file(
         module: &Module<'_>,
         is_macro_def: bool,
     ) -> Result<(), ErrorKind> {
-        let snippet_provider = self.parse_session.snippet_provider(module.as_ref().inner);
+        let snippet_provider = self.parse_session.snippet_provider(module.span);
         let mut visitor = FmtVisitor::from_parse_sess(
             &self.parse_session,
             &self.config,