Auto merge of #32432 - eddyb:dock-service, r=nikomatsakis

Flatten rustc and rustc_trans module hierarchy slightly.

The following moves were made, in the name of sanity/simplicity:
* `rustc::middle::{cfg, infer, traits, ty}` to `rustc::{cfg, infer, traits, ty}`
* `rustc::middle::subst` to `rustc::ty::subst`
* `rustc_trans::trans::*` to `rustc_trans::*`
* `rustc_trans::save` to `rustc_save_analysis` (cc @nrc)

I've rebased a larger WIP branch on top of this and the only conflicts were in imports, but YMMV.

Author: bors

mk/crates.mk

@@ -57,7 +57,7 @@ TARGET_CRATES := libc std term \
 RUSTC_CRATES := rustc rustc_typeck rustc_mir rustc_borrowck rustc_resolve rustc_driver \
                 rustc_trans rustc_back rustc_llvm rustc_privacy rustc_lint \
                 rustc_data_structures rustc_front rustc_platform_intrinsics \
-                rustc_plugin rustc_metadata rustc_passes
+                rustc_plugin rustc_metadata rustc_passes rustc_save_analysis
 HOST_CRATES := syntax syntax_ext $(RUSTC_CRATES) rustdoc fmt_macros \
 		flate arena graphviz rbml log serialize
 TOOLS := compiletest rustdoc rustc rustbook error_index_generator
@@ -102,7 +102,7 @@ DEPS_rustc_data_structures := std log serialize
 DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
                      rustc_typeck rustc_mir rustc_resolve log syntax serialize rustc_llvm \
 	             rustc_trans rustc_privacy rustc_lint rustc_front rustc_plugin \
-                     rustc_metadata syntax_ext rustc_passes
+                     rustc_metadata syntax_ext rustc_passes rustc_save_analysis
 DEPS_rustc_front := std syntax log serialize
 DEPS_rustc_lint := rustc log syntax
 DEPS_rustc_llvm := native:rustllvm libc std rustc_bitflags
@@ -116,6 +116,7 @@ DEPS_rustc_privacy := rustc rustc_front log syntax
 DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back rustc_mir \
                     log syntax serialize rustc_llvm rustc_front rustc_platform_intrinsics \
 					rustc_const_eval
+DEPS_rustc_save_analysis := rustc log syntax rustc_front
 DEPS_rustc_typeck := rustc syntax rustc_front rustc_platform_intrinsics rustc_const_eval
 
 DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \

src/librustc/middle/cfg/construct.rs renamed to src/librustc/cfg/construct.rs

@@ -9,10 +9,10 @@
 // except according to those terms.
 
 use rustc_data_structures::graph;
-use middle::cfg::*;
+use cfg::*;
 use middle::def::Def;
 use middle::pat_util;
-use middle::ty::{self, TyCtxt};
+use ty::{self, TyCtxt};
 use syntax::ast;
 use syntax::ptr::P;
 

src/librustc/middle/cfg/graphviz.rs renamed to src/librustc/cfg/graphviz.rs

@@ -18,7 +18,7 @@ use graphviz::IntoCow;
 use syntax::ast;
 
 use front::map as ast_map;
-use middle::cfg;
+use cfg;
 
 pub type Node<'a> = (cfg::CFGIndex, &'a cfg::CFGNode);
 pub type Edge<'a> = &'a cfg::CFGEdge;

src/librustc/middle/cfg/mod.rs renamed to src/librustc/cfg/mod.rs

@@ -12,7 +12,7 @@
 //! Uses `Graph` as the underlying representation.
 
 use rustc_data_structures::graph;
-use middle::ty::TyCtxt;
+use ty::TyCtxt;
 use syntax::ast;
 use rustc_front::hir;
 

src/librustc/dep_graph/mod.rs

@@ -11,7 +11,7 @@
 use self::thread::{DepGraphThreadData, DepMessage};
 use middle::def_id::DefId;
 use syntax::ast::NodeId;
-use middle::ty::TyCtxt;
+use ty::TyCtxt;
 use rustc_front::hir;
 use rustc_front::intravisit::Visitor;
 use std::rc::Rc;

src/librustc/middle/infer/README.md renamed to src/librustc/infer/README.md

@@ -28,9 +28,9 @@
 use super::combine::{self, CombineFields};
 use super::type_variable::{BiTo};
 
-use middle::ty::{self, Ty, TyCtxt};
-use middle::ty::TyVar;
-use middle::ty::relate::{Relate, RelateResult, TypeRelation};
+use ty::{self, Ty, TyCtxt};
+use ty::TyVar;
+use ty::relate::{Relate, RelateResult, TypeRelation};
 
 pub struct Bivariate<'a, 'tcx: 'a> {
     fields: CombineFields<'a, 'tcx>

src/librustc/middle/infer/bivariate.rs renamed to src/librustc/infer/bivariate.rs

@@ -41,11 +41,11 @@ use super::{InferCtxt};
 use super::{MiscVariable, TypeTrace};
 use super::type_variable::{RelationDir, BiTo, EqTo, SubtypeOf, SupertypeOf};
 
-use middle::ty::{IntType, UintType};
-use middle::ty::{self, Ty, TyCtxt};
-use middle::ty::error::TypeError;
-use middle::ty::fold::{TypeFolder, TypeFoldable};
-use middle::ty::relate::{Relate, RelateResult, TypeRelation};
+use ty::{IntType, UintType};
+use ty::{self, Ty, TyCtxt};
+use ty::error::TypeError;
+use ty::fold::{TypeFolder, TypeFoldable};
+use ty::relate::{Relate, RelateResult, TypeRelation};
 
 use syntax::ast;
 use syntax::codemap::Span;

src/librustc/middle/infer/combine.rs renamed to src/librustc/infer/combine.rs

@@ -13,9 +13,9 @@ use super::higher_ranked::HigherRankedRelations;
 use super::{Subtype};
 use super::type_variable::{EqTo};
 
-use middle::ty::{self, Ty, TyCtxt};
-use middle::ty::TyVar;
-use middle::ty::relate::{Relate, RelateResult, TypeRelation};
+use ty::{self, Ty, TyCtxt};
+use ty::TyVar;
+use ty::relate::{Relate, RelateResult, TypeRelation};
 
 /// Ensures `a` is made equal to `b`. Returns `a` on success.
 pub struct Equate<'a, 'tcx: 'a> {

src/librustc/middle/infer/equate.rs renamed to src/librustc/infer/equate.rs

@@ -80,12 +80,12 @@ use rustc_front::print::pprust;
 use middle::cstore::CrateStore;
 use middle::def::Def;
 use middle::def_id::DefId;
-use middle::infer::{self, TypeOrigin};
+use infer::{self, TypeOrigin};
 use middle::region;
-use middle::subst;
-use middle::ty::{self, Ty, TyCtxt, TypeFoldable};
-use middle::ty::{Region, ReFree};
-use middle::ty::error::TypeError;
+use ty::subst;
+use ty::{self, Ty, TyCtxt, TypeFoldable};
+use ty::{Region, ReFree};
+use ty::error::TypeError;
 
 use std::cell::{Cell, RefCell};
 use std::char::from_u32;