Move rustc_smir to driver

Cargo.lock

@@ -3346,8 +3346,6 @@ dependencies = [
  "rustc_codegen_ssa",
  "rustc_driver",
  "rustc_driver_impl",
- "rustc_smir",
- "stable_mir",
 ]
 
 [[package]]
@@ -3770,6 +3768,7 @@ dependencies = [
  "rustc_trait_selection",
  "rustc_ty_utils",
  "serde_json",
+ "stable_mir",
  "time",
  "tracing",
  "windows",
@@ -4500,21 +4499,6 @@ dependencies = [
  "windows",
 ]
 
-[[package]]
-name = "rustc_smir"
-version = "0.0.0"
-dependencies = [
- "rustc_data_structures",
- "rustc_driver",
- "rustc_hir",
- "rustc_interface",
- "rustc_middle",
- "rustc_span",
- "rustc_target",
- "stable_mir",
- "tracing",
-]
-
 [[package]]
 name = "rustc_span"
 version = "0.0.0"

compiler/rustc/Cargo.toml

@@ -10,10 +10,7 @@ rustc_driver_impl = { path = "../rustc_driver_impl" }
 # Make sure rustc_codegen_ssa ends up in the sysroot, because this
 # crate is intended to be used by codegen backends, which may not be in-tree.
 rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
-# Make sure rustc_smir ends up in the sysroot, because this
-# crate is intended to be used by stable MIR consumers, which are not in-tree
-rustc_smir = { path = "../rustc_smir" }
-stable_mir = { path = "../stable_mir" }
+
 
 [dependencies.jemalloc-sys]
 version = "0.5.0"

compiler/rustc_driver_impl/Cargo.toml

@@ -53,6 +53,7 @@ rustc_ast = { path = "../rustc_ast" }
 rustc_span = { path = "../rustc_span" }
 rustc_hir_analysis = { path = "../rustc_hir_analysis" }
 rustc_mir_transform = { path = "../rustc_mir_transform" }
+stable_mir = {path = "../stable_mir"}
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"

compiler/rustc_driver_impl/src/lib.rs

@@ -85,6 +85,8 @@ use {do_not_use_print as print, do_not_use_print as println};
 
 pub mod args;
 pub mod pretty;
+pub mod rustc_internal;
+pub mod rustc_smir;
 #[macro_use]
 mod print;
 mod session_diagnostics;

compiler/rustc_smir/src/rustc_internal/mod.rs → compiler/rustc_driver_impl/src/rustc_internal/mod.rs

@@ -5,8 +5,8 @@
 
 use crate::rustc_internal;
 use crate::rustc_smir::Tables;
+use crate::{catch_fatal_errors, Callbacks, Compilation, RunCompiler};
 use rustc_data_structures::fx;
-use rustc_driver::{Callbacks, Compilation, RunCompiler};
 use rustc_interface::{interface, Queries};
 use rustc_middle::mir::interpret::AllocId;
 use rustc_middle::ty::TyCtxt;
@@ -150,7 +150,7 @@ where
     /// Runs the compiler against given target and tests it with `test_function`
     pub fn run(&mut self) -> Result<C, CompilerError<B>> {
         let compiler_result =
-            rustc_driver::catch_fatal_errors(|| RunCompiler::new(&self.args.clone(), self).run());
+            catch_fatal_errors(|| RunCompiler::new(&self.args.clone(), self).run());
         match (compiler_result, self.result.take()) {
             (Ok(Ok(())), Some(ControlFlow::Continue(value))) => Ok(value),
             (Ok(Ok(())), Some(ControlFlow::Break(value))) => Err(CompilerError::Interrupted(value)),

compiler/rustc_smir/src/rustc_smir/mod.rs → compiler/rustc_driver_impl/src/rustc_smir/mod.rs

@@ -1,3 +1,11 @@
+//! The WIP stable interface to rustc internals.
+//!
+//! For more information see <https://github.com/rust-lang/project-stable-mir>
+//!
+//! # Note
+//!
+//! This API is still completely unstable and subject to change.
+
 //! Module that implements what will become the rustc side of Stable MIR.
 
 //! This module is responsible for building Stable MIR components from internal components.

tests/ui-fulldeps/stable-mir/compilation-result.rs

@@ -10,11 +10,11 @@
 #![feature(assert_matches)]
 
 extern crate rustc_middle;
-extern crate rustc_smir;
+extern crate rustc_driver;
 extern crate stable_mir;
 
 use rustc_middle::ty::TyCtxt;
-use rustc_smir::rustc_internal;
+use rustc_driver::rustc_internal;
 use std::io::Write;
 use std::ops::ControlFlow;
 

tests/ui-fulldeps/stable-mir/crate-info.rs

@@ -12,12 +12,12 @@
 
 extern crate rustc_hir;
 extern crate rustc_middle;
-extern crate rustc_smir;
+extern crate rustc_driver;
 extern crate stable_mir;
 
 use rustc_hir::def::DefKind;
 use rustc_middle::ty::TyCtxt;
-use rustc_smir::rustc_internal;
+use rustc_driver::rustc_internal;
 
 use stable_mir::fold::Foldable;
 use std::assert_matches::assert_matches;