Avoid one more call site to `Compiler::expansion`

diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs
index 66dadf97b1987952c67b860e7c7adf2fb42c8d74..98c4383b62ea32032919ad76d920613733899a09 100644 (file)
--- a/compiler/rustc_driver/src/lib.rs
+++ b/compiler/rustc_driver/src/lib.rs
@@ -328,7 +328,7 @@ fn run_compiler(
                 }
             }
 
-            queries.expansion()?;
+            queries.global_ctxt()?;
             if callbacks.after_expansion(compiler, queries) == Compilation::Stop {
                 return early_exit();
             }

diff --git a/compiler/rustc_interface/src/queries.rs b/compiler/rustc_interface/src/queries.rs
index dcfb4f43bd01850ec7e05e82cb2c7f88b056c05a..d5a49dd75be6a06bf7a7efa310342a139c15335b 100644 (file)
--- a/compiler/rustc_interface/src/queries.rs
+++ b/compiler/rustc_interface/src/queries.rs
@@ -157,7 +157,7 @@ pub fn register_plugins(&self) -> Result<QueryResult<'_, (ast::Crate, Lrc<LintSt
         })
     }
 
-    pub fn crate_name(&self) -> Result<QueryResult<'_, Symbol>> {
+    fn crate_name(&self) -> Result<QueryResult<'_, Symbol>> {
         self.crate_name.compute(|| {
             Ok({
                 let parse_result = self.parse()?;