Remove two unnecessary pub use statements.

- `setup_callbacks` is only used within the crate.
- `rustc_interface::interface` is public, so there's no need for things
  within it to be re-exported.

Author: nnethercote

compiler/rustc_interface/src/callbacks.rs

@@ -98,7 +98,7 @@ pub fn dep_node_debug(node: DepNode, f: &mut std::fmt::Formatter<'_>) -> std::fm
 
 /// Sets up the callbacks in prior crates which we want to refer to the
 /// TyCtxt in.
-pub fn setup_callbacks() {
+pub(crate) fn setup_callbacks() {
     rustc_span::SPAN_TRACK.swap(&(track_span_parent as fn(_)));
     rustc_hir::def_id::DEF_ID_DEBUG.swap(&(def_id_debug as fn(_, &mut fmt::Formatter<'_>) -> _));
     rustc_query_system::dep_graph::dep_node::DEP_KIND_DEBUG

compiler/rustc_interface/src/lib.rs

@@ -24,8 +24,6 @@ mod proc_macro_decls;
 mod queries;
 pub mod util;
 
-pub use callbacks::setup_callbacks;
-pub use interface::{run_compiler, Config};
 pub use passes::DEFAULT_QUERY_PROVIDERS;
 pub use queries::Queries;
 

src/librustdoc/core.rs

@@ -198,7 +198,7 @@ pub(crate) fn create_config(
         ..
     }: RustdocOptions,
     RenderOptions { document_private, .. }: &RenderOptions,
-) -> rustc_interface::Config {
+) -> interface::Config {
     // Add the doc cfg into the doc build.
     cfgs.push("doc".to_string());
 

tests/run-make-fulldeps/obtain-borrowck/driver.rs

@@ -22,8 +22,8 @@ use rustc_borrowck::consumers::{self, BodyWithBorrowckFacts, ConsumerOptions};
 use rustc_driver::Compilation;
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::LocalDefId;
-use rustc_interface::interface::Compiler;
-use rustc_interface::{Config, Queries};
+use rustc_interface::interface::{Compiler, Config};
+use rustc_interface::Queries;
 use rustc_middle::query::queries::mir_borrowck::ProvidedValue;
 use rustc_middle::ty::TyCtxt;
 use rustc_middle::util::Providers;