From 92a0cbd3c30ce26498739c8f18cba6ab0cd4e7f8 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Fri, 30 Aug 2019 17:27:35 +1000
Subject: [PATCH] Remove `Compiler::compile()`.

`Compiler::compile()` is different to all the other `Compiler` methods
because it lacks a `Queries` entry. It only has one call site, which is
in a test that doesn't need its specific characteristics.

This patch removes `Compile::compile()` and replaces the call to it in
the test with a call to `Compile::codegen_and_link()`, which is similar
enough for the test's purposes.
---
 src/librustc_interface/queries.rs             | 23 +++----------------
 src/test/run-make-fulldeps/issue-19371/foo.rs |  2 +-
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/librustc_interface/queries.rs b/src/librustc_interface/queries.rs
index e8aa0e1b4533e..ca56c04bebb68 100644
--- a/src/librustc_interface/queries.rs
+++ b/src/librustc_interface/queries.rs
@@ -2,17 +2,17 @@ use crate::interface::{Compiler, Result};
 use crate::passes::{self, BoxedResolver, ExpansionResult, BoxedGlobalCtxt, PluginInfo};
 
 use rustc_incremental::DepGraphFuture;
-use rustc::session::config::{OutputFilenames, OutputType};
+use rustc::session::config::OutputFilenames;
 use rustc::util::common::{time, ErrorReported};
 use rustc::hir;
 use rustc::hir::def_id::LOCAL_CRATE;
 use rustc::ty::steal::Steal;
 use rustc::dep_graph::DepGraph;
+use std::any::Any;
 use std::cell::{Ref, RefMut, RefCell};
+use std::mem;
 use std::rc::Rc;
 use std::sync::mpsc;
-use std::any::Any;
-use std::mem;
 use syntax::{self, ast};
 
 /// Represent the result of a query.
@@ -268,21 +268,4 @@ impl Compiler {
             Ok(())
         })
     }
-
-    pub fn compile(&self) -> Result<()> {
-        self.prepare_outputs()?;
-
-        if self.session().opts.output_types.contains_key(&OutputType::DepInfo)
-            && self.session().opts.output_types.len() == 1
-        {
-            return Ok(())
-        }
-
-        self.global_ctxt()?;
-
-        // Drop AST after creating GlobalCtxt to free memory
-        mem::drop(self.expansion()?.take());
-
-        self.codegen_and_link().map(|_| ())
-    }
 }
diff --git a/src/test/run-make-fulldeps/issue-19371/foo.rs b/src/test/run-make-fulldeps/issue-19371/foo.rs
index afc92638fda97..118205671e5d8 100644
--- a/src/test/run-make-fulldeps/issue-19371/foo.rs
+++ b/src/test/run-make-fulldeps/issue-19371/foo.rs
@@ -62,6 +62,6 @@ fn compile(code: String, output: PathBuf, sysroot: PathBuf) {
     };
 
     interface::run_compiler(config, |compiler| {
-        compiler.compile().ok();
+        compiler.codegen_and_link().ok();
     });
 }