Auto merge of #74862 - mark-i-m:mv-compiler, r=petrochenkov

Move almost all compiler crates to compiler/

This PR implements https://github.com/rust-lang/compiler-team/issues/336 and moves all `rustc_*` crates from `src` to the new `compiler` directory.

`librustc_foo` directories are renamed to `rustc_foo`.
`src` directories are introduced inside `rustc_*` directories to mirror the scheme already use for `library` crates.

1686 files changed, 941 insertions, 1051 deletions

diff --git a/Cargo.toml b/Cargo.toml
index d8d9cc399c8..fde1cb5a35c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,7 @@
 [workspace]
 members = [
   "src/bootstrap",
-  "src/rustc",
-  "src/librustc_codegen_llvm",
+  "compiler/rustc",
   "library/std",
   "library/test",
   "src/tools/cargotest",
diff --git a/src/rustc/Cargo.toml b/compiler/rustc/Cargo.toml
index 5e0f167bb38..4340d50f845 100644
--- a/src/rustc/Cargo.toml
+++ b/compiler/rustc/Cargo.toml
@@ -6,14 +6,14 @@ edition = '2018'
 
 [[bin]]
 name = "rustc_binary"
-path = "rustc.rs"
+path = "src/main.rs"
 
 [dependencies]
-rustc_driver = { path = "../librustc_driver" }
+rustc_driver = { path = "../rustc_driver" }
 
 # 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 = "../librustc_codegen_ssa" }
+rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
 
 [dependencies.jemalloc-sys]
 version = '0.3.0'
diff --git a/src/rustc/rustc.rs b/compiler/rustc/src/main.rs
index 6bc5aa6382c..6bc5aa6382c 100644
--- a/src/rustc/rustc.rs
+++ b/compiler/rustc/src/main.rs
diff --git a/src/librustc_apfloat/Cargo.toml b/compiler/rustc_apfloat/Cargo.toml
index 726965e1e71..306513f1a7e 100644
--- a/src/librustc_apfloat/Cargo.toml
+++ b/compiler/rustc_apfloat/Cargo.toml
@@ -4,10 +4,6 @@ name = "rustc_apfloat"
 version = "0.0.0"
 edition = "2018"
 
-[lib]
-name = "rustc_apfloat"
-path = "lib.rs"
-
 [dependencies]
 bitflags = "1.2.1"
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_apfloat/ieee.rs b/compiler/rustc_apfloat/src/ieee.rs
index e3d941cad7a..e3d941cad7a 100644
--- a/src/librustc_apfloat/ieee.rs
+++ b/compiler/rustc_apfloat/src/ieee.rs
diff --git a/src/librustc_apfloat/lib.rs b/compiler/rustc_apfloat/src/lib.rs
index ba3adc4a135..ba3adc4a135 100644
--- a/src/librustc_apfloat/lib.rs
+++ b/compiler/rustc_apfloat/src/lib.rs
diff --git a/src/librustc_apfloat/ppc.rs b/compiler/rustc_apfloat/src/ppc.rs
index 4ae8edf3157..4ae8edf3157 100644
--- a/src/librustc_apfloat/ppc.rs
+++ b/compiler/rustc_apfloat/src/ppc.rs
diff --git a/src/librustc_apfloat/tests/ieee.rs b/compiler/rustc_apfloat/tests/ieee.rs
index 2d8bb7d1e8e..2d8bb7d1e8e 100644
--- a/src/librustc_apfloat/tests/ieee.rs
+++ b/compiler/rustc_apfloat/tests/ieee.rs
diff --git a/src/librustc_apfloat/tests/ppc.rs b/compiler/rustc_apfloat/tests/ppc.rs
index 5a8de71cb34..5a8de71cb34 100644
--- a/src/librustc_apfloat/tests/ppc.rs
+++ b/compiler/rustc_apfloat/tests/ppc.rs
diff --git a/src/librustc_arena/Cargo.toml b/compiler/rustc_arena/Cargo.toml
index dfae956e2b6..41701f3255f 100644
--- a/src/librustc_arena/Cargo.toml
+++ b/compiler/rustc_arena/Cargo.toml
@@ -4,10 +4,6 @@ name = "rustc_arena"
 version = "0.0.0"
 edition = "2018"
 
-[lib]
-name = "rustc_arena"
-path = "lib.rs"
-
 [dependencies]
-rustc_data_structures = { path = "../librustc_data_structures" }
+rustc_data_structures = { path = "../rustc_data_structures" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_arena/lib.rs b/compiler/rustc_arena/src/lib.rs
index 5e6a0340d12..5e6a0340d12 100644
--- a/src/librustc_arena/lib.rs
+++ b/compiler/rustc_arena/src/lib.rs
diff --git a/src/librustc_arena/tests.rs b/compiler/rustc_arena/src/tests.rs
index 8e63bdf5458..8e63bdf5458 100644
--- a/src/librustc_arena/tests.rs
+++ b/compiler/rustc_arena/src/tests.rs
diff --git a/compiler/rustc_ast/Cargo.toml b/compiler/rustc_ast/Cargo.toml
new file mode 100644
index 00000000000..13e17a807c4
--- /dev/null
+++ b/compiler/rustc_ast/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_ast"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+rustc_serialize = { path = "../rustc_serialize" }
+tracing = "0.1"
+rustc_span = { path = "../rustc_span" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_index = { path = "../rustc_index" }
+rustc_lexer = { path = "../rustc_lexer" }
+rustc_macros = { path = "../rustc_macros" }
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+bitflags = "1.2.1"
diff --git a/src/librustc_ast/README.md b/compiler/rustc_ast/README.md
index dd407dba1f4..dd407dba1f4 100644
--- a/src/librustc_ast/README.md
+++ b/compiler/rustc_ast/README.md
diff --git a/src/librustc_ast/ast.rs b/compiler/rustc_ast/src/ast.rs
index 127a53cad2b..127a53cad2b 100644
--- a/src/librustc_ast/ast.rs
+++ b/compiler/rustc_ast/src/ast.rs
diff --git a/src/librustc_ast/ast/tests.rs b/compiler/rustc_ast/src/ast/tests.rs
index 8ba55bf037b..8ba55bf037b 100644
--- a/src/librustc_ast/ast/tests.rs
+++ b/compiler/rustc_ast/src/ast/tests.rs
diff --git a/src/librustc_ast/attr/mod.rs b/compiler/rustc_ast/src/attr/mod.rs
index edcbce3e2cf..edcbce3e2cf 100644
--- a/src/librustc_ast/attr/mod.rs
+++ b/compiler/rustc_ast/src/attr/mod.rs
diff --git a/src/librustc_ast/crate_disambiguator.rs b/compiler/rustc_ast/src/crate_disambiguator.rs
index bd7d8516714..bd7d8516714 100644
--- a/src/librustc_ast/crate_disambiguator.rs
+++ b/compiler/rustc_ast/src/crate_disambiguator.rs
diff --git a/src/librustc_ast/entry.rs b/compiler/rustc_ast/src/entry.rs
index 290f6006de0..290f6006de0 100644
--- a/src/librustc_ast/entry.rs
+++ b/compiler/rustc_ast/src/entry.rs
diff --git a/src/librustc_ast/expand/allocator.rs b/compiler/rustc_ast/src/expand/allocator.rs
index cd27f958e46..cd27f958e46 100644
--- a/src/librustc_ast/expand/allocator.rs
+++ b/compiler/rustc_ast/src/expand/allocator.rs
diff --git a/src/librustc_ast/expand/mod.rs b/compiler/rustc_ast/src/expand/mod.rs
index eebfc38bdf4..eebfc38bdf4 100644
--- a/src/librustc_ast/expand/mod.rs
+++ b/compiler/rustc_ast/src/expand/mod.rs
diff --git a/src/librustc_ast/lib.rs b/compiler/rustc_ast/src/lib.rs
index b556c1a446b..b556c1a446b 100644
--- a/src/librustc_ast/lib.rs
+++ b/compiler/rustc_ast/src/lib.rs
diff --git a/src/librustc_ast/mut_visit.rs b/compiler/rustc_ast/src/mut_visit.rs
index 965571aaa54..965571aaa54 100644
--- a/src/librustc_ast/mut_visit.rs
+++ b/compiler/rustc_ast/src/mut_visit.rs
diff --git a/src/librustc_ast/node_id.rs b/compiler/rustc_ast/src/node_id.rs
index 1035e945538..1035e945538 100644
--- a/src/librustc_ast/node_id.rs
+++ b/compiler/rustc_ast/src/node_id.rs
diff --git a/src/librustc_ast/ptr.rs b/compiler/rustc_ast/src/ptr.rs
index e4a3cccb7ea..e4a3cccb7ea 100644
--- a/src/librustc_ast/ptr.rs
+++ b/compiler/rustc_ast/src/ptr.rs
diff --git a/src/librustc_ast/token.rs b/compiler/rustc_ast/src/token.rs
index 4a8bf6b4f19..4a8bf6b4f19 100644
--- a/src/librustc_ast/token.rs
+++ b/compiler/rustc_ast/src/token.rs
diff --git a/src/librustc_ast/tokenstream.rs b/compiler/rustc_ast/src/tokenstream.rs
index 151acddae84..151acddae84 100644
--- a/src/librustc_ast/tokenstream.rs
+++ b/compiler/rustc_ast/src/tokenstream.rs
diff --git a/src/librustc_ast/util/classify.rs b/compiler/rustc_ast/src/util/classify.rs
index 60422a2e573..60422a2e573 100644
--- a/src/librustc_ast/util/classify.rs
+++ b/compiler/rustc_ast/src/util/classify.rs
diff --git a/src/librustc_ast/util/comments.rs b/compiler/rustc_ast/src/util/comments.rs
index e97c8cc4562..e97c8cc4562 100644
--- a/src/librustc_ast/util/comments.rs
+++ b/compiler/rustc_ast/src/util/comments.rs
diff --git a/src/librustc_ast/util/comments/tests.rs b/compiler/rustc_ast/src/util/comments/tests.rs
index e19198f863b..e19198f863b 100644
--- a/src/librustc_ast/util/comments/tests.rs
+++ b/compiler/rustc_ast/src/util/comments/tests.rs
diff --git a/src/librustc_ast/util/lev_distance.rs b/compiler/rustc_ast/src/util/lev_distance.rs
index d4e0e3ba051..d4e0e3ba051 100644
--- a/src/librustc_ast/util/lev_distance.rs
+++ b/compiler/rustc_ast/src/util/lev_distance.rs
diff --git a/src/librustc_ast/util/lev_distance/tests.rs b/compiler/rustc_ast/src/util/lev_distance/tests.rs
index 7ebedbcb76a..7ebedbcb76a 100644
--- a/src/librustc_ast/util/lev_distance/tests.rs
+++ b/compiler/rustc_ast/src/util/lev_distance/tests.rs
diff --git a/src/librustc_ast/util/literal.rs b/compiler/rustc_ast/src/util/literal.rs
index 597e5b437fc..597e5b437fc 100644
--- a/src/librustc_ast/util/literal.rs
+++ b/compiler/rustc_ast/src/util/literal.rs
diff --git a/src/librustc_ast/util/parser.rs b/compiler/rustc_ast/src/util/parser.rs
index 2ee94965756..2ee94965756 100644
--- a/src/librustc_ast/util/parser.rs
+++ b/compiler/rustc_ast/src/util/parser.rs
diff --git a/src/librustc_ast/visit.rs b/compiler/rustc_ast/src/visit.rs
index b65a88cb90e..b65a88cb90e 100644
--- a/src/librustc_ast/visit.rs
+++ b/compiler/rustc_ast/src/visit.rs
diff --git a/compiler/rustc_ast_lowering/Cargo.toml b/compiler/rustc_ast_lowering/Cargo.toml
new file mode 100644
index 00000000000..177a9066edf
--- /dev/null
+++ b/compiler/rustc_ast_lowering/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_ast_lowering"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+rustc_arena = { path = "../rustc_arena" }
+tracing = "0.1"
+rustc_ast_pretty = { path = "../rustc_ast_pretty" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_target = { path = "../rustc_target" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_index = { path = "../rustc_index" }
+rustc_span = { path = "../rustc_span" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_session = { path = "../rustc_session" }
+rustc_ast = { path = "../rustc_ast" }
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_ast_lowering/expr.rs b/compiler/rustc_ast_lowering/src/expr.rs
index df452825bba..df452825bba 100644
--- a/src/librustc_ast_lowering/expr.rs
+++ b/compiler/rustc_ast_lowering/src/expr.rs
diff --git a/src/librustc_ast_lowering/item.rs b/compiler/rustc_ast_lowering/src/item.rs
index f3309afec7d..f3309afec7d 100644
--- a/src/librustc_ast_lowering/item.rs
+++ b/compiler/rustc_ast_lowering/src/item.rs
diff --git a/src/librustc_ast_lowering/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs
index 586355fe613..586355fe613 100644
--- a/src/librustc_ast_lowering/lib.rs
+++ b/compiler/rustc_ast_lowering/src/lib.rs
diff --git a/src/librustc_ast_lowering/pat.rs b/compiler/rustc_ast_lowering/src/pat.rs
index cb7b7c0eb61..cb7b7c0eb61 100644
--- a/src/librustc_ast_lowering/pat.rs
+++ b/compiler/rustc_ast_lowering/src/pat.rs
diff --git a/src/librustc_ast_lowering/path.rs b/compiler/rustc_ast_lowering/src/path.rs
index cf68dfb9ae1..cf68dfb9ae1 100644
--- a/src/librustc_ast_lowering/path.rs
+++ b/compiler/rustc_ast_lowering/src/path.rs
diff --git a/compiler/rustc_ast_passes/Cargo.toml b/compiler/rustc_ast_passes/Cargo.toml
new file mode 100644
index 00000000000..7cf3e752c92
--- /dev/null
+++ b/compiler/rustc_ast_passes/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_ast_passes"
+version = "0.0.0"
+edition = "2018"
+
+[dependencies]
+itertools = "0.8"
+tracing = "0.1"
+rustc_ast_pretty = { path = "../rustc_ast_pretty" }
+rustc_attr = { path = "../rustc_attr" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_feature = { path = "../rustc_feature" }
+rustc_parse = { path = "../rustc_parse" }
+rustc_session = { path = "../rustc_session" }
+rustc_span = { path = "../rustc_span" }
+rustc_ast = { path = "../rustc_ast" }
diff --git a/src/librustc_ast_passes/ast_validation.rs b/compiler/rustc_ast_passes/src/ast_validation.rs
index a01dd8c939c..a01dd8c939c 100644
--- a/src/librustc_ast_passes/ast_validation.rs
+++ b/compiler/rustc_ast_passes/src/ast_validation.rs
diff --git a/src/librustc_ast_passes/feature_gate.rs b/compiler/rustc_ast_passes/src/feature_gate.rs
index 0ee8ef55e61..0ee8ef55e61 100644
--- a/src/librustc_ast_passes/feature_gate.rs
+++ b/compiler/rustc_ast_passes/src/feature_gate.rs
diff --git a/src/librustc_ast_passes/lib.rs b/compiler/rustc_ast_passes/src/lib.rs
index bfe30441980..bfe30441980 100644
--- a/src/librustc_ast_passes/lib.rs
+++ b/compiler/rustc_ast_passes/src/lib.rs
diff --git a/src/librustc_ast_passes/node_count.rs b/compiler/rustc_ast_passes/src/node_count.rs
index 706dca2b7f4..706dca2b7f4 100644
--- a/src/librustc_ast_passes/node_count.rs
+++ b/compiler/rustc_ast_passes/src/node_count.rs
diff --git a/src/librustc_ast_passes/show_span.rs b/compiler/rustc_ast_passes/src/show_span.rs
index 053aba86222..053aba86222 100644
--- a/src/librustc_ast_passes/show_span.rs
+++ b/compiler/rustc_ast_passes/src/show_span.rs
diff --git a/compiler/rustc_ast_pretty/Cargo.toml b/compiler/rustc_ast_pretty/Cargo.toml
new file mode 100644
index 00000000000..f447bc7f4ef
--- /dev/null
+++ b/compiler/rustc_ast_pretty/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_ast_pretty"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+tracing = "0.1"
+rustc_span = { path = "../rustc_span" }
+rustc_ast = { path = "../rustc_ast" }
+rustc_target = { path = "../rustc_target" }
diff --git a/src/librustc_ast_pretty/helpers.rs b/compiler/rustc_ast_pretty/src/helpers.rs
index dce856df9c6..dce856df9c6 100644
--- a/src/librustc_ast_pretty/helpers.rs
+++ b/compiler/rustc_ast_pretty/src/helpers.rs
diff --git a/src/librustc_ast_pretty/lib.rs b/compiler/rustc_ast_pretty/src/lib.rs
index 9adc6c604e8..9adc6c604e8 100644
--- a/src/librustc_ast_pretty/lib.rs
+++ b/compiler/rustc_ast_pretty/src/lib.rs
diff --git a/src/librustc_ast_pretty/pp.rs b/compiler/rustc_ast_pretty/src/pp.rs
index ca7f127ced6..ca7f127ced6 100644
--- a/src/librustc_ast_pretty/pp.rs
+++ b/compiler/rustc_ast_pretty/src/pp.rs
diff --git a/src/librustc_ast_pretty/pprust.rs b/compiler/rustc_ast_pretty/src/pprust.rs
index cb48deb5886..cb48deb5886 100644
--- a/src/librustc_ast_pretty/pprust.rs
+++ b/compiler/rustc_ast_pretty/src/pprust.rs
diff --git a/src/librustc_ast_pretty/pprust/tests.rs b/compiler/rustc_ast_pretty/src/pprust/tests.rs
index fdbf3feb900..fdbf3feb900 100644
--- a/src/librustc_ast_pretty/pprust/tests.rs
+++ b/compiler/rustc_ast_pretty/src/pprust/tests.rs
diff --git a/compiler/rustc_attr/Cargo.toml b/compiler/rustc_attr/Cargo.toml
new file mode 100644
index 00000000000..5f941a0a650
--- /dev/null
+++ b/compiler/rustc_attr/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_attr"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+rustc_ast_pretty = { path = "../rustc_ast_pretty" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_span = { path = "../rustc_span" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_feature = { path = "../rustc_feature" }
+rustc_lexer = { path = "../rustc_lexer" }
+rustc_macros = { path = "../rustc_macros" }
+rustc_session = { path = "../rustc_session" }
+rustc_ast = { path = "../rustc_ast" }
+version_check = "0.9"
diff --git a/src/librustc_attr/builtin.rs b/compiler/rustc_attr/src/builtin.rs
index b8929fe0889..b8929fe0889 100644
--- a/src/librustc_attr/builtin.rs
+++ b/compiler/rustc_attr/src/builtin.rs
diff --git a/src/librustc_attr/lib.rs b/compiler/rustc_attr/src/lib.rs
index 149a950f7d4..149a950f7d4 100644
--- a/src/librustc_attr/lib.rs
+++ b/compiler/rustc_attr/src/lib.rs
diff --git a/compiler/rustc_builtin_macros/Cargo.toml b/compiler/rustc_builtin_macros/Cargo.toml
new file mode 100644
index 00000000000..c397a854126
--- /dev/null
+++ b/compiler/rustc_builtin_macros/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_builtin_macros"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+rustc_parse_format = { path = "../rustc_parse_format" }
+tracing = "0.1"
+rustc_ast_pretty = { path = "../rustc_ast_pretty" }
+rustc_attr = { path = "../rustc_attr" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_feature = { path = "../rustc_feature" }
+rustc_parse = { path = "../rustc_parse" }
+rustc_target = { path = "../rustc_target" }
+rustc_session = { path = "../rustc_session" }
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+rustc_ast = { path = "../rustc_ast" }
+rustc_expand = { path = "../rustc_expand" }
+rustc_span = { path = "../rustc_span" }
diff --git a/src/librustc_builtin_macros/asm.rs b/compiler/rustc_builtin_macros/src/asm.rs
index 5dafd6b77ab..5dafd6b77ab 100644
--- a/src/librustc_builtin_macros/asm.rs
+++ b/compiler/rustc_builtin_macros/src/asm.rs
diff --git a/src/librustc_builtin_macros/assert.rs b/compiler/rustc_builtin_macros/src/assert.rs
index 25181715540..25181715540 100644
--- a/src/librustc_builtin_macros/assert.rs
+++ b/compiler/rustc_builtin_macros/src/assert.rs
diff --git a/src/librustc_builtin_macros/cfg.rs b/compiler/rustc_builtin_macros/src/cfg.rs
index 4c00162b556..4c00162b556 100644
--- a/src/librustc_builtin_macros/cfg.rs
+++ b/compiler/rustc_builtin_macros/src/cfg.rs
diff --git a/src/librustc_builtin_macros/cfg_accessible.rs b/compiler/rustc_builtin_macros/src/cfg_accessible.rs
index 75f4b077640..75f4b077640 100644
--- a/src/librustc_builtin_macros/cfg_accessible.rs
+++ b/compiler/rustc_builtin_macros/src/cfg_accessible.rs
diff --git a/src/librustc_builtin_macros/cmdline_attrs.rs b/compiler/rustc_builtin_macros/src/cmdline_attrs.rs
index 34e2accc615..34e2accc615 100644
--- a/src/librustc_builtin_macros/cmdline_attrs.rs
+++ b/compiler/rustc_builtin_macros/src/cmdline_attrs.rs
diff --git a/src/librustc_builtin_macros/compile_error.rs b/compiler/rustc_builtin_macros/src/compile_error.rs
index f5955604e5f..f5955604e5f 100644
--- a/src/librustc_builtin_macros/compile_error.rs
+++ b/compiler/rustc_builtin_macros/src/compile_error.rs
diff --git a/src/librustc_builtin_macros/concat.rs b/compiler/rustc_builtin_macros/src/concat.rs
index e5077d93674..e5077d93674 100644
--- a/src/librustc_builtin_macros/concat.rs
+++ b/compiler/rustc_builtin_macros/src/concat.rs
diff --git a/src/librustc_builtin_macros/concat_idents.rs b/compiler/rustc_builtin_macros/src/concat_idents.rs
index 8223cdda072..8223cdda072 100644
--- a/src/librustc_builtin_macros/concat_idents.rs
+++ b/compiler/rustc_builtin_macros/src/concat_idents.rs
diff --git a/src/librustc_builtin_macros/deriving/bounds.rs b/compiler/rustc_builtin_macros/src/deriving/bounds.rs
index 12ef166b8b0..12ef166b8b0 100644
--- a/src/librustc_builtin_macros/deriving/bounds.rs
+++ b/compiler/rustc_builtin_macros/src/deriving/bounds.rs
diff --git a/src/librustc_builtin_macros/deriving/clone.rs b/compiler/rustc_builtin_macros/src/deriving/clone.rs
index 957c8035399..957c8035399 100644
--- a/src/librustc_builtin_macros/deriving/clone.rs
+++ b/compiler/rustc_builtin_macros/src/deriving/clone.rs
diff --git a/src/librustc_builtin_macros/deriving/cmp/eq.rs b/compiler/rustc_builtin_macros/src/deriving/cmp/eq.rs
index 79f35ad5819..79f35ad5819 100644
--- a/src/librustc_builtin_macros/deriving/cmp/eq.rs
+++ b/compiler/rustc_builtin_macros/src/deriving/cmp/eq.rs
diff --git a/src/librustc_builtin_macros/deriving/cmp/ord.rs b/compiler/rustc_builtin_macros/src/deriving/cmp/ord.rs
index c1473e24093..c1473e24093 100644
--- a/src/librustc_builtin_macros/deriving/cmp/ord.rs
+++ b/compiler/rustc_builtin_macros/src/deriving/cmp/ord.rs
diff --git a/src/librustc_builtin_macros/deriving/cmp/partial_eq.rs b/compiler/rustc_builtin_macros/src/deriving/cmp/partial_eq.rs
index 8e9f15743cc..8e9f15743cc 100644
--- a/src/librustc_builtin_macros/deriving/cmp/partial_eq.rs
+++ b/compiler/rustc_builtin_macros/src/deriving/cmp/partial_eq.rs
diff --git a/src/librustc_builtin_macros/deriving/cmp/partial_ord.rs b/compiler/rustc_builtin_macros/src/deriving/cmp/partial_ord.rs
index 21174ca4c8b..21174ca4c8b 100644
--- a/src/librustc_builtin_macros/deriving/cmp/partial_ord.rs
+++ b/compiler/rustc_builtin_macros/src/deriving/cmp/partial_ord.rs
diff --git a/src/librustc_builtin_macros/deriving/debug.rs b/compiler/rustc_builtin_macros/src/deriving/debug.rs
index 120e859f2b1..120e859f2b1 100644
--- a/src/librustc_builtin_macros/deriving/debug.rs
+++ b/compiler/rustc_builtin_macros/src/deriving/debug.rs
diff --git a/src/librustc_builtin_macros/deriving/decodable.rs b/compiler/rustc_builtin_macros/src/deriving/decodable.rs
index df69f6c90d8..df69f6c90d8 100644
--- a/src/librustc_builtin_macros/deriving/decodable.rs
+++ b/compiler/rustc_builtin_macros/src/deriving/decodable.rs
diff --git a/src/librustc_builtin_macros/deriving/default.rs b/compiler/rustc_builtin_macros/src/deriving/default.rs
index 980be3a0050..980be3a0050 100644
--- a/src/librustc_builtin_macros/deriving/default.rs
+++ b/compiler/rustc_builtin_macros/src/deriving/default.rs
diff --git a/src/librustc_builtin_macros/deriving/encodable.rs b/compiler/rustc_builtin_macros/src/deriving/encodable.rs
index 62aa1cbfbf2..62aa1cbfbf2 100644
--- a/src/librustc_builtin_macros/deriving/encodable.rs
+++ b/compiler/rustc_builtin_macros/src/deriving/encodable.rs
diff --git a/src/librustc_builtin_macros/deriving/generic/mod.rs b/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs
index 849e8b136e1..849e8b136e1 100644
--- a/src/librustc_builtin_macros/deriving/generic/mod.rs
+++ b/compiler/rustc_builtin_macros/src/deriving/generic/mod.rs
diff --git a/src/librustc_builtin_macros/deriving/generic/ty.rs b/compiler/rustc_builtin_macros/src/deriving/generic/ty.rs
index 6b7d0e1f204..6b7d0e1f204 100644
--- a/src/librustc_builtin_macros/deriving/generic/ty.rs
+++ b/compiler/rustc_builtin_macros/src/deriving/generic/ty.rs
diff --git a/src/librustc_builtin_macros/deriving/hash.rs b/compiler/rustc_builtin_macros/src/deriving/hash.rs
index 868f863b990..868f863b990 100644
--- a/src/librustc_builtin_macros/deriving/hash.rs
+++ b/compiler/rustc_builtin_macros/src/deriving/hash.rs
diff --git a/src/librustc_builtin_macros/deriving/mod.rs b/compiler/rustc_builtin_macros/src/deriving/mod.rs
index 7e3fd131d44..7e3fd131d44 100644
--- a/src/librustc_builtin_macros/deriving/mod.rs
+++ b/compiler/rustc_builtin_macros/src/deriving/mod.rs
diff --git a/src/librustc_builtin_macros/env.rs b/compiler/rustc_builtin_macros/src/env.rs
index 6de12acfb94..6de12acfb94 100644
--- a/src/librustc_builtin_macros/env.rs
+++ b/compiler/rustc_builtin_macros/src/env.rs
diff --git a/src/librustc_builtin_macros/format.rs b/compiler/rustc_builtin_macros/src/format.rs
index 373277f525d..373277f525d 100644
--- a/src/librustc_builtin_macros/format.rs
+++ b/compiler/rustc_builtin_macros/src/format.rs
diff --git a/src/librustc_builtin_macros/format_foreign.rs b/compiler/rustc_builtin_macros/src/format_foreign.rs
index 85cf4c42e94..85cf4c42e94 100644
--- a/src/librustc_builtin_macros/format_foreign.rs
+++ b/compiler/rustc_builtin_macros/src/format_foreign.rs
diff --git a/src/librustc_builtin_macros/format_foreign/printf/tests.rs b/compiler/rustc_builtin_macros/src/format_foreign/printf/tests.rs
index 33c54c9cee0..33c54c9cee0 100644
--- a/src/librustc_builtin_macros/format_foreign/printf/tests.rs
+++ b/compiler/rustc_builtin_macros/src/format_foreign/printf/tests.rs
diff --git a/src/librustc_builtin_macros/format_foreign/shell/tests.rs b/compiler/rustc_builtin_macros/src/format_foreign/shell/tests.rs
index ed8fe81dfcd..ed8fe81dfcd 100644
--- a/src/librustc_builtin_macros/format_foreign/shell/tests.rs
+++ b/compiler/rustc_builtin_macros/src/format_foreign/shell/tests.rs
diff --git a/src/librustc_builtin_macros/global_allocator.rs b/compiler/rustc_builtin_macros/src/global_allocator.rs
index 8478fcfbf09..8478fcfbf09 100644
--- a/src/librustc_builtin_macros/global_allocator.rs
+++ b/compiler/rustc_builtin_macros/src/global_allocator.rs
diff --git a/src/librustc_builtin_macros/global_asm.rs b/compiler/rustc_builtin_macros/src/global_asm.rs
index 2465f33622e..2465f33622e 100644
--- a/src/librustc_builtin_macros/global_asm.rs
+++ b/compiler/rustc_builtin_macros/src/global_asm.rs
diff --git a/src/librustc_builtin_macros/lib.rs b/compiler/rustc_builtin_macros/src/lib.rs
index 87be6d1743a..87be6d1743a 100644
--- a/src/librustc_builtin_macros/lib.rs
+++ b/compiler/rustc_builtin_macros/src/lib.rs
diff --git a/src/librustc_builtin_macros/llvm_asm.rs b/compiler/rustc_builtin_macros/src/llvm_asm.rs
index db73fdbe24f..db73fdbe24f 100644
--- a/src/librustc_builtin_macros/llvm_asm.rs
+++ b/compiler/rustc_builtin_macros/src/llvm_asm.rs
diff --git a/src/librustc_builtin_macros/log_syntax.rs b/compiler/rustc_builtin_macros/src/log_syntax.rs
index ede34a76125..ede34a76125 100644
--- a/src/librustc_builtin_macros/log_syntax.rs
+++ b/compiler/rustc_builtin_macros/src/log_syntax.rs
diff --git a/src/librustc_builtin_macros/proc_macro_harness.rs b/compiler/rustc_builtin_macros/src/proc_macro_harness.rs
index 0c6769906f3..0c6769906f3 100644
--- a/src/librustc_builtin_macros/proc_macro_harness.rs
+++ b/compiler/rustc_builtin_macros/src/proc_macro_harness.rs
diff --git a/src/librustc_builtin_macros/source_util.rs b/compiler/rustc_builtin_macros/src/source_util.rs
index 70753208af3..70753208af3 100644
--- a/src/librustc_builtin_macros/source_util.rs
+++ b/compiler/rustc_builtin_macros/src/source_util.rs
diff --git a/src/librustc_builtin_macros/standard_library_imports.rs b/compiler/rustc_builtin_macros/src/standard_library_imports.rs
index e801b5c7b0c..e801b5c7b0c 100644
--- a/src/librustc_builtin_macros/standard_library_imports.rs
+++ b/compiler/rustc_builtin_macros/src/standard_library_imports.rs
diff --git a/src/librustc_builtin_macros/test.rs b/compiler/rustc_builtin_macros/src/test.rs
index 8e56e80bba2..8e56e80bba2 100644
--- a/src/librustc_builtin_macros/test.rs
+++ b/compiler/rustc_builtin_macros/src/test.rs
diff --git a/src/librustc_builtin_macros/test_harness.rs b/compiler/rustc_builtin_macros/src/test_harness.rs
index 0ea60665d67..0ea60665d67 100644
--- a/src/librustc_builtin_macros/test_harness.rs
+++ b/compiler/rustc_builtin_macros/src/test_harness.rs
diff --git a/src/librustc_builtin_macros/trace_macros.rs b/compiler/rustc_builtin_macros/src/trace_macros.rs
index c17f2afe494..c17f2afe494 100644
--- a/src/librustc_builtin_macros/trace_macros.rs
+++ b/compiler/rustc_builtin_macros/src/trace_macros.rs
diff --git a/src/librustc_builtin_macros/util.rs b/compiler/rustc_builtin_macros/src/util.rs
index 01ea80c4c8a..01ea80c4c8a 100644
--- a/src/librustc_builtin_macros/util.rs
+++ b/compiler/rustc_builtin_macros/src/util.rs
diff --git a/compiler/rustc_codegen_llvm/Cargo.toml b/compiler/rustc_codegen_llvm/Cargo.toml
new file mode 100644
index 00000000000..38f552558c8
--- /dev/null
+++ b/compiler/rustc_codegen_llvm/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_codegen_llvm"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+test = false
+doctest = false
+
+[dependencies]
+bitflags = "1.0"
+libc = "0.2"
+measureme = "0.7.1"
+snap = "1"
+tracing = "0.1"
+rustc_middle = { path = "../rustc_middle" }
+rustc-demangle = "0.1"
+rustc_attr = { path = "../rustc_attr" }
+rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_feature = { path = "../rustc_feature" }
+rustc_fs_util = { path = "../rustc_fs_util" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_incremental = { path = "../rustc_incremental" }
+rustc_index = { path = "../rustc_index" }
+rustc_llvm = { path = "../../src/librustc_llvm" }
+rustc_session = { path = "../rustc_session" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_target = { path = "../rustc_target" }
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+rustc_ast = { path = "../rustc_ast" }
+rustc_span = { path = "../rustc_span" }
diff --git a/src/librustc_codegen_llvm/README.md b/compiler/rustc_codegen_llvm/README.md
index afec60d017e..afec60d017e 100644
--- a/src/librustc_codegen_llvm/README.md
+++ b/compiler/rustc_codegen_llvm/README.md
diff --git a/src/librustc_codegen_llvm/abi.rs b/compiler/rustc_codegen_llvm/src/abi.rs
index 7857ccb613b..7857ccb613b 100644
--- a/src/librustc_codegen_llvm/abi.rs
+++ b/compiler/rustc_codegen_llvm/src/abi.rs
diff --git a/src/librustc_codegen_llvm/allocator.rs b/compiler/rustc_codegen_llvm/src/allocator.rs
index bc1d9e1818c..bc1d9e1818c 100644
--- a/src/librustc_codegen_llvm/allocator.rs
+++ b/compiler/rustc_codegen_llvm/src/allocator.rs
diff --git a/src/librustc_codegen_llvm/asm.rs b/compiler/rustc_codegen_llvm/src/asm.rs
index a468d09c2d9..a468d09c2d9 100644
--- a/src/librustc_codegen_llvm/asm.rs
+++ b/compiler/rustc_codegen_llvm/src/asm.rs
diff --git a/src/librustc_codegen_llvm/attributes.rs b/compiler/rustc_codegen_llvm/src/attributes.rs
index 227a87ff819..227a87ff819 100644
--- a/src/librustc_codegen_llvm/attributes.rs
+++ b/compiler/rustc_codegen_llvm/src/attributes.rs
diff --git a/src/librustc_codegen_llvm/back/archive.rs b/compiler/rustc_codegen_llvm/src/back/archive.rs
index a115a1e9516..a115a1e9516 100644
--- a/src/librustc_codegen_llvm/back/archive.rs
+++ b/compiler/rustc_codegen_llvm/src/back/archive.rs
diff --git a/src/librustc_codegen_llvm/back/lto.rs b/compiler/rustc_codegen_llvm/src/back/lto.rs
index 7c710a1cb3d..7c710a1cb3d 100644
--- a/src/librustc_codegen_llvm/back/lto.rs
+++ b/compiler/rustc_codegen_llvm/src/back/lto.rs
diff --git a/src/librustc_codegen_llvm/back/profiling.rs b/compiler/rustc_codegen_llvm/src/back/profiling.rs
index 2741f7d848e..2741f7d848e 100644
--- a/src/librustc_codegen_llvm/back/profiling.rs
+++ b/compiler/rustc_codegen_llvm/src/back/profiling.rs
diff --git a/src/librustc_codegen_llvm/back/write.rs b/compiler/rustc_codegen_llvm/src/back/write.rs
index 6f386c1287c..6f386c1287c 100644
--- a/src/librustc_codegen_llvm/back/write.rs
+++ b/compiler/rustc_codegen_llvm/src/back/write.rs
diff --git a/src/librustc_codegen_llvm/base.rs b/compiler/rustc_codegen_llvm/src/base.rs
index 6a1b373ef07..6a1b373ef07 100644
--- a/src/librustc_codegen_llvm/base.rs
+++ b/compiler/rustc_codegen_llvm/src/base.rs
diff --git a/src/librustc_codegen_llvm/builder.rs b/compiler/rustc_codegen_llvm/src/builder.rs
index 4ece08f6293..4ece08f6293 100644
--- a/src/librustc_codegen_llvm/builder.rs
+++ b/compiler/rustc_codegen_llvm/src/builder.rs
diff --git a/src/librustc_codegen_llvm/callee.rs b/compiler/rustc_codegen_llvm/src/callee.rs
index 4afd906fce7..4afd906fce7 100644
--- a/src/librustc_codegen_llvm/callee.rs
+++ b/compiler/rustc_codegen_llvm/src/callee.rs
diff --git a/src/librustc_codegen_llvm/common.rs b/compiler/rustc_codegen_llvm/src/common.rs
index 0b1cf03fa7e..0b1cf03fa7e 100644
--- a/src/librustc_codegen_llvm/common.rs
+++ b/compiler/rustc_codegen_llvm/src/common.rs
diff --git a/src/librustc_codegen_llvm/consts.rs b/compiler/rustc_codegen_llvm/src/consts.rs
index 86a5ec59254..86a5ec59254 100644
--- a/src/librustc_codegen_llvm/consts.rs
+++ b/compiler/rustc_codegen_llvm/src/consts.rs
diff --git a/src/librustc_codegen_llvm/context.rs b/compiler/rustc_codegen_llvm/src/context.rs
index 1c51a9df5d8..1c51a9df5d8 100644
--- a/src/librustc_codegen_llvm/context.rs
+++ b/compiler/rustc_codegen_llvm/src/context.rs
diff --git a/src/librustc_codegen_llvm/coverageinfo/mapgen.rs b/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs
index ec6c177614d..ec6c177614d 100644
--- a/src/librustc_codegen_llvm/coverageinfo/mapgen.rs
+++ b/compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs
diff --git a/src/librustc_codegen_llvm/coverageinfo/mod.rs b/compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs
index 2bd37bf9c4f..2bd37bf9c4f 100644
--- a/src/librustc_codegen_llvm/coverageinfo/mod.rs
+++ b/compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs
diff --git a/src/librustc_codegen_llvm/debuginfo/create_scope_map.rs b/compiler/rustc_codegen_llvm/src/debuginfo/create_scope_map.rs
index 7f47b61de3f..7f47b61de3f 100644
--- a/src/librustc_codegen_llvm/debuginfo/create_scope_map.rs
+++ b/compiler/rustc_codegen_llvm/src/debuginfo/create_scope_map.rs
diff --git a/src/librustc_codegen_llvm/debuginfo/doc.rs b/compiler/rustc_codegen_llvm/src/debuginfo/doc.rs
index b3a8fa29887..b3a8fa29887 100644
--- a/src/librustc_codegen_llvm/debuginfo/doc.rs
+++ b/compiler/rustc_codegen_llvm/src/debuginfo/doc.rs
diff --git a/src/librustc_codegen_llvm/debuginfo/gdb.rs b/compiler/rustc_codegen_llvm/src/debuginfo/gdb.rs
index 29edd66049c..29edd66049c 100644
--- a/src/librustc_codegen_llvm/debuginfo/gdb.rs
+++ b/compiler/rustc_codegen_llvm/src/debuginfo/gdb.rs
diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs
index 9d92d53775c..9d92d53775c 100644
--- a/src/librustc_codegen_llvm/debuginfo/metadata.rs
+++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs
diff --git a/src/librustc_codegen_llvm/debuginfo/mod.rs b/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs
index b414426af8c..b414426af8c 100644
--- a/src/librustc_codegen_llvm/debuginfo/mod.rs
+++ b/compiler/rustc_codegen_llvm/src/debuginfo/mod.rs
diff --git a/src/librustc_codegen_llvm/debuginfo/namespace.rs b/compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs
index d1a55335c44..d1a55335c44 100644
--- a/src/librustc_codegen_llvm/debuginfo/namespace.rs
+++ b/compiler/rustc_codegen_llvm/src/debuginfo/namespace.rs
diff --git a/src/librustc_codegen_llvm/debuginfo/source_loc.rs b/compiler/rustc_codegen_llvm/src/debuginfo/source_loc.rs
index 66ae9d72c3e..66ae9d72c3e 100644
--- a/src/librustc_codegen_llvm/debuginfo/source_loc.rs
+++ b/compiler/rustc_codegen_llvm/src/debuginfo/source_loc.rs
diff --git a/src/librustc_codegen_llvm/debuginfo/utils.rs b/compiler/rustc_codegen_llvm/src/debuginfo/utils.rs
index ee188e69be1..ee188e69be1 100644
--- a/src/librustc_codegen_llvm/debuginfo/utils.rs
+++ b/compiler/rustc_codegen_llvm/src/debuginfo/utils.rs
diff --git a/src/librustc_codegen_llvm/declare.rs b/compiler/rustc_codegen_llvm/src/declare.rs
index ec42bd4a039..ec42bd4a039 100644
--- a/src/librustc_codegen_llvm/declare.rs
+++ b/compiler/rustc_codegen_llvm/src/declare.rs
diff --git a/src/librustc_codegen_llvm/intrinsic.rs b/compiler/rustc_codegen_llvm/src/intrinsic.rs
index c1dfb83b135..c1dfb83b135 100644
--- a/src/librustc_codegen_llvm/intrinsic.rs
+++ b/compiler/rustc_codegen_llvm/src/intrinsic.rs
diff --git a/src/librustc_codegen_llvm/lib.rs b/compiler/rustc_codegen_llvm/src/lib.rs
index 67d4b2642c0..67d4b2642c0 100644
--- a/src/librustc_codegen_llvm/lib.rs
+++ b/compiler/rustc_codegen_llvm/src/lib.rs
diff --git a/src/librustc_codegen_llvm/llvm/archive_ro.rs b/compiler/rustc_codegen_llvm/src/llvm/archive_ro.rs
index 64db4f7462d..64db4f7462d 100644
--- a/src/librustc_codegen_llvm/llvm/archive_ro.rs
+++ b/compiler/rustc_codegen_llvm/src/llvm/archive_ro.rs
diff --git a/src/librustc_codegen_llvm/llvm/diagnostic.rs b/compiler/rustc_codegen_llvm/src/llvm/diagnostic.rs
index 47f5c94e70c..47f5c94e70c 100644
--- a/src/librustc_codegen_llvm/llvm/diagnostic.rs
+++ b/compiler/rustc_codegen_llvm/src/llvm/diagnostic.rs
diff --git a/src/librustc_codegen_llvm/llvm/ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs
index 32822eba930..32822eba930 100644
--- a/src/librustc_codegen_llvm/llvm/ffi.rs
+++ b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs
diff --git a/src/librustc_codegen_llvm/llvm/mod.rs b/compiler/rustc_codegen_llvm/src/llvm/mod.rs
index c09e3659f80..c09e3659f80 100644
--- a/src/librustc_codegen_llvm/llvm/mod.rs
+++ b/compiler/rustc_codegen_llvm/src/llvm/mod.rs
diff --git a/src/librustc_codegen_llvm/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs
index f0b50459837..f0b50459837 100644
--- a/src/librustc_codegen_llvm/llvm_util.rs
+++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs
diff --git a/src/librustc_codegen_llvm/metadata.rs b/compiler/rustc_codegen_llvm/src/metadata.rs
index 9036428c04b..9036428c04b 100644
--- a/src/librustc_codegen_llvm/metadata.rs
+++ b/compiler/rustc_codegen_llvm/src/metadata.rs
diff --git a/src/librustc_codegen_llvm/mono_item.rs b/compiler/rustc_codegen_llvm/src/mono_item.rs
index 992e83d08fc..992e83d08fc 100644
--- a/src/librustc_codegen_llvm/mono_item.rs
+++ b/compiler/rustc_codegen_llvm/src/mono_item.rs
diff --git a/src/librustc_codegen_llvm/type_.rs b/compiler/rustc_codegen_llvm/src/type_.rs
index 3b53b4fe77b..3b53b4fe77b 100644
--- a/src/librustc_codegen_llvm/type_.rs
+++ b/compiler/rustc_codegen_llvm/src/type_.rs
diff --git a/src/librustc_codegen_llvm/type_of.rs b/compiler/rustc_codegen_llvm/src/type_of.rs
index 40870c66475..40870c66475 100644
--- a/src/librustc_codegen_llvm/type_of.rs
+++ b/compiler/rustc_codegen_llvm/src/type_of.rs
diff --git a/src/librustc_codegen_llvm/va_arg.rs b/compiler/rustc_codegen_llvm/src/va_arg.rs
index 54efa05aee8..54efa05aee8 100644
--- a/src/librustc_codegen_llvm/va_arg.rs
+++ b/compiler/rustc_codegen_llvm/src/va_arg.rs
diff --git a/src/librustc_codegen_llvm/value.rs b/compiler/rustc_codegen_llvm/src/value.rs
index 1338a229566..1338a229566 100644
--- a/src/librustc_codegen_llvm/value.rs
+++ b/compiler/rustc_codegen_llvm/src/value.rs
diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml
new file mode 100644
index 00000000000..e5df0f60941
--- /dev/null
+++ b/compiler/rustc_codegen_ssa/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_codegen_ssa"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+test = false
+
+[dependencies]
+bitflags = "1.2.1"
+cc = "1.0.1"
+num_cpus = "1.0"
+memmap = "0.7"
+tracing = "0.1"
+libc = "0.2.50"
+jobserver = "0.1.11"
+tempfile = "3.1"
+pathdiff = "0.2.0"
+
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_ast = { path = "../rustc_ast" }
+rustc_span = { path = "../rustc_span" }
+rustc_middle = { path = "../rustc_middle" }
+rustc_apfloat = { path = "../rustc_apfloat" }
+rustc_attr = { path = "../rustc_attr" }
+rustc_symbol_mangling = { path = "../rustc_symbol_mangling" }
+rustc_data_structures = { path = "../rustc_data_structures"}
+rustc_errors = { path = "../rustc_errors" }
+rustc_fs_util = { path = "../rustc_fs_util" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_incremental = { path = "../rustc_incremental" }
+rustc_index = { path = "../rustc_index" }
+rustc_macros = { path = "../rustc_macros" }
+rustc_target = { path = "../rustc_target" }
+rustc_session = { path = "../rustc_session" }
diff --git a/src/librustc_codegen_ssa/README.md b/compiler/rustc_codegen_ssa/README.md
index 7b770187b75..7b770187b75 100644
--- a/src/librustc_codegen_ssa/README.md
+++ b/compiler/rustc_codegen_ssa/README.md
diff --git a/src/librustc_codegen_ssa/back/archive.rs b/compiler/rustc_codegen_ssa/src/back/archive.rs
index f83b4b2b0c0..f83b4b2b0c0 100644
--- a/src/librustc_codegen_ssa/back/archive.rs
+++ b/compiler/rustc_codegen_ssa/src/back/archive.rs
diff --git a/src/librustc_codegen_ssa/back/command.rs b/compiler/rustc_codegen_ssa/src/back/command.rs
index 0208bb73abd..0208bb73abd 100644
--- a/src/librustc_codegen_ssa/back/command.rs
+++ b/compiler/rustc_codegen_ssa/src/back/command.rs
diff --git a/src/librustc_codegen_ssa/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
index bfcf979d125..bfcf979d125 100644
--- a/src/librustc_codegen_ssa/back/link.rs
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
diff --git a/src/librustc_codegen_ssa/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs
index 0ddf8bd316f..0ddf8bd316f 100644
--- a/src/librustc_codegen_ssa/back/linker.rs
+++ b/compiler/rustc_codegen_ssa/src/back/linker.rs
diff --git a/src/librustc_codegen_ssa/back/lto.rs b/compiler/rustc_codegen_ssa/src/back/lto.rs
index 0d7f4447696..0d7f4447696 100644
--- a/src/librustc_codegen_ssa/back/lto.rs
+++ b/compiler/rustc_codegen_ssa/src/back/lto.rs
diff --git a/src/librustc_codegen_ssa/back/mod.rs b/compiler/rustc_codegen_ssa/src/back/mod.rs
index 20ca503d43f..20ca503d43f 100644
--- a/src/librustc_codegen_ssa/back/mod.rs
+++ b/compiler/rustc_codegen_ssa/src/back/mod.rs
diff --git a/src/librustc_codegen_ssa/back/rpath.rs b/compiler/rustc_codegen_ssa/src/back/rpath.rs
index 005d2efdd3b..005d2efdd3b 100644
--- a/src/librustc_codegen_ssa/back/rpath.rs
+++ b/compiler/rustc_codegen_ssa/src/back/rpath.rs
diff --git a/src/librustc_codegen_ssa/back/rpath/tests.rs b/compiler/rustc_codegen_ssa/src/back/rpath/tests.rs
index 35836ae719b..35836ae719b 100644
--- a/src/librustc_codegen_ssa/back/rpath/tests.rs
+++ b/compiler/rustc_codegen_ssa/src/back/rpath/tests.rs
diff --git a/src/librustc_codegen_ssa/back/symbol_export.rs b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs
index 51cc1ada432..51cc1ada432 100644
--- a/src/librustc_codegen_ssa/back/symbol_export.rs
+++ b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs
diff --git a/src/librustc_codegen_ssa/back/write.rs b/compiler/rustc_codegen_ssa/src/back/write.rs
index 7d69bb983dd..7d69bb983dd 100644
--- a/src/librustc_codegen_ssa/back/write.rs
+++ b/compiler/rustc_codegen_ssa/src/back/write.rs
diff --git a/src/librustc_codegen_ssa/base.rs b/compiler/rustc_codegen_ssa/src/base.rs
index 77c12c410d5..77c12c410d5 100644
--- a/src/librustc_codegen_ssa/base.rs
+++ b/compiler/rustc_codegen_ssa/src/base.rs
diff --git a/src/librustc_codegen_ssa/common.rs b/compiler/rustc_codegen_ssa/src/common.rs
index e04ed531bbf..e04ed531bbf 100644
--- a/src/librustc_codegen_ssa/common.rs
+++ b/compiler/rustc_codegen_ssa/src/common.rs
diff --git a/src/librustc_codegen_ssa/coverageinfo/ffi.rs b/compiler/rustc_codegen_ssa/src/coverageinfo/ffi.rs
index a266d179a42..a266d179a42 100644
--- a/src/librustc_codegen_ssa/coverageinfo/ffi.rs
+++ b/compiler/rustc_codegen_ssa/src/coverageinfo/ffi.rs
diff --git a/src/librustc_codegen_ssa/coverageinfo/map.rs b/compiler/rustc_codegen_ssa/src/coverageinfo/map.rs
index 814e43c5fa5..814e43c5fa5 100644
--- a/src/librustc_codegen_ssa/coverageinfo/map.rs
+++ b/compiler/rustc_codegen_ssa/src/coverageinfo/map.rs
diff --git a/src/librustc_codegen_ssa/coverageinfo/mod.rs b/compiler/rustc_codegen_ssa/src/coverageinfo/mod.rs
index 569fd3f1a51..569fd3f1a51 100644
--- a/src/librustc_codegen_ssa/coverageinfo/mod.rs
+++ b/compiler/rustc_codegen_ssa/src/coverageinfo/mod.rs
diff --git a/src/librustc_codegen_ssa/debuginfo/mod.rs b/compiler/rustc_codegen_ssa/src/debuginfo/mod.rs
index d1a0cf78d6a..d1a0cf78d6a 100644
--- a/src/librustc_codegen_ssa/debuginfo/mod.rs
+++ b/compiler/rustc_codegen_ssa/src/debuginfo/mod.rs
diff --git a/src/librustc_codegen_ssa/debuginfo/type_names.rs b/compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs
index fb8f5a62989..fb8f5a62989 100644
--- a/src/librustc_codegen_ssa/debuginfo/type_names.rs
+++ b/compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs
diff --git a/src/librustc_codegen_ssa/glue.rs b/compiler/rustc_codegen_ssa/src/glue.rs
index 5b086bc43ff..5b086bc43ff 100644
--- a/src/librustc_codegen_ssa/glue.rs
+++ b/compiler/rustc_codegen_ssa/src/glue.rs
diff --git a/src/librustc_codegen_ssa/lib.rs b/compiler/rustc_codegen_ssa/src/lib.rs
index 73e33369175..73e33369175 100644
--- a/src/librustc_codegen_ssa/lib.rs
+++ b/compiler/rustc_codegen_ssa/src/lib.rs
diff --git a/src/librustc_codegen_ssa/meth.rs b/compiler/rustc_codegen_ssa/src/meth.rs
index bcc19c6a44b..bcc19c6a44b 100644
--- a/src/librustc_codegen_ssa/meth.rs
+++ b/compiler/rustc_codegen_ssa/src/meth.rs
diff --git a/src/librustc_codegen_ssa/mir/analyze.rs b/compiler/rustc_codegen_ssa/src/mir/analyze.rs
index 2e386c1e594..2e386c1e594 100644
--- a/src/librustc_codegen_ssa/mir/analyze.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/analyze.rs
diff --git a/src/librustc_codegen_ssa/mir/block.rs b/compiler/rustc_codegen_ssa/src/mir/block.rs
index 8048a569f79..8048a569f79 100644
--- a/src/librustc_codegen_ssa/mir/block.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/block.rs
diff --git a/src/librustc_codegen_ssa/mir/constant.rs b/compiler/rustc_codegen_ssa/src/mir/constant.rs
index 4943e279c7e..4943e279c7e 100644
--- a/src/librustc_codegen_ssa/mir/constant.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/constant.rs
diff --git a/src/librustc_codegen_ssa/mir/coverageinfo.rs b/compiler/rustc_codegen_ssa/src/mir/coverageinfo.rs
index a2ad27b925c..a2ad27b925c 100644
--- a/src/librustc_codegen_ssa/mir/coverageinfo.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/coverageinfo.rs
diff --git a/src/librustc_codegen_ssa/mir/debuginfo.rs b/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs
index d8a530d98fa..d8a530d98fa 100644
--- a/src/librustc_codegen_ssa/mir/debuginfo.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/debuginfo.rs
diff --git a/src/librustc_codegen_ssa/mir/mod.rs b/compiler/rustc_codegen_ssa/src/mir/mod.rs
index 26e6c354702..26e6c354702 100644
--- a/src/librustc_codegen_ssa/mir/mod.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/mod.rs
diff --git a/src/librustc_codegen_ssa/mir/operand.rs b/compiler/rustc_codegen_ssa/src/mir/operand.rs
index 937c7457c63..937c7457c63 100644
--- a/src/librustc_codegen_ssa/mir/operand.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/operand.rs
diff --git a/src/librustc_codegen_ssa/mir/place.rs b/compiler/rustc_codegen_ssa/src/mir/place.rs
index 05656774f0e..05656774f0e 100644
--- a/src/librustc_codegen_ssa/mir/place.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/place.rs
diff --git a/src/librustc_codegen_ssa/mir/rvalue.rs b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs
index 71f924df119..71f924df119 100644
--- a/src/librustc_codegen_ssa/mir/rvalue.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs
diff --git a/src/librustc_codegen_ssa/mir/statement.rs b/compiler/rustc_codegen_ssa/src/mir/statement.rs
index 6f74ba77d4c..6f74ba77d4c 100644
--- a/src/librustc_codegen_ssa/mir/statement.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/statement.rs
diff --git a/src/librustc_codegen_ssa/mono_item.rs b/compiler/rustc_codegen_ssa/src/mono_item.rs
index fc65149937f..fc65149937f 100644
--- a/src/librustc_codegen_ssa/mono_item.rs
+++ b/compiler/rustc_codegen_ssa/src/mono_item.rs
diff --git a/src/librustc_codegen_ssa/traits/abi.rs b/compiler/rustc_codegen_ssa/src/traits/abi.rs
index dd8495850bd..dd8495850bd 100644
--- a/src/librustc_codegen_ssa/traits/abi.rs
+++ b/compiler/rustc_codegen_ssa/src/traits/abi.rs
diff --git a/src/librustc_codegen_ssa/traits/asm.rs b/compiler/rustc_codegen_ssa/src/traits/asm.rs
index 69931935c49..69931935c49 100644
--- a/src/librustc_codegen_ssa/traits/asm.rs
+++ b/compiler/rustc_codegen_ssa/src/traits/asm.rs
diff --git a/src/librustc_codegen_ssa/traits/backend.rs b/compiler/rustc_codegen_ssa/src/traits/backend.rs
index 3522ea01153..3522ea01153 100644
--- a/src/librustc_codegen_ssa/traits/backend.rs
+++ b/compiler/rustc_codegen_ssa/src/traits/backend.rs
diff --git a/src/librustc_codegen_ssa/traits/builder.rs b/compiler/rustc_codegen_ssa/src/traits/builder.rs
index 5ffc83c5f99..5ffc83c5f99 100644
--- a/src/librustc_codegen_ssa/traits/builder.rs
+++ b/compiler/rustc_codegen_ssa/src/traits/builder.rs
diff --git a/src/librustc_codegen_ssa/traits/consts.rs b/compiler/rustc_codegen_ssa/src/traits/consts.rs
index 6b58dea794b..6b58dea794b 100644
--- a/src/librustc_codegen_ssa/traits/consts.rs
+++ b/compiler/rustc_codegen_ssa/src/traits/consts.rs
diff --git a/src/librustc_codegen_ssa/traits/coverageinfo.rs b/compiler/rustc_codegen_ssa/src/traits/coverageinfo.rs
index b74e4e45901..b74e4e45901 100644
--- a/src/librustc_codegen_ssa/traits/coverageinfo.rs
+++ b/compiler/rustc_codegen_ssa/src/traits/coverageinfo.rs
diff --git a/src/librustc_codegen_ssa/traits/debuginfo.rs b/compiler/rustc_codegen_ssa/src/traits/debuginfo.rs
index 1ee0f489ffc..1ee0f489ffc 100644
--- a/src/librustc_codegen_ssa/traits/debuginfo.rs
+++ b/compiler/rustc_codegen_ssa/src/traits/debuginfo.rs
diff --git a/src/librustc_codegen_ssa/traits/declare.rs b/compiler/rustc_codegen_ssa/src/traits/declare.rs
index 690aacd2056..690aacd2056 100644
--- a/src/librustc_codegen_ssa/traits/declare.rs
+++ b/compiler/rustc_codegen_ssa/src/traits/declare.rs
diff --git a/src/librustc_codegen_ssa/traits/intrinsic.rs b/compiler/rustc_codegen_ssa/src/traits/intrinsic.rs
index 9d48e233de6..9d48e233de6 100644
--- a/src/librustc_codegen_ssa/traits/intrinsic.rs
+++ b/compiler/rustc_codegen_ssa/src/traits/intrinsic.rs
diff --git a/src/librustc_codegen_ssa/traits/misc.rs b/compiler/rustc_codegen_ssa/src/traits/misc.rs
index fc57a9a80b2..fc57a9a80b2 100644
--- a/src/librustc_codegen_ssa/traits/misc.rs
+++ b/compiler/rustc_codegen_ssa/src/traits/misc.rs
diff --git a/src/librustc_codegen_ssa/traits/mod.rs b/compiler/rustc_codegen_ssa/src/traits/mod.rs
index 0ac519dd0b1..0ac519dd0b1 100644
--- a/src/librustc_codegen_ssa/traits/mod.rs
+++ b/compiler/rustc_codegen_ssa/src/traits/mod.rs
diff --git a/src/librustc_codegen_ssa/traits/statics.rs b/compiler/rustc_codegen_ssa/src/traits/statics.rs
index 817fc02d166..817fc02d166 100644
--- a/src/librustc_codegen_ssa/traits/statics.rs
+++ b/compiler/rustc_codegen_ssa/src/traits/statics.rs
diff --git a/src/librustc_codegen_ssa/traits/type_.rs b/compiler/rustc_codegen_ssa/src/traits/type_.rs
index 726d948cfd4..726d948cfd4 100644
--- a/src/librustc_codegen_ssa/traits/type_.rs
+++ b/compiler/rustc_codegen_ssa/src/traits/type_.rs
diff --git a/src/librustc_codegen_ssa/traits/write.rs b/compiler/rustc_codegen_ssa/src/traits/write.rs
index 27d52e9b9c5..27d52e9b9c5 100644
--- a/src/librustc_codegen_ssa/traits/write.rs
+++ b/compiler/rustc_codegen_ssa/src/traits/write.rs
diff --git a/src/librustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml
index 988bb733f9f..f929d9911f9 100644
--- a/src/librustc_data_structures/Cargo.toml
+++ b/compiler/rustc_data_structures/Cargo.toml
@@ -5,8 +5,6 @@ version = "0.0.0"
 edition = "2018"
 
 [lib]
-name = "rustc_data_structures"
-path = "lib.rs"
 doctest = false
 
 [dependencies]
@@ -16,9 +14,9 @@ tracing = "0.1"
 jobserver_crate = { version = "0.1.13", package = "jobserver" }
 lazy_static = "1"
 once_cell = { version = "1", features = ["parking_lot"] }
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_macros = { path = "../librustc_macros" }
-rustc_graphviz = { path = "../librustc_graphviz" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_macros = { path = "../rustc_macros" }
+rustc_graphviz = { path = "../rustc_graphviz" }
 cfg-if = "0.1.2"
 crossbeam-utils = { version = "0.7", features = ["nightly"] }
 stable_deref_trait = "1.0.0"
@@ -26,7 +24,7 @@ rayon = { version = "0.3.0", package = "rustc-rayon" }
 rayon-core = { version = "0.3.0", package = "rustc-rayon-core" }
 rustc-hash = "1.1.0"
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-rustc_index = { path = "../librustc_index", package = "rustc_index" }
+rustc_index = { path = "../rustc_index", package = "rustc_index" }
 bitflags = "1.2.1"
 measureme = "0.7.1"
 libc = "0.2"
diff --git a/src/librustc_data_structures/atomic_ref.rs b/compiler/rustc_data_structures/src/atomic_ref.rs
index eeb1b309257..eeb1b309257 100644
--- a/src/librustc_data_structures/atomic_ref.rs
+++ b/compiler/rustc_data_structures/src/atomic_ref.rs
diff --git a/src/librustc_data_structures/base_n.rs b/compiler/rustc_data_structures/src/base_n.rs
index 3c7bea27124..3c7bea27124 100644
--- a/src/librustc_data_structures/base_n.rs
+++ b/compiler/rustc_data_structures/src/base_n.rs
diff --git a/src/librustc_data_structures/base_n/tests.rs b/compiler/rustc_data_structures/src/base_n/tests.rs
index b68ef1eb7f4..b68ef1eb7f4 100644
--- a/src/librustc_data_structures/base_n/tests.rs
+++ b/compiler/rustc_data_structures/src/base_n/tests.rs
diff --git a/src/librustc_data_structures/binary_search_util/mod.rs b/compiler/rustc_data_structures/src/binary_search_util/mod.rs
index ede5757a479..ede5757a479 100644
--- a/src/librustc_data_structures/binary_search_util/mod.rs
+++ b/compiler/rustc_data_structures/src/binary_search_util/mod.rs
diff --git a/src/librustc_data_structures/binary_search_util/tests.rs b/compiler/rustc_data_structures/src/binary_search_util/tests.rs
index d74febb5c0f..d74febb5c0f 100644
--- a/src/librustc_data_structures/binary_search_util/tests.rs
+++ b/compiler/rustc_data_structures/src/binary_search_util/tests.rs
diff --git a/src/librustc_data_structures/box_region.rs b/compiler/rustc_data_structures/src/box_region.rs
index eb6f4e8213e..eb6f4e8213e 100644
--- a/src/librustc_data_structures/box_region.rs
+++ b/compiler/rustc_data_structures/src/box_region.rs
diff --git a/src/librustc_data_structures/captures.rs b/compiler/rustc_data_structures/src/captures.rs
index 26b90ebfd5f..26b90ebfd5f 100644
--- a/src/librustc_data_structures/captures.rs
+++ b/compiler/rustc_data_structures/src/captures.rs
diff --git a/src/librustc_data_structures/const_cstr.rs b/compiler/rustc_data_structures/src/const_cstr.rs
index 1ebcb87818e..1ebcb87818e 100644
--- a/src/librustc_data_structures/const_cstr.rs
+++ b/compiler/rustc_data_structures/src/const_cstr.rs
diff --git a/src/librustc_data_structures/fingerprint.rs b/compiler/rustc_data_structures/src/fingerprint.rs
index f8d631ce01e..f8d631ce01e 100644
--- a/src/librustc_data_structures/fingerprint.rs
+++ b/compiler/rustc_data_structures/src/fingerprint.rs
diff --git a/src/librustc_data_structures/flock.rs b/compiler/rustc_data_structures/src/flock.rs
index 9383be474fd..9383be474fd 100644
--- a/src/librustc_data_structures/flock.rs
+++ b/compiler/rustc_data_structures/src/flock.rs
diff --git a/src/librustc_data_structures/frozen.rs b/compiler/rustc_data_structures/src/frozen.rs
index 2daf5b04141..2daf5b04141 100644
--- a/src/librustc_data_structures/frozen.rs
+++ b/compiler/rustc_data_structures/src/frozen.rs
diff --git a/src/librustc_data_structures/fx.rs b/compiler/rustc_data_structures/src/fx.rs
index bbeb193dba3..bbeb193dba3 100644
--- a/src/librustc_data_structures/fx.rs
+++ b/compiler/rustc_data_structures/src/fx.rs
diff --git a/src/librustc_data_structures/graph/dominators/mod.rs b/compiler/rustc_data_structures/src/graph/dominators/mod.rs
index 438a0d0c6ff..438a0d0c6ff 100644
--- a/src/librustc_data_structures/graph/dominators/mod.rs
+++ b/compiler/rustc_data_structures/src/graph/dominators/mod.rs
diff --git a/src/librustc_data_structures/graph/dominators/tests.rs b/compiler/rustc_data_structures/src/graph/dominators/tests.rs
index 1160df5186b..1160df5186b 100644
--- a/src/librustc_data_structures/graph/dominators/tests.rs
+++ b/compiler/rustc_data_structures/src/graph/dominators/tests.rs
diff --git a/src/librustc_data_structures/graph/implementation/mod.rs b/compiler/rustc_data_structures/src/graph/implementation/mod.rs
index 1aa7ac024d9..1aa7ac024d9 100644
--- a/src/librustc_data_structures/graph/implementation/mod.rs
+++ b/compiler/rustc_data_structures/src/graph/implementation/mod.rs
diff --git a/src/librustc_data_structures/graph/implementation/tests.rs b/compiler/rustc_data_structures/src/graph/implementation/tests.rs
index e4e4d0d44ba..e4e4d0d44ba 100644
--- a/src/librustc_data_structures/graph/implementation/tests.rs
+++ b/compiler/rustc_data_structures/src/graph/implementation/tests.rs
diff --git a/src/librustc_data_structures/graph/iterate/mod.rs b/compiler/rustc_data_structures/src/graph/iterate/mod.rs
index 64ff6130ddf..64ff6130ddf 100644
--- a/src/librustc_data_structures/graph/iterate/mod.rs
+++ b/compiler/rustc_data_structures/src/graph/iterate/mod.rs
diff --git a/src/librustc_data_structures/graph/iterate/tests.rs b/compiler/rustc_data_structures/src/graph/iterate/tests.rs
index 0e038e88b22..0e038e88b22 100644
--- a/src/librustc_data_structures/graph/iterate/tests.rs
+++ b/compiler/rustc_data_structures/src/graph/iterate/tests.rs
diff --git a/src/librustc_data_structures/graph/mod.rs b/compiler/rustc_data_structures/src/graph/mod.rs
index e0903e43241..e0903e43241 100644
--- a/src/librustc_data_structures/graph/mod.rs
+++ b/compiler/rustc_data_structures/src/graph/mod.rs
diff --git a/src/librustc_data_structures/graph/reference.rs b/compiler/rustc_data_structures/src/graph/reference.rs
index c259fe56c15..c259fe56c15 100644
--- a/src/librustc_data_structures/graph/reference.rs
+++ b/compiler/rustc_data_structures/src/graph/reference.rs
diff --git a/src/librustc_data_structures/graph/scc/mod.rs b/compiler/rustc_data_structures/src/graph/scc/mod.rs
index 2db8e466e11..2db8e466e11 100644
--- a/src/librustc_data_structures/graph/scc/mod.rs
+++ b/compiler/rustc_data_structures/src/graph/scc/mod.rs
diff --git a/src/librustc_data_structures/graph/scc/tests.rs b/compiler/rustc_data_structures/src/graph/scc/tests.rs
index 1d5f46ebab1..1d5f46ebab1 100644
--- a/src/librustc_data_structures/graph/scc/tests.rs
+++ b/compiler/rustc_data_structures/src/graph/scc/tests.rs
diff --git a/src/librustc_data_structures/graph/tests.rs b/compiler/rustc_data_structures/src/graph/tests.rs
index 7f4ef906b36..7f4ef906b36 100644
--- a/src/librustc_data_structures/graph/tests.rs
+++ b/compiler/rustc_data_structures/src/graph/tests.rs
diff --git a/src/librustc_data_structures/graph/vec_graph/mod.rs b/compiler/rustc_data_structures/src/graph/vec_graph/mod.rs
index 064467174ca..064467174ca 100644
--- a/src/librustc_data_structures/graph/vec_graph/mod.rs
+++ b/compiler/rustc_data_structures/src/graph/vec_graph/mod.rs
diff --git a/src/librustc_data_structures/graph/vec_graph/tests.rs b/compiler/rustc_data_structures/src/graph/vec_graph/tests.rs
index c8f97926717..c8f97926717 100644
--- a/src/librustc_data_structures/graph/vec_graph/tests.rs
+++ b/compiler/rustc_data_structures/src/graph/vec_graph/tests.rs
diff --git a/src/librustc_data_structures/jobserver.rs b/compiler/rustc_data_structures/src/jobserver.rs
index a811c88839d..a811c88839d 100644
--- a/src/librustc_data_structures/jobserver.rs
+++ b/compiler/rustc_data_structures/src/jobserver.rs
diff --git a/src/librustc_data_structures/lib.rs b/compiler/rustc_data_structures/src/lib.rs
index af4a7bd1881..af4a7bd1881 100644
--- a/src/librustc_data_structures/lib.rs
+++ b/compiler/rustc_data_structures/src/lib.rs
diff --git a/src/librustc_data_structures/macros.rs b/compiler/rustc_data_structures/src/macros.rs
index 67fbe3058cd..67fbe3058cd 100644
--- a/src/librustc_data_structures/macros.rs
+++ b/compiler/rustc_data_structures/src/macros.rs
diff --git a/src/librustc_data_structures/map_in_place.rs b/compiler/rustc_data_structures/src/map_in_place.rs
index 5dd9fc6e8bc..5dd9fc6e8bc 100644
--- a/src/librustc_data_structures/map_in_place.rs
+++ b/compiler/rustc_data_structures/src/map_in_place.rs
diff --git a/src/librustc_data_structures/obligation_forest/graphviz.rs b/compiler/rustc_data_structures/src/obligation_forest/graphviz.rs
index 3a268e4b4f4..3a268e4b4f4 100644
--- a/src/librustc_data_structures/obligation_forest/graphviz.rs
+++ b/compiler/rustc_data_structures/src/obligation_forest/graphviz.rs
diff --git a/src/librustc_data_structures/obligation_forest/mod.rs b/compiler/rustc_data_structures/src/obligation_forest/mod.rs
index 7cf5202d919..7cf5202d919 100644
--- a/src/librustc_data_structures/obligation_forest/mod.rs
+++ b/compiler/rustc_data_structures/src/obligation_forest/mod.rs
diff --git a/src/librustc_data_structures/obligation_forest/tests.rs b/compiler/rustc_data_structures/src/obligation_forest/tests.rs
index 01652465eea..01652465eea 100644
--- a/src/librustc_data_structures/obligation_forest/tests.rs
+++ b/compiler/rustc_data_structures/src/obligation_forest/tests.rs
diff --git a/src/librustc_data_structures/owning_ref/LICENSE b/compiler/rustc_data_structures/src/owning_ref/LICENSE
index dff72d1e432..dff72d1e432 100644
--- a/src/librustc_data_structures/owning_ref/LICENSE
+++ b/compiler/rustc_data_structures/src/owning_ref/LICENSE
diff --git a/src/librustc_data_structures/owning_ref/mod.rs b/compiler/rustc_data_structures/src/owning_ref/mod.rs
index ad4b79de236..ad4b79de236 100644
--- a/src/librustc_data_structures/owning_ref/mod.rs
+++ b/compiler/rustc_data_structures/src/owning_ref/mod.rs
diff --git a/src/librustc_data_structures/owning_ref/tests.rs b/compiler/rustc_data_structures/src/owning_ref/tests.rs
index 7b8179e90bd..7b8179e90bd 100644
--- a/src/librustc_data_structures/owning_ref/tests.rs
+++ b/compiler/rustc_data_structures/src/owning_ref/tests.rs
diff --git a/src/librustc_data_structures/profiling.rs b/compiler/rustc_data_structures/src/profiling.rs
index 07d16c6483e..07d16c6483e 100644
--- a/src/librustc_data_structures/profiling.rs
+++ b/compiler/rustc_data_structures/src/profiling.rs
diff --git a/src/librustc_data_structures/ptr_key.rs b/compiler/rustc_data_structures/src/ptr_key.rs
index 440ccb05d86..440ccb05d86 100644
--- a/src/librustc_data_structures/ptr_key.rs
+++ b/compiler/rustc_data_structures/src/ptr_key.rs
diff --git a/src/librustc_data_structures/sharded.rs b/compiler/rustc_data_structures/src/sharded.rs
index 485719c5175..485719c5175 100644
--- a/src/librustc_data_structures/sharded.rs
+++ b/compiler/rustc_data_structures/src/sharded.rs
diff --git a/src/librustc_data_structures/sip128.rs b/compiler/rustc_data_structures/src/sip128.rs
index beb28dd0720..beb28dd0720 100644
--- a/src/librustc_data_structures/sip128.rs
+++ b/compiler/rustc_data_structures/src/sip128.rs
diff --git a/src/librustc_data_structures/sip128/tests.rs b/compiler/rustc_data_structures/src/sip128/tests.rs
index 80b7fc74756..80b7fc74756 100644
--- a/src/librustc_data_structures/sip128/tests.rs
+++ b/compiler/rustc_data_structures/src/sip128/tests.rs
diff --git a/src/librustc_data_structures/small_c_str.rs b/compiler/rustc_data_structures/src/small_c_str.rs
index 4a089398ce6..4a089398ce6 100644
--- a/src/librustc_data_structures/small_c_str.rs
+++ b/compiler/rustc_data_structures/src/small_c_str.rs
diff --git a/src/librustc_data_structures/small_c_str/tests.rs b/compiler/rustc_data_structures/src/small_c_str/tests.rs
index 47277604b2b..47277604b2b 100644
--- a/src/librustc_data_structures/small_c_str/tests.rs
+++ b/compiler/rustc_data_structures/src/small_c_str/tests.rs
diff --git a/src/librustc_data_structures/snapshot_map/mod.rs b/compiler/rustc_data_structures/src/snapshot_map/mod.rs
index b4cc85293f7..b4cc85293f7 100644
--- a/src/librustc_data_structures/snapshot_map/mod.rs
+++ b/compiler/rustc_data_structures/src/snapshot_map/mod.rs
diff --git a/src/librustc_data_structures/snapshot_map/tests.rs b/compiler/rustc_data_structures/src/snapshot_map/tests.rs
index 72ca53c2be9..72ca53c2be9 100644
--- a/src/librustc_data_structures/snapshot_map/tests.rs
+++ b/compiler/rustc_data_structures/src/snapshot_map/tests.rs
diff --git a/src/librustc_data_structures/sorted_map.rs b/compiler/rustc_data_structures/src/sorted_map.rs
index 856eb73e629..856eb73e629 100644
--- a/src/librustc_data_structures/sorted_map.rs
+++ b/compiler/rustc_data_structures/src/sorted_map.rs
diff --git a/src/librustc_data_structures/sorted_map/index_map.rs b/compiler/rustc_data_structures/src/sorted_map/index_map.rs
index 2bb421a47ef..2bb421a47ef 100644
--- a/src/librustc_data_structures/sorted_map/index_map.rs
+++ b/compiler/rustc_data_structures/src/sorted_map/index_map.rs
diff --git a/src/librustc_data_structures/sorted_map/tests.rs b/compiler/rustc_data_structures/src/sorted_map/tests.rs
index 7d91e1fdcef..7d91e1fdcef 100644
--- a/src/librustc_data_structures/sorted_map/tests.rs
+++ b/compiler/rustc_data_structures/src/sorted_map/tests.rs
diff --git a/src/librustc_data_structures/stable_hasher.rs b/compiler/rustc_data_structures/src/stable_hasher.rs
index c1c79b174f4..c1c79b174f4 100644
--- a/src/librustc_data_structures/stable_hasher.rs
+++ b/compiler/rustc_data_structures/src/stable_hasher.rs
diff --git a/src/librustc_data_structures/stable_map.rs b/compiler/rustc_data_structures/src/stable_map.rs
index 670452d0d8c..670452d0d8c 100644
--- a/src/librustc_data_structures/stable_map.rs
+++ b/compiler/rustc_data_structures/src/stable_map.rs
diff --git a/src/librustc_data_structures/stable_set.rs b/compiler/rustc_data_structures/src/stable_set.rs
index c7ca74f5fbd..c7ca74f5fbd 100644
--- a/src/librustc_data_structures/stable_set.rs
+++ b/compiler/rustc_data_structures/src/stable_set.rs
diff --git a/src/librustc_data_structures/stack.rs b/compiler/rustc_data_structures/src/stack.rs
index a4964b7aa0c..a4964b7aa0c 100644
--- a/src/librustc_data_structures/stack.rs
+++ b/compiler/rustc_data_structures/src/stack.rs
diff --git a/src/librustc_data_structures/svh.rs b/compiler/rustc_data_structures/src/svh.rs
index 02103de2e8d..02103de2e8d 100644
--- a/src/librustc_data_structures/svh.rs
+++ b/compiler/rustc_data_structures/src/svh.rs
diff --git a/src/librustc_data_structures/sync.rs b/compiler/rustc_data_structures/src/sync.rs
index 53d831749ce..53d831749ce 100644
--- a/src/librustc_data_structures/sync.rs
+++ b/compiler/rustc_data_structures/src/sync.rs
diff --git a/src/librustc_data_structures/tagged_ptr.rs b/compiler/rustc_data_structures/src/tagged_ptr.rs
index e3839d19365..e3839d19365 100644
--- a/src/librustc_data_structures/tagged_ptr.rs
+++ b/compiler/rustc_data_structures/src/tagged_ptr.rs
diff --git a/src/librustc_data_structures/tagged_ptr/copy.rs b/compiler/rustc_data_structures/src/tagged_ptr/copy.rs
index d39d146db31..d39d146db31 100644
--- a/src/librustc_data_structures/tagged_ptr/copy.rs
+++ b/compiler/rustc_data_structures/src/tagged_ptr/copy.rs
diff --git a/src/librustc_data_structures/tagged_ptr/drop.rs b/compiler/rustc_data_structures/src/tagged_ptr/drop.rs
index 63f64beae5a..63f64beae5a 100644
--- a/src/librustc_data_structures/tagged_ptr/drop.rs
+++ b/compiler/rustc_data_structures/src/tagged_ptr/drop.rs
diff --git a/src/librustc_data_structures/temp_dir.rs b/compiler/rustc_data_structures/src/temp_dir.rs
index 0d9b3e3ca25..0d9b3e3ca25 100644
--- a/src/librustc_data_structures/temp_dir.rs
+++ b/compiler/rustc_data_structures/src/temp_dir.rs
diff --git a/src/librustc_data_structures/thin_vec.rs b/compiler/rustc_data_structures/src/thin_vec.rs
index 4d673fd5cf9..4d673fd5cf9 100644
--- a/src/librustc_data_structures/thin_vec.rs
+++ b/compiler/rustc_data_structures/src/thin_vec.rs
diff --git a/src/librustc_data_structures/tiny_list.rs b/compiler/rustc_data_structures/src/tiny_list.rs
index e94a0c6eb59..e94a0c6eb59 100644
--- a/src/librustc_data_structures/tiny_list.rs
+++ b/compiler/rustc_data_structures/src/tiny_list.rs
diff --git a/src/librustc_data_structures/tiny_list/tests.rs b/compiler/rustc_data_structures/src/tiny_list/tests.rs
index a8ae2bc8727..a8ae2bc8727 100644
--- a/src/librustc_data_structures/tiny_list/tests.rs
+++ b/compiler/rustc_data_structures/src/tiny_list/tests.rs
diff --git a/src/librustc_data_structures/transitive_relation.rs b/compiler/rustc_data_structures/src/transitive_relation.rs
index fe60a99dde0..fe60a99dde0 100644
--- a/src/librustc_data_structures/transitive_relation.rs
+++ b/compiler/rustc_data_structures/src/transitive_relation.rs
diff --git a/src/librustc_data_structures/transitive_relation/tests.rs b/compiler/rustc_data_structures/src/transitive_relation/tests.rs
index ca90ba176ae..ca90ba176ae 100644
--- a/src/librustc_data_structures/transitive_relation/tests.rs
+++ b/compiler/rustc_data_structures/src/transitive_relation/tests.rs
diff --git a/src/librustc_data_structures/vec_linked_list.rs b/compiler/rustc_data_structures/src/vec_linked_list.rs
index 1cf030d852e..1cf030d852e 100644
--- a/src/librustc_data_structures/vec_linked_list.rs
+++ b/compiler/rustc_data_structures/src/vec_linked_list.rs
diff --git a/src/librustc_data_structures/work_queue.rs b/compiler/rustc_data_structures/src/work_queue.rs
index 0c848eb144d..0c848eb144d 100644
--- a/src/librustc_data_structures/work_queue.rs
+++ b/compiler/rustc_data_structures/src/work_queue.rs
diff --git a/compiler/rustc_driver/Cargo.toml b/compiler/rustc_driver/Cargo.toml
new file mode 100644
index 00000000000..76e8592254c
--- /dev/null
+++ b/compiler/rustc_driver/Cargo.toml
@@ -0,0 +1,41 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_driver"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+crate-type = ["dylib"]
+
+[dependencies]
+lazy_static = "1.0"
+libc = "0.2"
+tracing = { version = "0.1.18", features = ["release_max_level_info"]  }
+tracing-subscriber = { version = "0.2.10", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] }
+rustc_middle = { path = "../rustc_middle" }
+rustc_ast_pretty = { path = "../rustc_ast_pretty" }
+rustc_target = { path = "../rustc_target" }
+rustc_lint = { path = "../rustc_lint" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_feature = { path = "../rustc_feature" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_hir_pretty = { path = "../rustc_hir_pretty" }
+rustc_metadata = { path = "../rustc_metadata" }
+rustc_mir = { path = "../rustc_mir" }
+rustc_parse = { path = "../rustc_parse" }
+rustc_plugin_impl = { path = "../rustc_plugin_impl" }
+rustc_save_analysis = { path = "../rustc_save_analysis" }
+rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
+rustc_session = { path = "../rustc_session" }
+rustc_error_codes = { path = "../rustc_error_codes" }
+rustc_interface = { path = "../rustc_interface" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_ast = { path = "../rustc_ast" }
+rustc_span = { path = "../rustc_span" }
+
+[target.'cfg(windows)'.dependencies]
+winapi = { version = "0.3", features = ["consoleapi", "debugapi", "processenv"] }
+
+[features]
+llvm = ['rustc_interface/llvm']
diff --git a/src/librustc_driver/README.md b/compiler/rustc_driver/README.md
index 37dc7f6ba5f..37dc7f6ba5f 100644
--- a/src/librustc_driver/README.md
+++ b/compiler/rustc_driver/README.md
diff --git a/src/librustc_driver/args.rs b/compiler/rustc_driver/src/args.rs
index 5686819c61b..5686819c61b 100644
--- a/src/librustc_driver/args.rs
+++ b/compiler/rustc_driver/src/args.rs
diff --git a/src/librustc_driver/lib.rs b/compiler/rustc_driver/src/lib.rs
index 09f5b22cc63..09f5b22cc63 100644
--- a/src/librustc_driver/lib.rs
+++ b/compiler/rustc_driver/src/lib.rs
diff --git a/src/librustc_driver/pretty.rs b/compiler/rustc_driver/src/pretty.rs
index b0fbf1e03f5..b0fbf1e03f5 100644
--- a/src/librustc_driver/pretty.rs
+++ b/compiler/rustc_driver/src/pretty.rs
diff --git a/src/librustc_error_codes/Cargo.toml b/compiler/rustc_error_codes/Cargo.toml
index 5def867ff11..b4c9cd94565 100644
--- a/src/librustc_error_codes/Cargo.toml
+++ b/compiler/rustc_error_codes/Cargo.toml
@@ -3,7 +3,3 @@ authors = ["The Rust Project Developers"]
 name = "rustc_error_codes"
 version = "0.0.0"
 edition = "2018"
-
-[lib]
-name = "rustc_error_codes"
-path = "lib.rs"
diff --git a/src/librustc_error_codes/error_codes.rs b/compiler/rustc_error_codes/src/error_codes.rs
index 4e5e77f80c2..4e5e77f80c2 100644
--- a/src/librustc_error_codes/error_codes.rs
+++ b/compiler/rustc_error_codes/src/error_codes.rs
diff --git a/src/librustc_error_codes/error_codes/E0001.md b/compiler/rustc_error_codes/src/error_codes/E0001.md
index 90756780d15..90756780d15 100644
--- a/src/librustc_error_codes/error_codes/E0001.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0001.md
diff --git a/src/librustc_error_codes/error_codes/E0002.md b/compiler/rustc_error_codes/src/error_codes/E0002.md
index 5cb59da10e0..5cb59da10e0 100644
--- a/src/librustc_error_codes/error_codes/E0002.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0002.md
diff --git a/src/librustc_error_codes/error_codes/E0004.md b/compiler/rustc_error_codes/src/error_codes/E0004.md
index b79ef5fd8cb..b79ef5fd8cb 100644
--- a/src/librustc_error_codes/error_codes/E0004.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0004.md
diff --git a/src/librustc_error_codes/error_codes/E0005.md b/compiler/rustc_error_codes/src/error_codes/E0005.md
index e2e7db5082d..e2e7db5082d 100644
--- a/src/librustc_error_codes/error_codes/E0005.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0005.md
diff --git a/src/librustc_error_codes/error_codes/E0007.md b/compiler/rustc_error_codes/src/error_codes/E0007.md
index 2be7870d5ae..2be7870d5ae 100644
--- a/src/librustc_error_codes/error_codes/E0007.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0007.md
diff --git a/src/librustc_error_codes/error_codes/E0009.md b/compiler/rustc_error_codes/src/error_codes/E0009.md
index aaabba04349..aaabba04349 100644
--- a/src/librustc_error_codes/error_codes/E0009.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0009.md
diff --git a/src/librustc_error_codes/error_codes/E0010.md b/compiler/rustc_error_codes/src/error_codes/E0010.md
index 71c790e102f..71c790e102f 100644
--- a/src/librustc_error_codes/error_codes/E0010.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0010.md
diff --git a/src/librustc_error_codes/error_codes/E0013.md b/compiler/rustc_error_codes/src/error_codes/E0013.md
index 8de177590ec..8de177590ec 100644
--- a/src/librustc_error_codes/error_codes/E0013.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0013.md
diff --git a/src/librustc_error_codes/error_codes/E0014.md b/compiler/rustc_error_codes/src/error_codes/E0014.md
index 2c69957e9f6..2c69957e9f6 100644
--- a/src/librustc_error_codes/error_codes/E0014.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0014.md
diff --git a/src/librustc_error_codes/error_codes/E0015.md b/compiler/rustc_error_codes/src/error_codes/E0015.md
index 021a0219d13..021a0219d13 100644
--- a/src/librustc_error_codes/error_codes/E0015.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0015.md
diff --git a/src/librustc_error_codes/error_codes/E0019.md b/compiler/rustc_error_codes/src/error_codes/E0019.md
index 7832468a539..7832468a539 100644
--- a/src/librustc_error_codes/error_codes/E0019.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0019.md
diff --git a/src/librustc_error_codes/error_codes/E0023.md b/compiler/rustc_error_codes/src/error_codes/E0023.md
index c1d85705da3..c1d85705da3 100644
--- a/src/librustc_error_codes/error_codes/E0023.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0023.md
diff --git a/src/librustc_error_codes/error_codes/E0025.md b/compiler/rustc_error_codes/src/error_codes/E0025.md
index a85dc8c1978..a85dc8c1978 100644
--- a/src/librustc_error_codes/error_codes/E0025.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0025.md
diff --git a/src/librustc_error_codes/error_codes/E0026.md b/compiler/rustc_error_codes/src/error_codes/E0026.md
index 72c575aabb6..72c575aabb6 100644
--- a/src/librustc_error_codes/error_codes/E0026.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0026.md
diff --git a/src/librustc_error_codes/error_codes/E0027.md b/compiler/rustc_error_codes/src/error_codes/E0027.md
index a8b1340ca0c..a8b1340ca0c 100644
--- a/src/librustc_error_codes/error_codes/E0027.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0027.md
diff --git a/src/librustc_error_codes/error_codes/E0029.md b/compiler/rustc_error_codes/src/error_codes/E0029.md
index d12d85b9b4c..d12d85b9b4c 100644
--- a/src/librustc_error_codes/error_codes/E0029.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0029.md
diff --git a/src/librustc_error_codes/error_codes/E0030.md b/compiler/rustc_error_codes/src/error_codes/E0030.md
index 67d496da5e4..67d496da5e4 100644
--- a/src/librustc_error_codes/error_codes/E0030.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0030.md
diff --git a/src/librustc_error_codes/error_codes/E0033.md b/compiler/rustc_error_codes/src/error_codes/E0033.md
index 735a2d1f3fe..735a2d1f3fe 100644
--- a/src/librustc_error_codes/error_codes/E0033.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0033.md
diff --git a/src/librustc_error_codes/error_codes/E0034.md b/compiler/rustc_error_codes/src/error_codes/E0034.md
index 2a21f3441c6..2a21f3441c6 100644
--- a/src/librustc_error_codes/error_codes/E0034.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0034.md
diff --git a/src/librustc_error_codes/error_codes/E0038.md b/compiler/rustc_error_codes/src/error_codes/E0038.md
index b2cc2a2273a..b2cc2a2273a 100644
--- a/src/librustc_error_codes/error_codes/E0038.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0038.md
diff --git a/src/librustc_error_codes/error_codes/E0040.md b/compiler/rustc_error_codes/src/error_codes/E0040.md
index 1373f8340d8..1373f8340d8 100644
--- a/src/librustc_error_codes/error_codes/E0040.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0040.md
diff --git a/src/librustc_error_codes/error_codes/E0044.md b/compiler/rustc_error_codes/src/error_codes/E0044.md
index 635ff953290..635ff953290 100644
--- a/src/librustc_error_codes/error_codes/E0044.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0044.md
diff --git a/src/librustc_error_codes/error_codes/E0045.md b/compiler/rustc_error_codes/src/error_codes/E0045.md
index 143c693bf7c..143c693bf7c 100644
--- a/src/librustc_error_codes/error_codes/E0045.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0045.md
diff --git a/src/librustc_error_codes/error_codes/E0046.md b/compiler/rustc_error_codes/src/error_codes/E0046.md
index d8f95330c36..d8f95330c36 100644
--- a/src/librustc_error_codes/error_codes/E0046.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0046.md
diff --git a/src/librustc_error_codes/error_codes/E0049.md b/compiler/rustc_error_codes/src/error_codes/E0049.md
index a2034a3428b..a2034a3428b 100644
--- a/src/librustc_error_codes/error_codes/E0049.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0049.md
diff --git a/src/librustc_error_codes/error_codes/E0050.md b/compiler/rustc_error_codes/src/error_codes/E0050.md
index 7b84c480073..7b84c480073 100644
--- a/src/librustc_error_codes/error_codes/E0050.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0050.md
diff --git a/src/librustc_error_codes/error_codes/E0053.md b/compiler/rustc_error_codes/src/error_codes/E0053.md
index cb2a8638a29..cb2a8638a29 100644
--- a/src/librustc_error_codes/error_codes/E0053.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0053.md
diff --git a/src/librustc_error_codes/error_codes/E0054.md b/compiler/rustc_error_codes/src/error_codes/E0054.md
index c3eb375fbcc..c3eb375fbcc 100644
--- a/src/librustc_error_codes/error_codes/E0054.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0054.md
diff --git a/src/librustc_error_codes/error_codes/E0055.md b/compiler/rustc_error_codes/src/error_codes/E0055.md
index 223ba400029..223ba400029 100644
--- a/src/librustc_error_codes/error_codes/E0055.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0055.md
diff --git a/src/librustc_error_codes/error_codes/E0057.md b/compiler/rustc_error_codes/src/error_codes/E0057.md
index bb5e4b48d2d..bb5e4b48d2d 100644
--- a/src/librustc_error_codes/error_codes/E0057.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0057.md
diff --git a/src/librustc_error_codes/error_codes/E0059.md b/compiler/rustc_error_codes/src/error_codes/E0059.md
index b22edead25e..b22edead25e 100644
--- a/src/librustc_error_codes/error_codes/E0059.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0059.md
diff --git a/src/librustc_error_codes/error_codes/E0060.md b/compiler/rustc_error_codes/src/error_codes/E0060.md
index e6906d72367..e6906d72367 100644
--- a/src/librustc_error_codes/error_codes/E0060.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0060.md
diff --git a/src/librustc_error_codes/error_codes/E0061.md b/compiler/rustc_error_codes/src/error_codes/E0061.md
index 143251c13b0..143251c13b0 100644
--- a/src/librustc_error_codes/error_codes/E0061.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0061.md
diff --git a/src/librustc_error_codes/error_codes/E0062.md b/compiler/rustc_error_codes/src/error_codes/E0062.md
index 64fc027b885..64fc027b885 100644
--- a/src/librustc_error_codes/error_codes/E0062.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0062.md
diff --git a/src/librustc_error_codes/error_codes/E0063.md b/compiler/rustc_error_codes/src/error_codes/E0063.md
index 0e611deac42..0e611deac42 100644
--- a/src/librustc_error_codes/error_codes/E0063.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0063.md
diff --git a/src/librustc_error_codes/error_codes/E0067.md b/compiler/rustc_error_codes/src/error_codes/E0067.md
index 11041bb53ee..11041bb53ee 100644
--- a/src/librustc_error_codes/error_codes/E0067.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0067.md
diff --git a/src/librustc_error_codes/error_codes/E0069.md b/compiler/rustc_error_codes/src/error_codes/E0069.md
index 7367a5c0922..7367a5c0922 100644
--- a/src/librustc_error_codes/error_codes/E0069.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0069.md
diff --git a/src/librustc_error_codes/error_codes/E0070.md b/compiler/rustc_error_codes/src/error_codes/E0070.md
index 97522af3da8..97522af3da8 100644
--- a/src/librustc_error_codes/error_codes/E0070.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0070.md
diff --git a/src/librustc_error_codes/error_codes/E0071.md b/compiler/rustc_error_codes/src/error_codes/E0071.md
index bc2c03a0220..bc2c03a0220 100644
--- a/src/librustc_error_codes/error_codes/E0071.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0071.md
diff --git a/src/librustc_error_codes/error_codes/E0072.md b/compiler/rustc_error_codes/src/error_codes/E0072.md
index 8f7749abab1..8f7749abab1 100644
--- a/src/librustc_error_codes/error_codes/E0072.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0072.md
diff --git a/src/librustc_error_codes/error_codes/E0073.md b/compiler/rustc_error_codes/src/error_codes/E0073.md
index a5aea86ff2d..a5aea86ff2d 100644
--- a/src/librustc_error_codes/error_codes/E0073.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0073.md
diff --git a/src/librustc_error_codes/error_codes/E0074.md b/compiler/rustc_error_codes/src/error_codes/E0074.md
index e25dec7681b..e25dec7681b 100644
--- a/src/librustc_error_codes/error_codes/E0074.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0074.md
diff --git a/src/librustc_error_codes/error_codes/E0075.md b/compiler/rustc_error_codes/src/error_codes/E0075.md
index 969c1ee7131..969c1ee7131 100644
--- a/src/librustc_error_codes/error_codes/E0075.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0075.md
diff --git a/src/librustc_error_codes/error_codes/E0076.md b/compiler/rustc_error_codes/src/error_codes/E0076.md
index f293a2a5772..f293a2a5772 100644
--- a/src/librustc_error_codes/error_codes/E0076.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0076.md
diff --git a/src/librustc_error_codes/error_codes/E0077.md b/compiler/rustc_error_codes/src/error_codes/E0077.md
index b14513c6ccf..b14513c6ccf 100644
--- a/src/librustc_error_codes/error_codes/E0077.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0077.md
diff --git a/src/librustc_error_codes/error_codes/E0080.md b/compiler/rustc_error_codes/src/error_codes/E0080.md
index 7b1bbde6140..7b1bbde6140 100644
--- a/src/librustc_error_codes/error_codes/E0080.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0080.md
diff --git a/src/librustc_error_codes/error_codes/E0081.md b/compiler/rustc_error_codes/src/error_codes/E0081.md
index b834a734cef..b834a734cef 100644
--- a/src/librustc_error_codes/error_codes/E0081.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0081.md
diff --git a/src/librustc_error_codes/error_codes/E0084.md b/compiler/rustc_error_codes/src/error_codes/E0084.md
index 38ce9b43d0a..38ce9b43d0a 100644
--- a/src/librustc_error_codes/error_codes/E0084.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0084.md
diff --git a/src/librustc_error_codes/error_codes/E0087.md b/compiler/rustc_error_codes/src/error_codes/E0087.md
index 9d292186f0f..9d292186f0f 100644
--- a/src/librustc_error_codes/error_codes/E0087.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0087.md
diff --git a/src/librustc_error_codes/error_codes/E0088.md b/compiler/rustc_error_codes/src/error_codes/E0088.md
index 7780ad5b56e..7780ad5b56e 100644
--- a/src/librustc_error_codes/error_codes/E0088.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0088.md
diff --git a/src/librustc_error_codes/error_codes/E0089.md b/compiler/rustc_error_codes/src/error_codes/E0089.md
index 504fbc7b96a..504fbc7b96a 100644
--- a/src/librustc_error_codes/error_codes/E0089.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0089.md
diff --git a/src/librustc_error_codes/error_codes/E0090.md b/compiler/rustc_error_codes/src/error_codes/E0090.md
index e091bb6c9f2..e091bb6c9f2 100644
--- a/src/librustc_error_codes/error_codes/E0090.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0090.md
diff --git a/src/librustc_error_codes/error_codes/E0091.md b/compiler/rustc_error_codes/src/error_codes/E0091.md
index 03cb3280371..03cb3280371 100644
--- a/src/librustc_error_codes/error_codes/E0091.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0091.md
diff --git a/src/librustc_error_codes/error_codes/E0092.md b/compiler/rustc_error_codes/src/error_codes/E0092.md
index e289534bf7a..e289534bf7a 100644
--- a/src/librustc_error_codes/error_codes/E0092.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0092.md
diff --git a/src/librustc_error_codes/error_codes/E0093.md b/compiler/rustc_error_codes/src/error_codes/E0093.md
index 8e7de1a9d37..8e7de1a9d37 100644
--- a/src/librustc_error_codes/error_codes/E0093.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0093.md
diff --git a/src/librustc_error_codes/error_codes/E0094.md b/compiler/rustc_error_codes/src/error_codes/E0094.md
index 42baa65bf9f..42baa65bf9f 100644
--- a/src/librustc_error_codes/error_codes/E0094.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0094.md
diff --git a/src/librustc_error_codes/error_codes/E0106.md b/compiler/rustc_error_codes/src/error_codes/E0106.md
index 60ca1ddc283..60ca1ddc283 100644
--- a/src/librustc_error_codes/error_codes/E0106.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0106.md
diff --git a/src/librustc_error_codes/error_codes/E0107.md b/compiler/rustc_error_codes/src/error_codes/E0107.md
index 4d22b17fe10..4d22b17fe10 100644
--- a/src/librustc_error_codes/error_codes/E0107.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0107.md
diff --git a/src/librustc_error_codes/error_codes/E0109.md b/compiler/rustc_error_codes/src/error_codes/E0109.md
index 2eab9725a6f..2eab9725a6f 100644
--- a/src/librustc_error_codes/error_codes/E0109.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0109.md
diff --git a/src/librustc_error_codes/error_codes/E0110.md b/compiler/rustc_error_codes/src/error_codes/E0110.md
index b9fe406ffb9..b9fe406ffb9 100644
--- a/src/librustc_error_codes/error_codes/E0110.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0110.md
diff --git a/src/librustc_error_codes/error_codes/E0116.md b/compiler/rustc_error_codes/src/error_codes/E0116.md
index ca849c2a128..ca849c2a128 100644
--- a/src/librustc_error_codes/error_codes/E0116.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0116.md
diff --git a/src/librustc_error_codes/error_codes/E0117.md b/compiler/rustc_error_codes/src/error_codes/E0117.md
index 0544667ccca..0544667ccca 100644
--- a/src/librustc_error_codes/error_codes/E0117.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0117.md
diff --git a/src/librustc_error_codes/error_codes/E0118.md b/compiler/rustc_error_codes/src/error_codes/E0118.md
index 5cb5f506e0a..5cb5f506e0a 100644
--- a/src/librustc_error_codes/error_codes/E0118.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0118.md
diff --git a/src/librustc_error_codes/error_codes/E0119.md b/compiler/rustc_error_codes/src/error_codes/E0119.md
index e596349e5e2..e596349e5e2 100644
--- a/src/librustc_error_codes/error_codes/E0119.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0119.md
diff --git a/src/librustc_error_codes/error_codes/E0120.md b/compiler/rustc_error_codes/src/error_codes/E0120.md
index dc7258d8731..dc7258d8731 100644
--- a/src/librustc_error_codes/error_codes/E0120.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0120.md
diff --git a/src/librustc_error_codes/error_codes/E0121.md b/compiler/rustc_error_codes/src/error_codes/E0121.md
index 06fe396d50d..06fe396d50d 100644
--- a/src/librustc_error_codes/error_codes/E0121.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0121.md
diff --git a/src/librustc_error_codes/error_codes/E0124.md b/compiler/rustc_error_codes/src/error_codes/E0124.md
index 8af7cb819cf..8af7cb819cf 100644
--- a/src/librustc_error_codes/error_codes/E0124.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0124.md
diff --git a/src/librustc_error_codes/error_codes/E0128.md b/compiler/rustc_error_codes/src/error_codes/E0128.md
index 6f8dfe3a73b..6f8dfe3a73b 100644
--- a/src/librustc_error_codes/error_codes/E0128.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0128.md
diff --git a/src/librustc_error_codes/error_codes/E0130.md b/compiler/rustc_error_codes/src/error_codes/E0130.md
index a270feaf58c..a270feaf58c 100644
--- a/src/librustc_error_codes/error_codes/E0130.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0130.md
diff --git a/src/librustc_error_codes/error_codes/E0131.md b/compiler/rustc_error_codes/src/error_codes/E0131.md
index ed798d4f881..ed798d4f881 100644
--- a/src/librustc_error_codes/error_codes/E0131.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0131.md
diff --git a/src/librustc_error_codes/error_codes/E0132.md b/compiler/rustc_error_codes/src/error_codes/E0132.md
index a23cc988bdb..a23cc988bdb 100644
--- a/src/librustc_error_codes/error_codes/E0132.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0132.md
diff --git a/src/librustc_error_codes/error_codes/E0133.md b/compiler/rustc_error_codes/src/error_codes/E0133.md
index 1adbcc31356..1adbcc31356 100644
--- a/src/librustc_error_codes/error_codes/E0133.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0133.md
diff --git a/src/librustc_error_codes/error_codes/E0136.md b/compiler/rustc_error_codes/src/error_codes/E0136.md
index b91b52c074c..b91b52c074c 100644
--- a/src/librustc_error_codes/error_codes/E0136.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0136.md
diff --git a/src/librustc_error_codes/error_codes/E0137.md b/compiler/rustc_error_codes/src/error_codes/E0137.md
index 0a02913d236..0a02913d236 100644
--- a/src/librustc_error_codes/error_codes/E0137.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0137.md
diff --git a/src/librustc_error_codes/error_codes/E0138.md b/compiler/rustc_error_codes/src/error_codes/E0138.md
index 3f5eaea9f98..3f5eaea9f98 100644
--- a/src/librustc_error_codes/error_codes/E0138.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0138.md
diff --git a/src/librustc_error_codes/error_codes/E0139.md b/compiler/rustc_error_codes/src/error_codes/E0139.md
index a116cf29395..a116cf29395 100644
--- a/src/librustc_error_codes/error_codes/E0139.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0139.md
diff --git a/src/librustc_error_codes/error_codes/E0152.md b/compiler/rustc_error_codes/src/error_codes/E0152.md
index 120c96b4211..120c96b4211 100644
--- a/src/librustc_error_codes/error_codes/E0152.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0152.md
diff --git a/src/librustc_error_codes/error_codes/E0154.md b/compiler/rustc_error_codes/src/error_codes/E0154.md
index e437a71897c..e437a71897c 100644
--- a/src/librustc_error_codes/error_codes/E0154.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0154.md
diff --git a/src/librustc_error_codes/error_codes/E0158.md b/compiler/rustc_error_codes/src/error_codes/E0158.md
index 0a9ef9c3938..0a9ef9c3938 100644
--- a/src/librustc_error_codes/error_codes/E0158.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0158.md
diff --git a/src/librustc_error_codes/error_codes/E0161.md b/compiler/rustc_error_codes/src/error_codes/E0161.md
index c2e2f0240f4..c2e2f0240f4 100644
--- a/src/librustc_error_codes/error_codes/E0161.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0161.md
diff --git a/src/librustc_error_codes/error_codes/E0162.md b/compiler/rustc_error_codes/src/error_codes/E0162.md
index 98146147f39..98146147f39 100644
--- a/src/librustc_error_codes/error_codes/E0162.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0162.md
diff --git a/src/librustc_error_codes/error_codes/E0164.md b/compiler/rustc_error_codes/src/error_codes/E0164.md
index 48bb6f4b382..48bb6f4b382 100644
--- a/src/librustc_error_codes/error_codes/E0164.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0164.md
diff --git a/src/librustc_error_codes/error_codes/E0165.md b/compiler/rustc_error_codes/src/error_codes/E0165.md
index 92243db4550..92243db4550 100644
--- a/src/librustc_error_codes/error_codes/E0165.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0165.md
diff --git a/src/librustc_error_codes/error_codes/E0170.md b/compiler/rustc_error_codes/src/error_codes/E0170.md
index 9678cd173b7..9678cd173b7 100644
--- a/src/librustc_error_codes/error_codes/E0170.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0170.md
diff --git a/src/librustc_error_codes/error_codes/E0178.md b/compiler/rustc_error_codes/src/error_codes/E0178.md
index 0c6f918632f..0c6f918632f 100644
--- a/src/librustc_error_codes/error_codes/E0178.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0178.md
diff --git a/src/librustc_error_codes/error_codes/E0184.md b/compiler/rustc_error_codes/src/error_codes/E0184.md
index 4624f9e5b85..4624f9e5b85 100644
--- a/src/librustc_error_codes/error_codes/E0184.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0184.md
diff --git a/src/librustc_error_codes/error_codes/E0185.md b/compiler/rustc_error_codes/src/error_codes/E0185.md
index 944a93ed14e..944a93ed14e 100644
--- a/src/librustc_error_codes/error_codes/E0185.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0185.md
diff --git a/src/librustc_error_codes/error_codes/E0186.md b/compiler/rustc_error_codes/src/error_codes/E0186.md
index 7db1e843323..7db1e843323 100644
--- a/src/librustc_error_codes/error_codes/E0186.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0186.md
diff --git a/src/librustc_error_codes/error_codes/E0191.md b/compiler/rustc_error_codes/src/error_codes/E0191.md
index 46b773bdc50..46b773bdc50 100644
--- a/src/librustc_error_codes/error_codes/E0191.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0191.md
diff --git a/src/librustc_error_codes/error_codes/E0192.md b/compiler/rustc_error_codes/src/error_codes/E0192.md
index 5fd951b2e86..5fd951b2e86 100644
--- a/src/librustc_error_codes/error_codes/E0192.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0192.md
diff --git a/src/librustc_error_codes/error_codes/E0193.md b/compiler/rustc_error_codes/src/error_codes/E0193.md
index e29a949ffba..e29a949ffba 100644
--- a/src/librustc_error_codes/error_codes/E0193.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0193.md
diff --git a/src/librustc_error_codes/error_codes/E0195.md b/compiler/rustc_error_codes/src/error_codes/E0195.md
index b8c313d412e..b8c313d412e 100644
--- a/src/librustc_error_codes/error_codes/E0195.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0195.md
diff --git a/src/librustc_error_codes/error_codes/E0197.md b/compiler/rustc_error_codes/src/error_codes/E0197.md
index c142b8f3664..c142b8f3664 100644
--- a/src/librustc_error_codes/error_codes/E0197.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0197.md
diff --git a/src/librustc_error_codes/error_codes/E0198.md b/compiler/rustc_error_codes/src/error_codes/E0198.md
index 90f1e542874..90f1e542874 100644
--- a/src/librustc_error_codes/error_codes/E0198.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0198.md
diff --git a/src/librustc_error_codes/error_codes/E0199.md b/compiler/rustc_error_codes/src/error_codes/E0199.md
index 88130e8e5e5..88130e8e5e5 100644
--- a/src/librustc_error_codes/error_codes/E0199.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0199.md
diff --git a/src/librustc_error_codes/error_codes/E0200.md b/compiler/rustc_error_codes/src/error_codes/E0200.md
index 7245bb59ce5..7245bb59ce5 100644
--- a/src/librustc_error_codes/error_codes/E0200.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0200.md
diff --git a/src/librustc_error_codes/error_codes/E0201.md b/compiler/rustc_error_codes/src/error_codes/E0201.md
index 0e1a7b7b7de..0e1a7b7b7de 100644
--- a/src/librustc_error_codes/error_codes/E0201.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0201.md
diff --git a/src/librustc_error_codes/error_codes/E0202.md b/compiler/rustc_error_codes/src/error_codes/E0202.md
index afc61ec2e48..afc61ec2e48 100644
--- a/src/librustc_error_codes/error_codes/E0202.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0202.md
diff --git a/src/librustc_error_codes/error_codes/E0203.md b/compiler/rustc_error_codes/src/error_codes/E0203.md
index 1edb519275f..1edb519275f 100644
--- a/src/librustc_error_codes/error_codes/E0203.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0203.md
diff --git a/src/librustc_error_codes/error_codes/E0204.md b/compiler/rustc_error_codes/src/error_codes/E0204.md
index 96e44758be4..96e44758be4 100644
--- a/src/librustc_error_codes/error_codes/E0204.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0204.md
diff --git a/src/librustc_error_codes/error_codes/E0205.md b/compiler/rustc_error_codes/src/error_codes/E0205.md
index 7916f53ad3b..7916f53ad3b 100644
--- a/src/librustc_error_codes/error_codes/E0205.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0205.md
diff --git a/src/librustc_error_codes/error_codes/E0206.md b/compiler/rustc_error_codes/src/error_codes/E0206.md
index da53b671ad0..da53b671ad0 100644
--- a/src/librustc_error_codes/error_codes/E0206.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0206.md
diff --git a/src/librustc_error_codes/error_codes/E0207.md b/compiler/rustc_error_codes/src/error_codes/E0207.md
index cb4f5d5157d..cb4f5d5157d 100644
--- a/src/librustc_error_codes/error_codes/E0207.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0207.md
diff --git a/src/librustc_error_codes/error_codes/E0210.md b/compiler/rustc_error_codes/src/error_codes/E0210.md
index dc2fd9b0ca0..dc2fd9b0ca0 100644
--- a/src/librustc_error_codes/error_codes/E0210.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0210.md
diff --git a/src/librustc_error_codes/error_codes/E0211.md b/compiler/rustc_error_codes/src/error_codes/E0211.md
index 77289f01900..77289f01900 100644
--- a/src/librustc_error_codes/error_codes/E0211.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0211.md
diff --git a/src/librustc_error_codes/error_codes/E0214.md b/compiler/rustc_error_codes/src/error_codes/E0214.md
index b64ee80e284..b64ee80e284 100644
--- a/src/librustc_error_codes/error_codes/E0214.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0214.md
diff --git a/src/librustc_error_codes/error_codes/E0220.md b/compiler/rustc_error_codes/src/error_codes/E0220.md
index ddc54007c8c..ddc54007c8c 100644
--- a/src/librustc_error_codes/error_codes/E0220.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0220.md
diff --git a/src/librustc_error_codes/error_codes/E0221.md b/compiler/rustc_error_codes/src/error_codes/E0221.md
index 26111ca4293..26111ca4293 100644
--- a/src/librustc_error_codes/error_codes/E0221.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0221.md
diff --git a/src/librustc_error_codes/error_codes/E0222.md b/compiler/rustc_error_codes/src/error_codes/E0222.md
index fbf1b8d7033..fbf1b8d7033 100644
--- a/src/librustc_error_codes/error_codes/E0222.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0222.md
diff --git a/src/librustc_error_codes/error_codes/E0223.md b/compiler/rustc_error_codes/src/error_codes/E0223.md
index 0d49f514ccf..0d49f514ccf 100644
--- a/src/librustc_error_codes/error_codes/E0223.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0223.md
diff --git a/src/librustc_error_codes/error_codes/E0224.md b/compiler/rustc_error_codes/src/error_codes/E0224.md
index fd89c1d5256..fd89c1d5256 100644
--- a/src/librustc_error_codes/error_codes/E0224.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0224.md
diff --git a/src/librustc_error_codes/error_codes/E0225.md b/compiler/rustc_error_codes/src/error_codes/E0225.md
index c306e710097..c306e710097 100644
--- a/src/librustc_error_codes/error_codes/E0225.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0225.md
diff --git a/src/librustc_error_codes/error_codes/E0226.md b/compiler/rustc_error_codes/src/error_codes/E0226.md
index 4e65132ff0d..4e65132ff0d 100644
--- a/src/librustc_error_codes/error_codes/E0226.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0226.md
diff --git a/src/librustc_error_codes/error_codes/E0228.md b/compiler/rustc_error_codes/src/error_codes/E0228.md
index 3443a5ae863..3443a5ae863 100644
--- a/src/librustc_error_codes/error_codes/E0228.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0228.md
diff --git a/src/librustc_error_codes/error_codes/E0229.md b/compiler/rustc_error_codes/src/error_codes/E0229.md
index a8fab057d43..a8fab057d43 100644
--- a/src/librustc_error_codes/error_codes/E0229.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0229.md
diff --git a/src/librustc_error_codes/error_codes/E0230.md b/compiler/rustc_error_codes/src/error_codes/E0230.md
index cfb72e74319..cfb72e74319 100644
--- a/src/librustc_error_codes/error_codes/E0230.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0230.md
diff --git a/src/librustc_error_codes/error_codes/E0231.md b/compiler/rustc_error_codes/src/error_codes/E0231.md
index 23a0a88ecdd..23a0a88ecdd 100644
--- a/src/librustc_error_codes/error_codes/E0231.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0231.md
diff --git a/src/librustc_error_codes/error_codes/E0232.md b/compiler/rustc_error_codes/src/error_codes/E0232.md
index b310caefa6e..b310caefa6e 100644
--- a/src/librustc_error_codes/error_codes/E0232.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0232.md
diff --git a/src/librustc_error_codes/error_codes/E0243.md b/compiler/rustc_error_codes/src/error_codes/E0243.md
index 5d3d1828bf5..5d3d1828bf5 100644
--- a/src/librustc_error_codes/error_codes/E0243.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0243.md
diff --git a/src/librustc_error_codes/error_codes/E0244.md b/compiler/rustc_error_codes/src/error_codes/E0244.md
index 5187b7b05d2..5187b7b05d2 100644
--- a/src/librustc_error_codes/error_codes/E0244.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0244.md
diff --git a/src/librustc_error_codes/error_codes/E0251.md b/compiler/rustc_error_codes/src/error_codes/E0251.md
index 4121dd27877..4121dd27877 100644
--- a/src/librustc_error_codes/error_codes/E0251.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0251.md
diff --git a/src/librustc_error_codes/error_codes/E0252.md b/compiler/rustc_error_codes/src/error_codes/E0252.md
index e678944650f..e678944650f 100644
--- a/src/librustc_error_codes/error_codes/E0252.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0252.md
diff --git a/src/librustc_error_codes/error_codes/E0253.md b/compiler/rustc_error_codes/src/error_codes/E0253.md
index aea51d40238..aea51d40238 100644
--- a/src/librustc_error_codes/error_codes/E0253.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0253.md
diff --git a/src/librustc_error_codes/error_codes/E0254.md b/compiler/rustc_error_codes/src/error_codes/E0254.md
index 44383ed6eab..44383ed6eab 100644
--- a/src/librustc_error_codes/error_codes/E0254.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0254.md
diff --git a/src/librustc_error_codes/error_codes/E0255.md b/compiler/rustc_error_codes/src/error_codes/E0255.md
index 83f5ec3dda4..83f5ec3dda4 100644
--- a/src/librustc_error_codes/error_codes/E0255.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0255.md
diff --git a/src/librustc_error_codes/error_codes/E0256.md b/compiler/rustc_error_codes/src/error_codes/E0256.md
index 385376cdade..385376cdade 100644
--- a/src/librustc_error_codes/error_codes/E0256.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0256.md
diff --git a/src/librustc_error_codes/error_codes/E0259.md b/compiler/rustc_error_codes/src/error_codes/E0259.md
index 8d8f93db30f..8d8f93db30f 100644
--- a/src/librustc_error_codes/error_codes/E0259.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0259.md
diff --git a/src/librustc_error_codes/error_codes/E0260.md b/compiler/rustc_error_codes/src/error_codes/E0260.md
index b8bdb81fcbf..b8bdb81fcbf 100644
--- a/src/librustc_error_codes/error_codes/E0260.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0260.md
diff --git a/src/librustc_error_codes/error_codes/E0261.md b/compiler/rustc_error_codes/src/error_codes/E0261.md
index e3268437396..e3268437396 100644
--- a/src/librustc_error_codes/error_codes/E0261.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0261.md
diff --git a/src/librustc_error_codes/error_codes/E0262.md b/compiler/rustc_error_codes/src/error_codes/E0262.md
index 67419d53ef9..67419d53ef9 100644
--- a/src/librustc_error_codes/error_codes/E0262.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0262.md
diff --git a/src/librustc_error_codes/error_codes/E0263.md b/compiler/rustc_error_codes/src/error_codes/E0263.md
index 37271ac692d..37271ac692d 100644
--- a/src/librustc_error_codes/error_codes/E0263.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0263.md
diff --git a/src/librustc_error_codes/error_codes/E0264.md b/compiler/rustc_error_codes/src/error_codes/E0264.md
index e2a27f7b106..e2a27f7b106 100644
--- a/src/librustc_error_codes/error_codes/E0264.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0264.md
diff --git a/src/librustc_error_codes/error_codes/E0267.md b/compiler/rustc_error_codes/src/error_codes/E0267.md
index 951490df874..951490df874 100644
--- a/src/librustc_error_codes/error_codes/E0267.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0267.md
diff --git a/src/librustc_error_codes/error_codes/E0268.md b/compiler/rustc_error_codes/src/error_codes/E0268.md
index 436aef79fe0..436aef79fe0 100644
--- a/src/librustc_error_codes/error_codes/E0268.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0268.md
diff --git a/src/librustc_error_codes/error_codes/E0271.md b/compiler/rustc_error_codes/src/error_codes/E0271.md
index ddd245b1a2b..ddd245b1a2b 100644
--- a/src/librustc_error_codes/error_codes/E0271.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0271.md
diff --git a/src/librustc_error_codes/error_codes/E0275.md b/compiler/rustc_error_codes/src/error_codes/E0275.md
index 2d12fcea4ca..2d12fcea4ca 100644
--- a/src/librustc_error_codes/error_codes/E0275.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0275.md
diff --git a/src/librustc_error_codes/error_codes/E0276.md b/compiler/rustc_error_codes/src/error_codes/E0276.md
index ad76968c589..ad76968c589 100644
--- a/src/librustc_error_codes/error_codes/E0276.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0276.md
diff --git a/src/librustc_error_codes/error_codes/E0277.md b/compiler/rustc_error_codes/src/error_codes/E0277.md
index 2e2cd5e01fb..2e2cd5e01fb 100644
--- a/src/librustc_error_codes/error_codes/E0277.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0277.md
diff --git a/src/librustc_error_codes/error_codes/E0281.md b/compiler/rustc_error_codes/src/error_codes/E0281.md
index 1d7904b67dd..1d7904b67dd 100644
--- a/src/librustc_error_codes/error_codes/E0281.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0281.md
diff --git a/src/librustc_error_codes/error_codes/E0282.md b/compiler/rustc_error_codes/src/error_codes/E0282.md
index 49d2205f92c..49d2205f92c 100644
--- a/src/librustc_error_codes/error_codes/E0282.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0282.md
diff --git a/src/librustc_error_codes/error_codes/E0283.md b/compiler/rustc_error_codes/src/error_codes/E0283.md
index 6885f9a486d..6885f9a486d 100644
--- a/src/librustc_error_codes/error_codes/E0283.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0283.md
diff --git a/src/librustc_error_codes/error_codes/E0284.md b/compiler/rustc_error_codes/src/error_codes/E0284.md
index a1ffa2bda00..a1ffa2bda00 100644
--- a/src/librustc_error_codes/error_codes/E0284.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0284.md
diff --git a/src/librustc_error_codes/error_codes/E0297.md b/compiler/rustc_error_codes/src/error_codes/E0297.md
index 66c31376d8b..66c31376d8b 100644
--- a/src/librustc_error_codes/error_codes/E0297.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0297.md
diff --git a/src/librustc_error_codes/error_codes/E0301.md b/compiler/rustc_error_codes/src/error_codes/E0301.md
index 485e19fbb8d..485e19fbb8d 100644
--- a/src/librustc_error_codes/error_codes/E0301.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0301.md
diff --git a/src/librustc_error_codes/error_codes/E0302.md b/compiler/rustc_error_codes/src/error_codes/E0302.md
index e6ac9d590c8..e6ac9d590c8 100644
--- a/src/librustc_error_codes/error_codes/E0302.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0302.md
diff --git a/src/librustc_error_codes/error_codes/E0303.md b/compiler/rustc_error_codes/src/error_codes/E0303.md
index 459906047cc..459906047cc 100644
--- a/src/librustc_error_codes/error_codes/E0303.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0303.md
diff --git a/src/librustc_error_codes/error_codes/E0307.md b/compiler/rustc_error_codes/src/error_codes/E0307.md
index 0d29d56ea1a..0d29d56ea1a 100644
--- a/src/librustc_error_codes/error_codes/E0307.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0307.md
diff --git a/src/librustc_error_codes/error_codes/E0308.md b/compiler/rustc_error_codes/src/error_codes/E0308.md
index e2c40f03019..e2c40f03019 100644
--- a/src/librustc_error_codes/error_codes/E0308.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0308.md
diff --git a/src/librustc_error_codes/error_codes/E0309.md b/compiler/rustc_error_codes/src/error_codes/E0309.md
index e719ee590ab..e719ee590ab 100644
--- a/src/librustc_error_codes/error_codes/E0309.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0309.md
diff --git a/src/librustc_error_codes/error_codes/E0310.md b/compiler/rustc_error_codes/src/error_codes/E0310.md
index 8d4311d018b..8d4311d018b 100644
--- a/src/librustc_error_codes/error_codes/E0310.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0310.md
diff --git a/src/librustc_error_codes/error_codes/E0312.md b/compiler/rustc_error_codes/src/error_codes/E0312.md
index cb090d01382..cb090d01382 100644
--- a/src/librustc_error_codes/error_codes/E0312.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0312.md
diff --git a/src/librustc_error_codes/error_codes/E0317.md b/compiler/rustc_error_codes/src/error_codes/E0317.md
index 230911c2086..230911c2086 100644
--- a/src/librustc_error_codes/error_codes/E0317.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0317.md
diff --git a/src/librustc_error_codes/error_codes/E0321.md b/compiler/rustc_error_codes/src/error_codes/E0321.md
index bfcdabfe9de..bfcdabfe9de 100644
--- a/src/librustc_error_codes/error_codes/E0321.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0321.md
diff --git a/src/librustc_error_codes/error_codes/E0322.md b/compiler/rustc_error_codes/src/error_codes/E0322.md
index ccef8681dd6..ccef8681dd6 100644
--- a/src/librustc_error_codes/error_codes/E0322.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0322.md
diff --git a/src/librustc_error_codes/error_codes/E0323.md b/compiler/rustc_error_codes/src/error_codes/E0323.md
index 0bf42d17ebc..0bf42d17ebc 100644
--- a/src/librustc_error_codes/error_codes/E0323.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0323.md
diff --git a/src/librustc_error_codes/error_codes/E0324.md b/compiler/rustc_error_codes/src/error_codes/E0324.md
index 1442cb77dd9..1442cb77dd9 100644
--- a/src/librustc_error_codes/error_codes/E0324.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0324.md
diff --git a/src/librustc_error_codes/error_codes/E0325.md b/compiler/rustc_error_codes/src/error_codes/E0325.md
index 656fd1ec82b..656fd1ec82b 100644
--- a/src/librustc_error_codes/error_codes/E0325.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0325.md
diff --git a/src/librustc_error_codes/error_codes/E0326.md b/compiler/rustc_error_codes/src/error_codes/E0326.md
index bc522e9cf40..bc522e9cf40 100644
--- a/src/librustc_error_codes/error_codes/E0326.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0326.md
diff --git a/src/librustc_error_codes/error_codes/E0328.md b/compiler/rustc_error_codes/src/error_codes/E0328.md
index 83909235455..83909235455 100644
--- a/src/librustc_error_codes/error_codes/E0328.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0328.md
diff --git a/src/librustc_error_codes/error_codes/E0329.md b/compiler/rustc_error_codes/src/error_codes/E0329.md
index 37d84a1a89b..37d84a1a89b 100644
--- a/src/librustc_error_codes/error_codes/E0329.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0329.md
diff --git a/src/librustc_error_codes/error_codes/E0364.md b/compiler/rustc_error_codes/src/error_codes/E0364.md
index d01fb0c9c42..d01fb0c9c42 100644
--- a/src/librustc_error_codes/error_codes/E0364.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0364.md
diff --git a/src/librustc_error_codes/error_codes/E0365.md b/compiler/rustc_error_codes/src/error_codes/E0365.md
index e3d417a7d01..e3d417a7d01 100644
--- a/src/librustc_error_codes/error_codes/E0365.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0365.md
diff --git a/src/librustc_error_codes/error_codes/E0366.md b/compiler/rustc_error_codes/src/error_codes/E0366.md
index e6f8e61893b..e6f8e61893b 100644
--- a/src/librustc_error_codes/error_codes/E0366.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0366.md
diff --git a/src/librustc_error_codes/error_codes/E0367.md b/compiler/rustc_error_codes/src/error_codes/E0367.md
index cfebeada272..cfebeada272 100644
--- a/src/librustc_error_codes/error_codes/E0367.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0367.md
diff --git a/src/librustc_error_codes/error_codes/E0368.md b/compiler/rustc_error_codes/src/error_codes/E0368.md
index 7b9d9334821..7b9d9334821 100644
--- a/src/librustc_error_codes/error_codes/E0368.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0368.md
diff --git a/src/librustc_error_codes/error_codes/E0369.md b/compiler/rustc_error_codes/src/error_codes/E0369.md
index ab0f4b40843..ab0f4b40843 100644
--- a/src/librustc_error_codes/error_codes/E0369.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0369.md
diff --git a/src/librustc_error_codes/error_codes/E0370.md b/compiler/rustc_error_codes/src/error_codes/E0370.md
index 14e954722a2..14e954722a2 100644
--- a/src/librustc_error_codes/error_codes/E0370.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0370.md
diff --git a/src/librustc_error_codes/error_codes/E0371.md b/compiler/rustc_error_codes/src/error_codes/E0371.md
index a44721346e2..a44721346e2 100644
--- a/src/librustc_error_codes/error_codes/E0371.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0371.md
diff --git a/src/librustc_error_codes/error_codes/E0373.md b/compiler/rustc_error_codes/src/error_codes/E0373.md
index fd969877931..fd969877931 100644
--- a/src/librustc_error_codes/error_codes/E0373.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0373.md
diff --git a/src/librustc_error_codes/error_codes/E0374.md b/compiler/rustc_error_codes/src/error_codes/E0374.md
index 6d7dc88823c..6d7dc88823c 100644
--- a/src/librustc_error_codes/error_codes/E0374.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0374.md
diff --git a/src/librustc_error_codes/error_codes/E0375.md b/compiler/rustc_error_codes/src/error_codes/E0375.md
index 71e53057165..71e53057165 100644
--- a/src/librustc_error_codes/error_codes/E0375.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0375.md
diff --git a/src/librustc_error_codes/error_codes/E0376.md b/compiler/rustc_error_codes/src/error_codes/E0376.md
index 50de15bd30f..50de15bd30f 100644
--- a/src/librustc_error_codes/error_codes/E0376.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0376.md
diff --git a/src/librustc_error_codes/error_codes/E0378.md b/compiler/rustc_error_codes/src/error_codes/E0378.md
index c6fe997f3dc..c6fe997f3dc 100644
--- a/src/librustc_error_codes/error_codes/E0378.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0378.md
diff --git a/src/librustc_error_codes/error_codes/E0379.md b/compiler/rustc_error_codes/src/error_codes/E0379.md
index 930204847ec..930204847ec 100644
--- a/src/librustc_error_codes/error_codes/E0379.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0379.md
diff --git a/src/librustc_error_codes/error_codes/E0380.md b/compiler/rustc_error_codes/src/error_codes/E0380.md
index 638f0c8ecc6..638f0c8ecc6 100644
--- a/src/librustc_error_codes/error_codes/E0380.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0380.md
diff --git a/src/librustc_error_codes/error_codes/E0381.md b/compiler/rustc_error_codes/src/error_codes/E0381.md
index 97678009925..97678009925 100644
--- a/src/librustc_error_codes/error_codes/E0381.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0381.md
diff --git a/src/librustc_error_codes/error_codes/E0382.md b/compiler/rustc_error_codes/src/error_codes/E0382.md
index d1408a06296..d1408a06296 100644
--- a/src/librustc_error_codes/error_codes/E0382.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0382.md
diff --git a/src/librustc_error_codes/error_codes/E0383.md b/compiler/rustc_error_codes/src/error_codes/E0383.md
index fd2b0b08fb0..fd2b0b08fb0 100644
--- a/src/librustc_error_codes/error_codes/E0383.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0383.md
diff --git a/src/librustc_error_codes/error_codes/E0384.md b/compiler/rustc_error_codes/src/error_codes/E0384.md
index e21fac0797c..e21fac0797c 100644
--- a/src/librustc_error_codes/error_codes/E0384.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0384.md
diff --git a/src/librustc_error_codes/error_codes/E0386.md b/compiler/rustc_error_codes/src/error_codes/E0386.md
index de3b468b6e4..de3b468b6e4 100644
--- a/src/librustc_error_codes/error_codes/E0386.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0386.md
diff --git a/src/librustc_error_codes/error_codes/E0387.md b/compiler/rustc_error_codes/src/error_codes/E0387.md
index 38ad19bd6aa..38ad19bd6aa 100644
--- a/src/librustc_error_codes/error_codes/E0387.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0387.md
diff --git a/src/librustc_error_codes/error_codes/E0388.md b/compiler/rustc_error_codes/src/error_codes/E0388.md
index 512fb42e6ec..512fb42e6ec 100644
--- a/src/librustc_error_codes/error_codes/E0388.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0388.md
diff --git a/src/librustc_error_codes/error_codes/E0389.md b/compiler/rustc_error_codes/src/error_codes/E0389.md
index 9f064e44c82..9f064e44c82 100644
--- a/src/librustc_error_codes/error_codes/E0389.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0389.md
diff --git a/src/librustc_error_codes/error_codes/E0390.md b/compiler/rustc_error_codes/src/error_codes/E0390.md
index ecc5b5568ad..ecc5b5568ad 100644
--- a/src/librustc_error_codes/error_codes/E0390.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0390.md
diff --git a/src/librustc_error_codes/error_codes/E0391.md b/compiler/rustc_error_codes/src/error_codes/E0391.md
index dff50ccaa0b..dff50ccaa0b 100644
--- a/src/librustc_error_codes/error_codes/E0391.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0391.md
diff --git a/src/librustc_error_codes/error_codes/E0392.md b/compiler/rustc_error_codes/src/error_codes/E0392.md
index f373d89456d..f373d89456d 100644
--- a/src/librustc_error_codes/error_codes/E0392.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0392.md
diff --git a/src/librustc_error_codes/error_codes/E0393.md b/compiler/rustc_error_codes/src/error_codes/E0393.md
index 3e853cf1b8a..3e853cf1b8a 100644
--- a/src/librustc_error_codes/error_codes/E0393.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0393.md
diff --git a/src/librustc_error_codes/error_codes/E0398.md b/compiler/rustc_error_codes/src/error_codes/E0398.md
index 75d86979e3c..75d86979e3c 100644
--- a/src/librustc_error_codes/error_codes/E0398.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0398.md
diff --git a/src/librustc_error_codes/error_codes/E0399.md b/compiler/rustc_error_codes/src/error_codes/E0399.md
index 6ea6054b417..6ea6054b417 100644
--- a/src/librustc_error_codes/error_codes/E0399.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0399.md
diff --git a/src/librustc_error_codes/error_codes/E0401.md b/compiler/rustc_error_codes/src/error_codes/E0401.md
index 4c93053d5f8..4c93053d5f8 100644
--- a/src/librustc_error_codes/error_codes/E0401.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0401.md
diff --git a/src/librustc_error_codes/error_codes/E0403.md b/compiler/rustc_error_codes/src/error_codes/E0403.md
index 5f4a40ce92e..5f4a40ce92e 100644
--- a/src/librustc_error_codes/error_codes/E0403.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0403.md
diff --git a/src/librustc_error_codes/error_codes/E0404.md b/compiler/rustc_error_codes/src/error_codes/E0404.md
index 1360cc99afc..1360cc99afc 100644
--- a/src/librustc_error_codes/error_codes/E0404.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0404.md
diff --git a/src/librustc_error_codes/error_codes/E0405.md b/compiler/rustc_error_codes/src/error_codes/E0405.md
index ff1e8c0be88..ff1e8c0be88 100644
--- a/src/librustc_error_codes/error_codes/E0405.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0405.md
diff --git a/src/librustc_error_codes/error_codes/E0407.md b/compiler/rustc_error_codes/src/error_codes/E0407.md
index fa26c77a1b0..fa26c77a1b0 100644
--- a/src/librustc_error_codes/error_codes/E0407.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0407.md
diff --git a/src/librustc_error_codes/error_codes/E0408.md b/compiler/rustc_error_codes/src/error_codes/E0408.md
index 3acdbb740a3..3acdbb740a3 100644
--- a/src/librustc_error_codes/error_codes/E0408.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0408.md
diff --git a/src/librustc_error_codes/error_codes/E0409.md b/compiler/rustc_error_codes/src/error_codes/E0409.md
index 53eb0fd0573..53eb0fd0573 100644
--- a/src/librustc_error_codes/error_codes/E0409.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0409.md
diff --git a/src/librustc_error_codes/error_codes/E0411.md b/compiler/rustc_error_codes/src/error_codes/E0411.md
index d82171533ae..d82171533ae 100644
--- a/src/librustc_error_codes/error_codes/E0411.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0411.md
diff --git a/src/librustc_error_codes/error_codes/E0412.md b/compiler/rustc_error_codes/src/error_codes/E0412.md
index d9ebc852bba..d9ebc852bba 100644
--- a/src/librustc_error_codes/error_codes/E0412.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0412.md
diff --git a/src/librustc_error_codes/error_codes/E0415.md b/compiler/rustc_error_codes/src/error_codes/E0415.md
index 97d733a7b2d..97d733a7b2d 100644
--- a/src/librustc_error_codes/error_codes/E0415.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0415.md
diff --git a/src/librustc_error_codes/error_codes/E0416.md b/compiler/rustc_error_codes/src/error_codes/E0416.md
index 7bc316dafc5..7bc316dafc5 100644
--- a/src/librustc_error_codes/error_codes/E0416.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0416.md
diff --git a/src/librustc_error_codes/error_codes/E0422.md b/compiler/rustc_error_codes/src/error_codes/E0422.md
index 828a52e7341..828a52e7341 100644
--- a/src/librustc_error_codes/error_codes/E0422.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0422.md
diff --git a/src/librustc_error_codes/error_codes/E0423.md b/compiler/rustc_error_codes/src/error_codes/E0423.md
index a98ada17a46..a98ada17a46 100644
--- a/src/librustc_error_codes/error_codes/E0423.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0423.md
diff --git a/src/librustc_error_codes/error_codes/E0424.md b/compiler/rustc_error_codes/src/error_codes/E0424.md
index a9f6f579b42..a9f6f579b42 100644
--- a/src/librustc_error_codes/error_codes/E0424.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0424.md
diff --git a/src/librustc_error_codes/error_codes/E0425.md b/compiler/rustc_error_codes/src/error_codes/E0425.md
index 13e71b85065..13e71b85065 100644
--- a/src/librustc_error_codes/error_codes/E0425.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0425.md
diff --git a/src/librustc_error_codes/error_codes/E0426.md b/compiler/rustc_error_codes/src/error_codes/E0426.md
index 275a83e606e..275a83e606e 100644
--- a/src/librustc_error_codes/error_codes/E0426.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0426.md
diff --git a/src/librustc_error_codes/error_codes/E0428.md b/compiler/rustc_error_codes/src/error_codes/E0428.md
index 38db0b4bcf9..38db0b4bcf9 100644
--- a/src/librustc_error_codes/error_codes/E0428.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0428.md
diff --git a/src/librustc_error_codes/error_codes/E0429.md b/compiler/rustc_error_codes/src/error_codes/E0429.md
index 8c5fd8624fd..8c5fd8624fd 100644
--- a/src/librustc_error_codes/error_codes/E0429.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0429.md
diff --git a/src/librustc_error_codes/error_codes/E0430.md b/compiler/rustc_error_codes/src/error_codes/E0430.md
index 8cca0f21e59..8cca0f21e59 100644
--- a/src/librustc_error_codes/error_codes/E0430.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0430.md
diff --git a/src/librustc_error_codes/error_codes/E0431.md b/compiler/rustc_error_codes/src/error_codes/E0431.md
index 1b70f5f1d7b..1b70f5f1d7b 100644
--- a/src/librustc_error_codes/error_codes/E0431.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0431.md
diff --git a/src/librustc_error_codes/error_codes/E0432.md b/compiler/rustc_error_codes/src/error_codes/E0432.md
index a6e2acac5d2..a6e2acac5d2 100644
--- a/src/librustc_error_codes/error_codes/E0432.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0432.md
diff --git a/src/librustc_error_codes/error_codes/E0433.md b/compiler/rustc_error_codes/src/error_codes/E0433.md
index f9e333e8ccd..f9e333e8ccd 100644
--- a/src/librustc_error_codes/error_codes/E0433.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0433.md
diff --git a/src/librustc_error_codes/error_codes/E0434.md b/compiler/rustc_error_codes/src/error_codes/E0434.md
index 8fd60412baf..8fd60412baf 100644
--- a/src/librustc_error_codes/error_codes/E0434.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0434.md
diff --git a/src/librustc_error_codes/error_codes/E0435.md b/compiler/rustc_error_codes/src/error_codes/E0435.md
index 424e5ce1e2e..424e5ce1e2e 100644
--- a/src/librustc_error_codes/error_codes/E0435.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0435.md
diff --git a/src/librustc_error_codes/error_codes/E0436.md b/compiler/rustc_error_codes/src/error_codes/E0436.md
index 48ecc49e92f..48ecc49e92f 100644
--- a/src/librustc_error_codes/error_codes/E0436.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0436.md
diff --git a/src/librustc_error_codes/error_codes/E0437.md b/compiler/rustc_error_codes/src/error_codes/E0437.md
index 0f924ba6920..0f924ba6920 100644
--- a/src/librustc_error_codes/error_codes/E0437.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0437.md
diff --git a/src/librustc_error_codes/error_codes/E0438.md b/compiler/rustc_error_codes/src/error_codes/E0438.md
index 13723bc3009..13723bc3009 100644
--- a/src/librustc_error_codes/error_codes/E0438.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0438.md
diff --git a/src/librustc_error_codes/error_codes/E0439.md b/compiler/rustc_error_codes/src/error_codes/E0439.md
index 3e663df866c..3e663df866c 100644
--- a/src/librustc_error_codes/error_codes/E0439.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0439.md
diff --git a/src/librustc_error_codes/error_codes/E0445.md b/compiler/rustc_error_codes/src/error_codes/E0445.md
index e6a28a9c2c4..e6a28a9c2c4 100644
--- a/src/librustc_error_codes/error_codes/E0445.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0445.md
diff --git a/src/librustc_error_codes/error_codes/E0446.md b/compiler/rustc_error_codes/src/error_codes/E0446.md
index 6ec47c4962c..6ec47c4962c 100644
--- a/src/librustc_error_codes/error_codes/E0446.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0446.md
diff --git a/src/librustc_error_codes/error_codes/E0447.md b/compiler/rustc_error_codes/src/error_codes/E0447.md
index af8cd8d6d52..af8cd8d6d52 100644
--- a/src/librustc_error_codes/error_codes/E0447.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0447.md
diff --git a/src/librustc_error_codes/error_codes/E0448.md b/compiler/rustc_error_codes/src/error_codes/E0448.md
index ba096f9e984..ba096f9e984 100644
--- a/src/librustc_error_codes/error_codes/E0448.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0448.md
diff --git a/src/librustc_error_codes/error_codes/E0449.md b/compiler/rustc_error_codes/src/error_codes/E0449.md
index 9afc67689bf..9afc67689bf 100644
--- a/src/librustc_error_codes/error_codes/E0449.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0449.md
diff --git a/src/librustc_error_codes/error_codes/E0451.md b/compiler/rustc_error_codes/src/error_codes/E0451.md
index 821073fe16e..821073fe16e 100644
--- a/src/librustc_error_codes/error_codes/E0451.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0451.md
diff --git a/src/librustc_error_codes/error_codes/E0452.md b/compiler/rustc_error_codes/src/error_codes/E0452.md
index 429813a7cdd..429813a7cdd 100644
--- a/src/librustc_error_codes/error_codes/E0452.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0452.md
diff --git a/src/librustc_error_codes/error_codes/E0453.md b/compiler/rustc_error_codes/src/error_codes/E0453.md
index 11789db8f36..11789db8f36 100644
--- a/src/librustc_error_codes/error_codes/E0453.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0453.md
diff --git a/src/librustc_error_codes/error_codes/E0454.md b/compiler/rustc_error_codes/src/error_codes/E0454.md
index 23ca6c7824d..23ca6c7824d 100644
--- a/src/librustc_error_codes/error_codes/E0454.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0454.md
diff --git a/src/librustc_error_codes/error_codes/E0455.md b/compiler/rustc_error_codes/src/error_codes/E0455.md
index 2f80c34b889..2f80c34b889 100644
--- a/src/librustc_error_codes/error_codes/E0455.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0455.md
diff --git a/src/librustc_error_codes/error_codes/E0458.md b/compiler/rustc_error_codes/src/error_codes/E0458.md
index 075226ac98b..075226ac98b 100644
--- a/src/librustc_error_codes/error_codes/E0458.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0458.md
diff --git a/src/librustc_error_codes/error_codes/E0459.md b/compiler/rustc_error_codes/src/error_codes/E0459.md
index 6f75f2a99a5..6f75f2a99a5 100644
--- a/src/librustc_error_codes/error_codes/E0459.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0459.md
diff --git a/src/librustc_error_codes/error_codes/E0463.md b/compiler/rustc_error_codes/src/error_codes/E0463.md
index e46938c607d..e46938c607d 100644
--- a/src/librustc_error_codes/error_codes/E0463.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0463.md
diff --git a/src/librustc_error_codes/error_codes/E0466.md b/compiler/rustc_error_codes/src/error_codes/E0466.md
index 7aefedbc087..7aefedbc087 100644
--- a/src/librustc_error_codes/error_codes/E0466.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0466.md
diff --git a/src/librustc_error_codes/error_codes/E0468.md b/compiler/rustc_error_codes/src/error_codes/E0468.md
index cf8664718fa..cf8664718fa 100644
--- a/src/librustc_error_codes/error_codes/E0468.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0468.md
diff --git a/src/librustc_error_codes/error_codes/E0469.md b/compiler/rustc_error_codes/src/error_codes/E0469.md
index 22db976aac2..22db976aac2 100644
--- a/src/librustc_error_codes/error_codes/E0469.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0469.md
diff --git a/src/librustc_error_codes/error_codes/E0477.md b/compiler/rustc_error_codes/src/error_codes/E0477.md
index 9cfefb1de63..9cfefb1de63 100644
--- a/src/librustc_error_codes/error_codes/E0477.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0477.md
diff --git a/src/librustc_error_codes/error_codes/E0478.md b/compiler/rustc_error_codes/src/error_codes/E0478.md
index 4bc5fde2e89..4bc5fde2e89 100644
--- a/src/librustc_error_codes/error_codes/E0478.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0478.md
diff --git a/src/librustc_error_codes/error_codes/E0491.md b/compiler/rustc_error_codes/src/error_codes/E0491.md
index d45663f3a53..d45663f3a53 100644
--- a/src/librustc_error_codes/error_codes/E0491.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0491.md
diff --git a/src/librustc_error_codes/error_codes/E0492.md b/compiler/rustc_error_codes/src/error_codes/E0492.md
index 1caa59999ae..1caa59999ae 100644
--- a/src/librustc_error_codes/error_codes/E0492.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0492.md
diff --git a/src/librustc_error_codes/error_codes/E0493.md b/compiler/rustc_error_codes/src/error_codes/E0493.md
index 0dcc3b62b4b..0dcc3b62b4b 100644
--- a/src/librustc_error_codes/error_codes/E0493.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0493.md
diff --git a/src/librustc_error_codes/error_codes/E0495.md b/compiler/rustc_error_codes/src/error_codes/E0495.md
index f956237b80b..f956237b80b 100644
--- a/src/librustc_error_codes/error_codes/E0495.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0495.md
diff --git a/src/librustc_error_codes/error_codes/E0496.md b/compiler/rustc_error_codes/src/error_codes/E0496.md
index 83d65cd3e09..83d65cd3e09 100644
--- a/src/librustc_error_codes/error_codes/E0496.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0496.md
diff --git a/src/librustc_error_codes/error_codes/E0497.md b/compiler/rustc_error_codes/src/error_codes/E0497.md
index ef2882415d2..ef2882415d2 100644
--- a/src/librustc_error_codes/error_codes/E0497.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0497.md
diff --git a/src/librustc_error_codes/error_codes/E0499.md b/compiler/rustc_error_codes/src/error_codes/E0499.md
index a07e8eb3b38..a07e8eb3b38 100644
--- a/src/librustc_error_codes/error_codes/E0499.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0499.md
diff --git a/src/librustc_error_codes/error_codes/E0500.md b/compiler/rustc_error_codes/src/error_codes/E0500.md
index fde31d2c745..fde31d2c745 100644
--- a/src/librustc_error_codes/error_codes/E0500.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0500.md
diff --git a/src/librustc_error_codes/error_codes/E0501.md b/compiler/rustc_error_codes/src/error_codes/E0501.md
index ffdbc443905..ffdbc443905 100644
--- a/src/librustc_error_codes/error_codes/E0501.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0501.md
diff --git a/src/librustc_error_codes/error_codes/E0502.md b/compiler/rustc_error_codes/src/error_codes/E0502.md
index dc3ffdfddd9..dc3ffdfddd9 100644
--- a/src/librustc_error_codes/error_codes/E0502.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0502.md
diff --git a/src/librustc_error_codes/error_codes/E0503.md b/compiler/rustc_error_codes/src/error_codes/E0503.md
index c52525fee54..c52525fee54 100644
--- a/src/librustc_error_codes/error_codes/E0503.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0503.md
diff --git a/src/librustc_error_codes/error_codes/E0504.md b/compiler/rustc_error_codes/src/error_codes/E0504.md
index bcbd00a8690..bcbd00a8690 100644
--- a/src/librustc_error_codes/error_codes/E0504.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0504.md
diff --git a/src/librustc_error_codes/error_codes/E0505.md b/compiler/rustc_error_codes/src/error_codes/E0505.md
index b11e3c0e947..b11e3c0e947 100644
--- a/src/librustc_error_codes/error_codes/E0505.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0505.md
diff --git a/src/librustc_error_codes/error_codes/E0506.md b/compiler/rustc_error_codes/src/error_codes/E0506.md
index c312a0460e3..c312a0460e3 100644
--- a/src/librustc_error_codes/error_codes/E0506.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0506.md
diff --git a/src/librustc_error_codes/error_codes/E0507.md b/compiler/rustc_error_codes/src/error_codes/E0507.md
index 254751fc45e..254751fc45e 100644
--- a/src/librustc_error_codes/error_codes/E0507.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0507.md
diff --git a/src/librustc_error_codes/error_codes/E0508.md b/compiler/rustc_error_codes/src/error_codes/E0508.md
index 33572fca6a3..33572fca6a3 100644
--- a/src/librustc_error_codes/error_codes/E0508.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0508.md
diff --git a/src/librustc_error_codes/error_codes/E0509.md b/compiler/rustc_error_codes/src/error_codes/E0509.md
index 9cbd7d695aa..9cbd7d695aa 100644
--- a/src/librustc_error_codes/error_codes/E0509.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0509.md
diff --git a/src/librustc_error_codes/error_codes/E0510.md b/compiler/rustc_error_codes/src/error_codes/E0510.md
index e045e04bdbe..e045e04bdbe 100644
--- a/src/librustc_error_codes/error_codes/E0510.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0510.md
diff --git a/src/librustc_error_codes/error_codes/E0511.md b/compiler/rustc_error_codes/src/error_codes/E0511.md
index 5351a685eb5..5351a685eb5 100644
--- a/src/librustc_error_codes/error_codes/E0511.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0511.md
diff --git a/src/librustc_error_codes/error_codes/E0512.md b/compiler/rustc_error_codes/src/error_codes/E0512.md
index 00c09612285..00c09612285 100644
--- a/src/librustc_error_codes/error_codes/E0512.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0512.md
diff --git a/src/librustc_error_codes/error_codes/E0515.md b/compiler/rustc_error_codes/src/error_codes/E0515.md
index 0f4fbf67223..0f4fbf67223 100644
--- a/src/librustc_error_codes/error_codes/E0515.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0515.md
diff --git a/src/librustc_error_codes/error_codes/E0516.md b/compiler/rustc_error_codes/src/error_codes/E0516.md
index 935c31bbab9..935c31bbab9 100644
--- a/src/librustc_error_codes/error_codes/E0516.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0516.md
diff --git a/src/librustc_error_codes/error_codes/E0517.md b/compiler/rustc_error_codes/src/error_codes/E0517.md
index ae802245bd1..ae802245bd1 100644
--- a/src/librustc_error_codes/error_codes/E0517.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0517.md
diff --git a/src/librustc_error_codes/error_codes/E0518.md b/compiler/rustc_error_codes/src/error_codes/E0518.md
index f04329bc4e6..f04329bc4e6 100644
--- a/src/librustc_error_codes/error_codes/E0518.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0518.md
diff --git a/src/librustc_error_codes/error_codes/E0520.md b/compiler/rustc_error_codes/src/error_codes/E0520.md
index f9d7e02e5c8..f9d7e02e5c8 100644
--- a/src/librustc_error_codes/error_codes/E0520.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0520.md
diff --git a/src/librustc_error_codes/error_codes/E0522.md b/compiler/rustc_error_codes/src/error_codes/E0522.md
index 83272314a87..83272314a87 100644
--- a/src/librustc_error_codes/error_codes/E0522.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0522.md
diff --git a/src/librustc_error_codes/error_codes/E0524.md b/compiler/rustc_error_codes/src/error_codes/E0524.md
index bab241b5a95..bab241b5a95 100644
--- a/src/librustc_error_codes/error_codes/E0524.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0524.md
diff --git a/src/librustc_error_codes/error_codes/E0525.md b/compiler/rustc_error_codes/src/error_codes/E0525.md
index a769440ca1b..a769440ca1b 100644
--- a/src/librustc_error_codes/error_codes/E0525.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0525.md
diff --git a/src/librustc_error_codes/error_codes/E0527.md b/compiler/rustc_error_codes/src/error_codes/E0527.md
index 97ea3126938..97ea3126938 100644
--- a/src/librustc_error_codes/error_codes/E0527.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0527.md
diff --git a/src/librustc_error_codes/error_codes/E0528.md b/compiler/rustc_error_codes/src/error_codes/E0528.md
index 54c2c4d4e9d..54c2c4d4e9d 100644
--- a/src/librustc_error_codes/error_codes/E0528.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0528.md
diff --git a/src/librustc_error_codes/error_codes/E0529.md b/compiler/rustc_error_codes/src/error_codes/E0529.md
index 013f438ba93..013f438ba93 100644
--- a/src/librustc_error_codes/error_codes/E0529.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0529.md
diff --git a/src/librustc_error_codes/error_codes/E0530.md b/compiler/rustc_error_codes/src/error_codes/E0530.md
index 502f674fc1d..502f674fc1d 100644
--- a/src/librustc_error_codes/error_codes/E0530.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0530.md
diff --git a/src/librustc_error_codes/error_codes/E0531.md b/compiler/rustc_error_codes/src/error_codes/E0531.md
index 2814046fbdd..2814046fbdd 100644
--- a/src/librustc_error_codes/error_codes/E0531.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0531.md
diff --git a/src/librustc_error_codes/error_codes/E0532.md b/compiler/rustc_error_codes/src/error_codes/E0532.md
index 6fb315a3716..6fb315a3716 100644
--- a/src/librustc_error_codes/error_codes/E0532.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0532.md
diff --git a/src/librustc_error_codes/error_codes/E0533.md b/compiler/rustc_error_codes/src/error_codes/E0533.md
index 279d728caae..279d728caae 100644
--- a/src/librustc_error_codes/error_codes/E0533.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0533.md
diff --git a/src/librustc_error_codes/error_codes/E0534.md b/compiler/rustc_error_codes/src/error_codes/E0534.md
index 1ca9411b8d4..1ca9411b8d4 100644
--- a/src/librustc_error_codes/error_codes/E0534.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0534.md
diff --git a/src/librustc_error_codes/error_codes/E0535.md b/compiler/rustc_error_codes/src/error_codes/E0535.md
index 0cf3118b02c..0cf3118b02c 100644
--- a/src/librustc_error_codes/error_codes/E0535.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0535.md
diff --git a/src/librustc_error_codes/error_codes/E0536.md b/compiler/rustc_error_codes/src/error_codes/E0536.md
index c081a3d9cfa..c081a3d9cfa 100644
--- a/src/librustc_error_codes/error_codes/E0536.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0536.md
diff --git a/src/librustc_error_codes/error_codes/E0537.md b/compiler/rustc_error_codes/src/error_codes/E0537.md
index 123efd4f57d..123efd4f57d 100644
--- a/src/librustc_error_codes/error_codes/E0537.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0537.md
diff --git a/src/librustc_error_codes/error_codes/E0538.md b/compiler/rustc_error_codes/src/error_codes/E0538.md
index 5858771ce88..5858771ce88 100644
--- a/src/librustc_error_codes/error_codes/E0538.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0538.md
diff --git a/src/librustc_error_codes/error_codes/E0539.md b/compiler/rustc_error_codes/src/error_codes/E0539.md
index df2d7d910bb..df2d7d910bb 100644
--- a/src/librustc_error_codes/error_codes/E0539.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0539.md
diff --git a/src/librustc_error_codes/error_codes/E0541.md b/compiler/rustc_error_codes/src/error_codes/E0541.md
index 96334088fee..96334088fee 100644
--- a/src/librustc_error_codes/error_codes/E0541.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0541.md
diff --git a/src/librustc_error_codes/error_codes/E0550.md b/compiler/rustc_error_codes/src/error_codes/E0550.md
index 1487d701847..1487d701847 100644
--- a/src/librustc_error_codes/error_codes/E0550.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0550.md
diff --git a/src/librustc_error_codes/error_codes/E0551.md b/compiler/rustc_error_codes/src/error_codes/E0551.md
index 53db559a4fc..53db559a4fc 100644
--- a/src/librustc_error_codes/error_codes/E0551.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0551.md
diff --git a/src/librustc_error_codes/error_codes/E0552.md b/compiler/rustc_error_codes/src/error_codes/E0552.md
index 0fbc861fb7c..0fbc861fb7c 100644
--- a/src/librustc_error_codes/error_codes/E0552.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0552.md
diff --git a/src/librustc_error_codes/error_codes/E0554.md b/compiler/rustc_error_codes/src/error_codes/E0554.md
index e55fa4c6ede..e55fa4c6ede 100644
--- a/src/librustc_error_codes/error_codes/E0554.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0554.md
diff --git a/src/librustc_error_codes/error_codes/E0556.md b/compiler/rustc_error_codes/src/error_codes/E0556.md
index 2aac8240d29..2aac8240d29 100644
--- a/src/librustc_error_codes/error_codes/E0556.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0556.md
diff --git a/src/librustc_error_codes/error_codes/E0557.md b/compiler/rustc_error_codes/src/error_codes/E0557.md
index f330efe5933..f330efe5933 100644
--- a/src/librustc_error_codes/error_codes/E0557.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0557.md
diff --git a/src/librustc_error_codes/error_codes/E0559.md b/compiler/rustc_error_codes/src/error_codes/E0559.md
index b9f7b650892..b9f7b650892 100644
--- a/src/librustc_error_codes/error_codes/E0559.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0559.md
diff --git a/src/librustc_error_codes/error_codes/E0560.md b/compiler/rustc_error_codes/src/error_codes/E0560.md
index 7185bf38c23..7185bf38c23 100644
--- a/src/librustc_error_codes/error_codes/E0560.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0560.md
diff --git a/src/librustc_error_codes/error_codes/E0561.md b/compiler/rustc_error_codes/src/error_codes/E0561.md
index 52900189014..52900189014 100644
--- a/src/librustc_error_codes/error_codes/E0561.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0561.md
diff --git a/src/librustc_error_codes/error_codes/E0562.md b/compiler/rustc_error_codes/src/error_codes/E0562.md
index 95f038df56d..95f038df56d 100644
--- a/src/librustc_error_codes/error_codes/E0562.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0562.md
diff --git a/src/librustc_error_codes/error_codes/E0565.md b/compiler/rustc_error_codes/src/error_codes/E0565.md
index d5bba941c1d..d5bba941c1d 100644
--- a/src/librustc_error_codes/error_codes/E0565.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0565.md
diff --git a/src/librustc_error_codes/error_codes/E0566.md b/compiler/rustc_error_codes/src/error_codes/E0566.md
index 3dcd801a21a..3dcd801a21a 100644
--- a/src/librustc_error_codes/error_codes/E0566.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0566.md
diff --git a/src/librustc_error_codes/error_codes/E0567.md b/compiler/rustc_error_codes/src/error_codes/E0567.md
index 05cf8fed031..05cf8fed031 100644
--- a/src/librustc_error_codes/error_codes/E0567.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0567.md
diff --git a/src/librustc_error_codes/error_codes/E0568.md b/compiler/rustc_error_codes/src/error_codes/E0568.md
index a37381f1cbd..a37381f1cbd 100644
--- a/src/librustc_error_codes/error_codes/E0568.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0568.md
diff --git a/src/librustc_error_codes/error_codes/E0569.md b/compiler/rustc_error_codes/src/error_codes/E0569.md
index 2ca2b57ecac..2ca2b57ecac 100644
--- a/src/librustc_error_codes/error_codes/E0569.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0569.md
diff --git a/src/librustc_error_codes/error_codes/E0570.md b/compiler/rustc_error_codes/src/error_codes/E0570.md
index 355e71ffb43..355e71ffb43 100644
--- a/src/librustc_error_codes/error_codes/E0570.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0570.md
diff --git a/src/librustc_error_codes/error_codes/E0571.md b/compiler/rustc_error_codes/src/error_codes/E0571.md
index eadae05aa30..eadae05aa30 100644
--- a/src/librustc_error_codes/error_codes/E0571.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0571.md
diff --git a/src/librustc_error_codes/error_codes/E0572.md b/compiler/rustc_error_codes/src/error_codes/E0572.md
index b2660650f1b..b2660650f1b 100644
--- a/src/librustc_error_codes/error_codes/E0572.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0572.md
diff --git a/src/librustc_error_codes/error_codes/E0573.md b/compiler/rustc_error_codes/src/error_codes/E0573.md
index 6021ed0ef21..6021ed0ef21 100644
--- a/src/librustc_error_codes/error_codes/E0573.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0573.md
diff --git a/src/librustc_error_codes/error_codes/E0574.md b/compiler/rustc_error_codes/src/error_codes/E0574.md
index 8154d5b782e..8154d5b782e 100644
--- a/src/librustc_error_codes/error_codes/E0574.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0574.md
diff --git a/src/librustc_error_codes/error_codes/E0575.md b/compiler/rustc_error_codes/src/error_codes/E0575.md
index 903939a9af9..903939a9af9 100644
--- a/src/librustc_error_codes/error_codes/E0575.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0575.md
diff --git a/src/librustc_error_codes/error_codes/E0576.md b/compiler/rustc_error_codes/src/error_codes/E0576.md
index 8eead4e7e3b..8eead4e7e3b 100644
--- a/src/librustc_error_codes/error_codes/E0576.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0576.md
diff --git a/src/librustc_error_codes/error_codes/E0577.md b/compiler/rustc_error_codes/src/error_codes/E0577.md
index 1feb9c0acf3..1feb9c0acf3 100644
--- a/src/librustc_error_codes/error_codes/E0577.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0577.md
diff --git a/src/librustc_error_codes/error_codes/E0578.md b/compiler/rustc_error_codes/src/error_codes/E0578.md
index fca89757287..fca89757287 100644
--- a/src/librustc_error_codes/error_codes/E0578.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0578.md
diff --git a/src/librustc_error_codes/error_codes/E0579.md b/compiler/rustc_error_codes/src/error_codes/E0579.md
index f554242a3d4..f554242a3d4 100644
--- a/src/librustc_error_codes/error_codes/E0579.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0579.md
diff --git a/src/librustc_error_codes/error_codes/E0580.md b/compiler/rustc_error_codes/src/error_codes/E0580.md
index 260575d5de4..260575d5de4 100644
--- a/src/librustc_error_codes/error_codes/E0580.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0580.md
diff --git a/src/librustc_error_codes/error_codes/E0581.md b/compiler/rustc_error_codes/src/error_codes/E0581.md
index 89f6e3269ec..89f6e3269ec 100644
--- a/src/librustc_error_codes/error_codes/E0581.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0581.md
diff --git a/src/librustc_error_codes/error_codes/E0582.md b/compiler/rustc_error_codes/src/error_codes/E0582.md
index e50cc60ea33..e50cc60ea33 100644
--- a/src/librustc_error_codes/error_codes/E0582.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0582.md
diff --git a/src/librustc_error_codes/error_codes/E0583.md b/compiler/rustc_error_codes/src/error_codes/E0583.md
index 701900bb0cd..701900bb0cd 100644
--- a/src/librustc_error_codes/error_codes/E0583.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0583.md
diff --git a/src/librustc_error_codes/error_codes/E0584.md b/compiler/rustc_error_codes/src/error_codes/E0584.md
index 8b00655ee78..8b00655ee78 100644
--- a/src/librustc_error_codes/error_codes/E0584.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0584.md
diff --git a/src/librustc_error_codes/error_codes/E0585.md b/compiler/rustc_error_codes/src/error_codes/E0585.md
index de27cc19d18..de27cc19d18 100644
--- a/src/librustc_error_codes/error_codes/E0585.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0585.md
diff --git a/src/librustc_error_codes/error_codes/E0586.md b/compiler/rustc_error_codes/src/error_codes/E0586.md
index bc6572ecadb..bc6572ecadb 100644
--- a/src/librustc_error_codes/error_codes/E0586.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0586.md
diff --git a/src/librustc_error_codes/error_codes/E0587.md b/compiler/rustc_error_codes/src/error_codes/E0587.md
index ee9031dc379..ee9031dc379 100644
--- a/src/librustc_error_codes/error_codes/E0587.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0587.md
diff --git a/src/librustc_error_codes/error_codes/E0588.md b/compiler/rustc_error_codes/src/error_codes/E0588.md
index 040c7a02ef4..040c7a02ef4 100644
--- a/src/librustc_error_codes/error_codes/E0588.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0588.md
diff --git a/src/librustc_error_codes/error_codes/E0589.md b/compiler/rustc_error_codes/src/error_codes/E0589.md
index 8a4f8d21725..8a4f8d21725 100644
--- a/src/librustc_error_codes/error_codes/E0589.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0589.md
diff --git a/src/librustc_error_codes/error_codes/E0590.md b/compiler/rustc_error_codes/src/error_codes/E0590.md
index 11005b8336f..11005b8336f 100644
--- a/src/librustc_error_codes/error_codes/E0590.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0590.md
diff --git a/src/librustc_error_codes/error_codes/E0591.md b/compiler/rustc_error_codes/src/error_codes/E0591.md
index 7f68815b1c2..7f68815b1c2 100644
--- a/src/librustc_error_codes/error_codes/E0591.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0591.md
diff --git a/src/librustc_error_codes/error_codes/E0592.md b/compiler/rustc_error_codes/src/error_codes/E0592.md
index 06959b5d765..06959b5d765 100644
--- a/src/librustc_error_codes/error_codes/E0592.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0592.md
diff --git a/src/librustc_error_codes/error_codes/E0593.md b/compiler/rustc_error_codes/src/error_codes/E0593.md
index 1902d73f4d0..1902d73f4d0 100644
--- a/src/librustc_error_codes/error_codes/E0593.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0593.md
diff --git a/src/librustc_error_codes/error_codes/E0594.md b/compiler/rustc_error_codes/src/error_codes/E0594.md
index ad8eb631e63..ad8eb631e63 100644
--- a/src/librustc_error_codes/error_codes/E0594.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0594.md
diff --git a/src/librustc_error_codes/error_codes/E0595.md b/compiler/rustc_error_codes/src/error_codes/E0595.md
index e6729013243..e6729013243 100644
--- a/src/librustc_error_codes/error_codes/E0595.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0595.md
diff --git a/src/librustc_error_codes/error_codes/E0596.md b/compiler/rustc_error_codes/src/error_codes/E0596.md
index 95669309b3b..95669309b3b 100644
--- a/src/librustc_error_codes/error_codes/E0596.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0596.md
diff --git a/src/librustc_error_codes/error_codes/E0597.md b/compiler/rustc_error_codes/src/error_codes/E0597.md
index 3340768fa82..3340768fa82 100644
--- a/src/librustc_error_codes/error_codes/E0597.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0597.md
diff --git a/src/librustc_error_codes/error_codes/E0599.md b/compiler/rustc_error_codes/src/error_codes/E0599.md
index 5b1590b2999..5b1590b2999 100644
--- a/src/librustc_error_codes/error_codes/E0599.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0599.md
diff --git a/src/librustc_error_codes/error_codes/E0600.md b/compiler/rustc_error_codes/src/error_codes/E0600.md
index 356006c72f3..356006c72f3 100644
--- a/src/librustc_error_codes/error_codes/E0600.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0600.md
diff --git a/src/librustc_error_codes/error_codes/E0601.md b/compiler/rustc_error_codes/src/error_codes/E0601.md
index 7194b7971d3..7194b7971d3 100644
--- a/src/librustc_error_codes/error_codes/E0601.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0601.md
diff --git a/src/librustc_error_codes/error_codes/E0602.md b/compiler/rustc_error_codes/src/error_codes/E0602.md
index dcaf251a96b..dcaf251a96b 100644
--- a/src/librustc_error_codes/error_codes/E0602.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0602.md
diff --git a/src/librustc_error_codes/error_codes/E0603.md b/compiler/rustc_error_codes/src/error_codes/E0603.md
index 69fefce3908..69fefce3908 100644
--- a/src/librustc_error_codes/error_codes/E0603.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0603.md
diff --git a/src/librustc_error_codes/error_codes/E0604.md b/compiler/rustc_error_codes/src/error_codes/E0604.md
index adbf76509ed..adbf76509ed 100644
--- a/src/librustc_error_codes/error_codes/E0604.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0604.md
diff --git a/src/librustc_error_codes/error_codes/E0605.md b/compiler/rustc_error_codes/src/error_codes/E0605.md
index f3cc65dd8cf..f3cc65dd8cf 100644
--- a/src/librustc_error_codes/error_codes/E0605.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0605.md
diff --git a/src/librustc_error_codes/error_codes/E0606.md b/compiler/rustc_error_codes/src/error_codes/E0606.md
index 06ee7497fdf..06ee7497fdf 100644
--- a/src/librustc_error_codes/error_codes/E0606.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0606.md
diff --git a/src/librustc_error_codes/error_codes/E0607.md b/compiler/rustc_error_codes/src/error_codes/E0607.md
index ea6e10105b0..ea6e10105b0 100644
--- a/src/librustc_error_codes/error_codes/E0607.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0607.md
diff --git a/src/librustc_error_codes/error_codes/E0608.md b/compiler/rustc_error_codes/src/error_codes/E0608.md
index d0ebc3a26f0..d0ebc3a26f0 100644
--- a/src/librustc_error_codes/error_codes/E0608.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0608.md
diff --git a/src/librustc_error_codes/error_codes/E0609.md b/compiler/rustc_error_codes/src/error_codes/E0609.md
index a9db34f474e..a9db34f474e 100644
--- a/src/librustc_error_codes/error_codes/E0609.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0609.md
diff --git a/src/librustc_error_codes/error_codes/E0610.md b/compiler/rustc_error_codes/src/error_codes/E0610.md
index c737bd618c3..c737bd618c3 100644
--- a/src/librustc_error_codes/error_codes/E0610.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0610.md
diff --git a/src/librustc_error_codes/error_codes/E0614.md b/compiler/rustc_error_codes/src/error_codes/E0614.md
index d0ed06ebcee..d0ed06ebcee 100644
--- a/src/librustc_error_codes/error_codes/E0614.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0614.md
diff --git a/src/librustc_error_codes/error_codes/E0615.md b/compiler/rustc_error_codes/src/error_codes/E0615.md
index f513d059625..f513d059625 100644
--- a/src/librustc_error_codes/error_codes/E0615.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0615.md
diff --git a/src/librustc_error_codes/error_codes/E0616.md b/compiler/rustc_error_codes/src/error_codes/E0616.md
index 5acbc6e44e1..5acbc6e44e1 100644
--- a/src/librustc_error_codes/error_codes/E0616.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0616.md
diff --git a/src/librustc_error_codes/error_codes/E0617.md b/compiler/rustc_error_codes/src/error_codes/E0617.md
index 61b56766c26..61b56766c26 100644
--- a/src/librustc_error_codes/error_codes/E0617.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0617.md
diff --git a/src/librustc_error_codes/error_codes/E0618.md b/compiler/rustc_error_codes/src/error_codes/E0618.md
index c8dc9040cf1..c8dc9040cf1 100644
--- a/src/librustc_error_codes/error_codes/E0618.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0618.md
diff --git a/src/librustc_error_codes/error_codes/E0619.md b/compiler/rustc_error_codes/src/error_codes/E0619.md
index f516de43095..f516de43095 100644
--- a/src/librustc_error_codes/error_codes/E0619.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0619.md
diff --git a/src/librustc_error_codes/error_codes/E0620.md b/compiler/rustc_error_codes/src/error_codes/E0620.md
index f8e442807e5..f8e442807e5 100644
--- a/src/librustc_error_codes/error_codes/E0620.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0620.md
diff --git a/src/librustc_error_codes/error_codes/E0621.md b/compiler/rustc_error_codes/src/error_codes/E0621.md
index 7c0878df25e..7c0878df25e 100644
--- a/src/librustc_error_codes/error_codes/E0621.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0621.md
diff --git a/src/librustc_error_codes/error_codes/E0622.md b/compiler/rustc_error_codes/src/error_codes/E0622.md
index 990a2549412..990a2549412 100644
--- a/src/librustc_error_codes/error_codes/E0622.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0622.md
diff --git a/src/librustc_error_codes/error_codes/E0623.md b/compiler/rustc_error_codes/src/error_codes/E0623.md
index 1290edd0a0e..1290edd0a0e 100644
--- a/src/librustc_error_codes/error_codes/E0623.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0623.md
diff --git a/src/librustc_error_codes/error_codes/E0624.md b/compiler/rustc_error_codes/src/error_codes/E0624.md
index 0fd21c44b3d..0fd21c44b3d 100644
--- a/src/librustc_error_codes/error_codes/E0624.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0624.md
diff --git a/src/librustc_error_codes/error_codes/E0626.md b/compiler/rustc_error_codes/src/error_codes/E0626.md
index cc6e03d1ca7..cc6e03d1ca7 100644
--- a/src/librustc_error_codes/error_codes/E0626.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0626.md
diff --git a/src/librustc_error_codes/error_codes/E0627.md b/compiler/rustc_error_codes/src/error_codes/E0627.md
index 21358e1e567..21358e1e567 100644
--- a/src/librustc_error_codes/error_codes/E0627.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0627.md
diff --git a/src/librustc_error_codes/error_codes/E0628.md b/compiler/rustc_error_codes/src/error_codes/E0628.md
index 40040c9a56a..40040c9a56a 100644
--- a/src/librustc_error_codes/error_codes/E0628.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0628.md
diff --git a/src/librustc_error_codes/error_codes/E0631.md b/compiler/rustc_error_codes/src/error_codes/E0631.md
index 6188d5f61a7..6188d5f61a7 100644
--- a/src/librustc_error_codes/error_codes/E0631.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0631.md
diff --git a/src/librustc_error_codes/error_codes/E0633.md b/compiler/rustc_error_codes/src/error_codes/E0633.md
index 7f488cde664..7f488cde664 100644
--- a/src/librustc_error_codes/error_codes/E0633.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0633.md
diff --git a/src/librustc_error_codes/error_codes/E0634.md b/compiler/rustc_error_codes/src/error_codes/E0634.md
index 0c4ed2596e2..0c4ed2596e2 100644
--- a/src/librustc_error_codes/error_codes/E0634.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0634.md
diff --git a/src/librustc_error_codes/error_codes/E0635.md b/compiler/rustc_error_codes/src/error_codes/E0635.md
index a39d2be4f8f..a39d2be4f8f 100644
--- a/src/librustc_error_codes/error_codes/E0635.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0635.md
diff --git a/src/librustc_error_codes/error_codes/E0636.md b/compiler/rustc_error_codes/src/error_codes/E0636.md
index 57cf72db556..57cf72db556 100644
--- a/src/librustc_error_codes/error_codes/E0636.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0636.md
diff --git a/src/librustc_error_codes/error_codes/E0637.md b/compiler/rustc_error_codes/src/error_codes/E0637.md
index d9068950bdf..d9068950bdf 100644
--- a/src/librustc_error_codes/error_codes/E0637.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0637.md
diff --git a/src/librustc_error_codes/error_codes/E0638.md b/compiler/rustc_error_codes/src/error_codes/E0638.md
index 14cd31502b6..14cd31502b6 100644
--- a/src/librustc_error_codes/error_codes/E0638.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0638.md
diff --git a/src/librustc_error_codes/error_codes/E0639.md b/compiler/rustc_error_codes/src/error_codes/E0639.md
index 4646e37fb75..4646e37fb75 100644
--- a/src/librustc_error_codes/error_codes/E0639.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0639.md
diff --git a/src/librustc_error_codes/error_codes/E0641.md b/compiler/rustc_error_codes/src/error_codes/E0641.md
index 5848e9b5c05..5848e9b5c05 100644
--- a/src/librustc_error_codes/error_codes/E0641.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0641.md
diff --git a/src/librustc_error_codes/error_codes/E0642.md b/compiler/rustc_error_codes/src/error_codes/E0642.md
index c790aa154bd..c790aa154bd 100644
--- a/src/librustc_error_codes/error_codes/E0642.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0642.md
diff --git a/src/librustc_error_codes/error_codes/E0643.md b/compiler/rustc_error_codes/src/error_codes/E0643.md
index 53919607dfb..53919607dfb 100644
--- a/src/librustc_error_codes/error_codes/E0643.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0643.md
diff --git a/src/librustc_error_codes/error_codes/E0644.md b/compiler/rustc_error_codes/src/error_codes/E0644.md
index 8c68da3b2f3..8c68da3b2f3 100644
--- a/src/librustc_error_codes/error_codes/E0644.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0644.md
diff --git a/src/librustc_error_codes/error_codes/E0646.md b/compiler/rustc_error_codes/src/error_codes/E0646.md
index 1e9ec7d4380..1e9ec7d4380 100644
--- a/src/librustc_error_codes/error_codes/E0646.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0646.md
diff --git a/src/librustc_error_codes/error_codes/E0647.md b/compiler/rustc_error_codes/src/error_codes/E0647.md
index 8ca6e777f30..8ca6e777f30 100644
--- a/src/librustc_error_codes/error_codes/E0647.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0647.md
diff --git a/src/librustc_error_codes/error_codes/E0648.md b/compiler/rustc_error_codes/src/error_codes/E0648.md
index d99dc19503d..d99dc19503d 100644
--- a/src/librustc_error_codes/error_codes/E0648.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0648.md
diff --git a/src/librustc_error_codes/error_codes/E0657.md b/compiler/rustc_error_codes/src/error_codes/E0657.md
index 7fe48c51147..7fe48c51147 100644
--- a/src/librustc_error_codes/error_codes/E0657.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0657.md
diff --git a/src/librustc_error_codes/error_codes/E0658.md b/compiler/rustc_error_codes/src/error_codes/E0658.md
index d821b9027f1..d821b9027f1 100644
--- a/src/librustc_error_codes/error_codes/E0658.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0658.md
diff --git a/src/librustc_error_codes/error_codes/E0659.md b/compiler/rustc_error_codes/src/error_codes/E0659.md
index e2c7e25cc84..e2c7e25cc84 100644
--- a/src/librustc_error_codes/error_codes/E0659.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0659.md
diff --git a/src/librustc_error_codes/error_codes/E0660.md b/compiler/rustc_error_codes/src/error_codes/E0660.md
index fccd1b96f60..fccd1b96f60 100644
--- a/src/librustc_error_codes/error_codes/E0660.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0660.md
diff --git a/src/librustc_error_codes/error_codes/E0661.md b/compiler/rustc_error_codes/src/error_codes/E0661.md
index f1debee7a18..f1debee7a18 100644
--- a/src/librustc_error_codes/error_codes/E0661.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0661.md
diff --git a/src/librustc_error_codes/error_codes/E0662.md b/compiler/rustc_error_codes/src/error_codes/E0662.md
index d4765f078b0..d4765f078b0 100644
--- a/src/librustc_error_codes/error_codes/E0662.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0662.md
diff --git a/src/librustc_error_codes/error_codes/E0663.md b/compiler/rustc_error_codes/src/error_codes/E0663.md
index d5a85b275db..d5a85b275db 100644
--- a/src/librustc_error_codes/error_codes/E0663.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0663.md
diff --git a/src/librustc_error_codes/error_codes/E0664.md b/compiler/rustc_error_codes/src/error_codes/E0664.md
index ce9c9491df3..ce9c9491df3 100644
--- a/src/librustc_error_codes/error_codes/E0664.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0664.md
diff --git a/src/librustc_error_codes/error_codes/E0665.md b/compiler/rustc_error_codes/src/error_codes/E0665.md
index a15f4021c71..a15f4021c71 100644
--- a/src/librustc_error_codes/error_codes/E0665.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0665.md
diff --git a/src/librustc_error_codes/error_codes/E0666.md b/compiler/rustc_error_codes/src/error_codes/E0666.md
index 1a0dc5a5229..1a0dc5a5229 100644
--- a/src/librustc_error_codes/error_codes/E0666.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0666.md
diff --git a/src/librustc_error_codes/error_codes/E0668.md b/compiler/rustc_error_codes/src/error_codes/E0668.md
index b6fedfe53fc..b6fedfe53fc 100644
--- a/src/librustc_error_codes/error_codes/E0668.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0668.md
diff --git a/src/librustc_error_codes/error_codes/E0669.md b/compiler/rustc_error_codes/src/error_codes/E0669.md
index f078c441b34..f078c441b34 100644
--- a/src/librustc_error_codes/error_codes/E0669.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0669.md
diff --git a/src/librustc_error_codes/error_codes/E0670.md b/compiler/rustc_error_codes/src/error_codes/E0670.md
index 74c1af06cf4..74c1af06cf4 100644
--- a/src/librustc_error_codes/error_codes/E0670.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0670.md
diff --git a/src/librustc_error_codes/error_codes/E0671.md b/compiler/rustc_error_codes/src/error_codes/E0671.md
index a993ce826a7..a993ce826a7 100644
--- a/src/librustc_error_codes/error_codes/E0671.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0671.md
diff --git a/src/librustc_error_codes/error_codes/E0687.md b/compiler/rustc_error_codes/src/error_codes/E0687.md
index 67b7db2d31f..67b7db2d31f 100644
--- a/src/librustc_error_codes/error_codes/E0687.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0687.md
diff --git a/src/librustc_error_codes/error_codes/E0688.md b/compiler/rustc_error_codes/src/error_codes/E0688.md
index db50f490208..db50f490208 100644
--- a/src/librustc_error_codes/error_codes/E0688.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0688.md
diff --git a/src/librustc_error_codes/error_codes/E0689.md b/compiler/rustc_error_codes/src/error_codes/E0689.md
index a680a204211..a680a204211 100644
--- a/src/librustc_error_codes/error_codes/E0689.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0689.md
diff --git a/src/librustc_error_codes/error_codes/E0690.md b/compiler/rustc_error_codes/src/error_codes/E0690.md
index 1673456580a..1673456580a 100644
--- a/src/librustc_error_codes/error_codes/E0690.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0690.md
diff --git a/src/librustc_error_codes/error_codes/E0691.md b/compiler/rustc_error_codes/src/error_codes/E0691.md
index 60060cacbd6..60060cacbd6 100644
--- a/src/librustc_error_codes/error_codes/E0691.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0691.md
diff --git a/src/librustc_error_codes/error_codes/E0692.md b/compiler/rustc_error_codes/src/error_codes/E0692.md
index 596cb1e777e..596cb1e777e 100644
--- a/src/librustc_error_codes/error_codes/E0692.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0692.md
diff --git a/src/librustc_error_codes/error_codes/E0693.md b/compiler/rustc_error_codes/src/error_codes/E0693.md
index 43e9d17979e..43e9d17979e 100644
--- a/src/librustc_error_codes/error_codes/E0693.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0693.md
diff --git a/src/librustc_error_codes/error_codes/E0695.md b/compiler/rustc_error_codes/src/error_codes/E0695.md
index 5013e83ca03..5013e83ca03 100644
--- a/src/librustc_error_codes/error_codes/E0695.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0695.md
diff --git a/src/librustc_error_codes/error_codes/E0696.md b/compiler/rustc_error_codes/src/error_codes/E0696.md
index fc32d1cc5f7..fc32d1cc5f7 100644
--- a/src/librustc_error_codes/error_codes/E0696.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0696.md
diff --git a/src/librustc_error_codes/error_codes/E0697.md b/compiler/rustc_error_codes/src/error_codes/E0697.md
index ab63d2e73f7..ab63d2e73f7 100644
--- a/src/librustc_error_codes/error_codes/E0697.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0697.md
diff --git a/src/librustc_error_codes/error_codes/E0698.md b/compiler/rustc_error_codes/src/error_codes/E0698.md
index 3ba992a8476..3ba992a8476 100644
--- a/src/librustc_error_codes/error_codes/E0698.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0698.md
diff --git a/src/librustc_error_codes/error_codes/E0699.md b/compiler/rustc_error_codes/src/error_codes/E0699.md
index 454d2507e5e..454d2507e5e 100644
--- a/src/librustc_error_codes/error_codes/E0699.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0699.md
diff --git a/src/librustc_error_codes/error_codes/E0700.md b/compiler/rustc_error_codes/src/error_codes/E0700.md
index b1eb8b66ad6..b1eb8b66ad6 100644
--- a/src/librustc_error_codes/error_codes/E0700.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0700.md
diff --git a/src/librustc_error_codes/error_codes/E0701.md b/compiler/rustc_error_codes/src/error_codes/E0701.md
index 4965e643105..4965e643105 100644
--- a/src/librustc_error_codes/error_codes/E0701.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0701.md
diff --git a/src/librustc_error_codes/error_codes/E0703.md b/compiler/rustc_error_codes/src/error_codes/E0703.md
index b42677d52cb..b42677d52cb 100644
--- a/src/librustc_error_codes/error_codes/E0703.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0703.md
diff --git a/src/librustc_error_codes/error_codes/E0704.md b/compiler/rustc_error_codes/src/error_codes/E0704.md
index c22b274fb22..c22b274fb22 100644
--- a/src/librustc_error_codes/error_codes/E0704.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0704.md
diff --git a/src/librustc_error_codes/error_codes/E0705.md b/compiler/rustc_error_codes/src/error_codes/E0705.md
index 1edd47de4cb..1edd47de4cb 100644
--- a/src/librustc_error_codes/error_codes/E0705.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0705.md
diff --git a/src/librustc_error_codes/error_codes/E0706.md b/compiler/rustc_error_codes/src/error_codes/E0706.md
index d379b8a2384..d379b8a2384 100644
--- a/src/librustc_error_codes/error_codes/E0706.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0706.md
diff --git a/src/librustc_error_codes/error_codes/E0708.md b/compiler/rustc_error_codes/src/error_codes/E0708.md
index 9287fc803d1..9287fc803d1 100644
--- a/src/librustc_error_codes/error_codes/E0708.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0708.md
diff --git a/src/librustc_error_codes/error_codes/E0710.md b/compiler/rustc_error_codes/src/error_codes/E0710.md
index b7037ea611b..b7037ea611b 100644
--- a/src/librustc_error_codes/error_codes/E0710.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0710.md
diff --git a/src/librustc_error_codes/error_codes/E0712.md b/compiler/rustc_error_codes/src/error_codes/E0712.md
index 7e09210e787..7e09210e787 100644
--- a/src/librustc_error_codes/error_codes/E0712.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0712.md
diff --git a/src/librustc_error_codes/error_codes/E0713.md b/compiler/rustc_error_codes/src/error_codes/E0713.md
index 9361046943f..9361046943f 100644
--- a/src/librustc_error_codes/error_codes/E0713.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0713.md
diff --git a/src/librustc_error_codes/error_codes/E0714.md b/compiler/rustc_error_codes/src/error_codes/E0714.md
index 45d1cafa690..45d1cafa690 100644
--- a/src/librustc_error_codes/error_codes/E0714.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0714.md
diff --git a/src/librustc_error_codes/error_codes/E0715.md b/compiler/rustc_error_codes/src/error_codes/E0715.md
index b27702b3c26..b27702b3c26 100644
--- a/src/librustc_error_codes/error_codes/E0715.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0715.md
diff --git a/src/librustc_error_codes/error_codes/E0716.md b/compiler/rustc_error_codes/src/error_codes/E0716.md
index c6d0337ddda..c6d0337ddda 100644
--- a/src/librustc_error_codes/error_codes/E0716.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0716.md
diff --git a/src/librustc_error_codes/error_codes/E0718.md b/compiler/rustc_error_codes/src/error_codes/E0718.md
index 1fe62ecf1f4..1fe62ecf1f4 100644
--- a/src/librustc_error_codes/error_codes/E0718.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0718.md
diff --git a/src/librustc_error_codes/error_codes/E0719.md b/compiler/rustc_error_codes/src/error_codes/E0719.md
index 057a0b1645c..057a0b1645c 100644
--- a/src/librustc_error_codes/error_codes/E0719.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0719.md
diff --git a/src/librustc_error_codes/error_codes/E0720.md b/compiler/rustc_error_codes/src/error_codes/E0720.md
index 40dfa484d3f..40dfa484d3f 100644
--- a/src/librustc_error_codes/error_codes/E0720.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0720.md
diff --git a/src/librustc_error_codes/error_codes/E0723.md b/compiler/rustc_error_codes/src/error_codes/E0723.md
index 95d47ab21cb..95d47ab21cb 100644
--- a/src/librustc_error_codes/error_codes/E0723.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0723.md
diff --git a/src/librustc_error_codes/error_codes/E0724.md b/compiler/rustc_error_codes/src/error_codes/E0724.md
index e8f84d0fc7d..e8f84d0fc7d 100644
--- a/src/librustc_error_codes/error_codes/E0724.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0724.md
diff --git a/src/librustc_error_codes/error_codes/E0725.md b/compiler/rustc_error_codes/src/error_codes/E0725.md
index 9bd321e5f82..9bd321e5f82 100644
--- a/src/librustc_error_codes/error_codes/E0725.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0725.md
diff --git a/src/librustc_error_codes/error_codes/E0727.md b/compiler/rustc_error_codes/src/error_codes/E0727.md
index 386daea0c57..386daea0c57 100644
--- a/src/librustc_error_codes/error_codes/E0727.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0727.md
diff --git a/src/librustc_error_codes/error_codes/E0728.md b/compiler/rustc_error_codes/src/error_codes/E0728.md
index f4968a4f00e..f4968a4f00e 100644
--- a/src/librustc_error_codes/error_codes/E0728.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0728.md
diff --git a/src/librustc_error_codes/error_codes/E0729.md b/compiler/rustc_error_codes/src/error_codes/E0729.md
index 74f89080b91..74f89080b91 100644
--- a/src/librustc_error_codes/error_codes/E0729.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0729.md
diff --git a/src/librustc_error_codes/error_codes/E0730.md b/compiler/rustc_error_codes/src/error_codes/E0730.md
index 016b3f38aa3..016b3f38aa3 100644
--- a/src/librustc_error_codes/error_codes/E0730.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0730.md
diff --git a/src/librustc_error_codes/error_codes/E0731.md b/compiler/rustc_error_codes/src/error_codes/E0731.md
index 096c053fe83..096c053fe83 100644
--- a/src/librustc_error_codes/error_codes/E0731.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0731.md
diff --git a/src/librustc_error_codes/error_codes/E0732.md b/compiler/rustc_error_codes/src/error_codes/E0732.md
index 7347e6654c5..7347e6654c5 100644
--- a/src/librustc_error_codes/error_codes/E0732.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0732.md
diff --git a/src/librustc_error_codes/error_codes/E0733.md b/compiler/rustc_error_codes/src/error_codes/E0733.md
index 051b75148e5..051b75148e5 100644
--- a/src/librustc_error_codes/error_codes/E0733.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0733.md
diff --git a/src/librustc_error_codes/error_codes/E0734.md b/compiler/rustc_error_codes/src/error_codes/E0734.md
index 4b8e89a7060..4b8e89a7060 100644
--- a/src/librustc_error_codes/error_codes/E0734.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0734.md
diff --git a/src/librustc_error_codes/error_codes/E0735.md b/compiler/rustc_error_codes/src/error_codes/E0735.md
index e8268a5836c..e8268a5836c 100644
--- a/src/librustc_error_codes/error_codes/E0735.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0735.md
diff --git a/src/librustc_error_codes/error_codes/E0736.md b/compiler/rustc_error_codes/src/error_codes/E0736.md
index 0f3d41ba66d..0f3d41ba66d 100644
--- a/src/librustc_error_codes/error_codes/E0736.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0736.md
diff --git a/src/librustc_error_codes/error_codes/E0737.md b/compiler/rustc_error_codes/src/error_codes/E0737.md
index ab5e60692b4..ab5e60692b4 100644
--- a/src/librustc_error_codes/error_codes/E0737.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0737.md
diff --git a/src/librustc_error_codes/error_codes/E0739.md b/compiler/rustc_error_codes/src/error_codes/E0739.md
index 8d9039bef93..8d9039bef93 100644
--- a/src/librustc_error_codes/error_codes/E0739.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0739.md
diff --git a/src/librustc_error_codes/error_codes/E0740.md b/compiler/rustc_error_codes/src/error_codes/E0740.md
index 6240099a99f..6240099a99f 100644
--- a/src/librustc_error_codes/error_codes/E0740.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0740.md
diff --git a/src/librustc_error_codes/error_codes/E0741.md b/compiler/rustc_error_codes/src/error_codes/E0741.md
index 91379bfe05c..91379bfe05c 100644
--- a/src/librustc_error_codes/error_codes/E0741.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0741.md
diff --git a/src/librustc_error_codes/error_codes/E0742.md b/compiler/rustc_error_codes/src/error_codes/E0742.md
index fed9f1f4cee..fed9f1f4cee 100644
--- a/src/librustc_error_codes/error_codes/E0742.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0742.md
diff --git a/src/librustc_error_codes/error_codes/E0743.md b/compiler/rustc_error_codes/src/error_codes/E0743.md
index ddd3136df0c..ddd3136df0c 100644
--- a/src/librustc_error_codes/error_codes/E0743.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0743.md
diff --git a/src/librustc_error_codes/error_codes/E0744.md b/compiler/rustc_error_codes/src/error_codes/E0744.md
index 14cff3613e0..14cff3613e0 100644
--- a/src/librustc_error_codes/error_codes/E0744.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0744.md
diff --git a/src/librustc_error_codes/error_codes/E0745.md b/compiler/rustc_error_codes/src/error_codes/E0745.md
index 23ee7af30f4..23ee7af30f4 100644
--- a/src/librustc_error_codes/error_codes/E0745.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0745.md
diff --git a/src/librustc_error_codes/error_codes/E0746.md b/compiler/rustc_error_codes/src/error_codes/E0746.md
index 90755d47f67..90755d47f67 100644
--- a/src/librustc_error_codes/error_codes/E0746.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0746.md
diff --git a/src/librustc_error_codes/error_codes/E0747.md b/compiler/rustc_error_codes/src/error_codes/E0747.md
index caf7e0fba07..caf7e0fba07 100644
--- a/src/librustc_error_codes/error_codes/E0747.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0747.md
diff --git a/src/librustc_error_codes/error_codes/E0748.md b/compiler/rustc_error_codes/src/error_codes/E0748.md
index 69f1c026125..69f1c026125 100644
--- a/src/librustc_error_codes/error_codes/E0748.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0748.md
diff --git a/src/librustc_error_codes/error_codes/E0749.md b/compiler/rustc_error_codes/src/error_codes/E0749.md
index dfe90ae89e4..dfe90ae89e4 100644
--- a/src/librustc_error_codes/error_codes/E0749.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0749.md
diff --git a/src/librustc_error_codes/error_codes/E0750.md b/compiler/rustc_error_codes/src/error_codes/E0750.md
index 905e852f8d5..905e852f8d5 100644
--- a/src/librustc_error_codes/error_codes/E0750.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0750.md
diff --git a/src/librustc_error_codes/error_codes/E0751.md b/compiler/rustc_error_codes/src/error_codes/E0751.md
index 8794f7868f3..8794f7868f3 100644
--- a/src/librustc_error_codes/error_codes/E0751.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0751.md
diff --git a/src/librustc_error_codes/error_codes/E0752.md b/compiler/rustc_error_codes/src/error_codes/E0752.md
index 9736da80c2b..9736da80c2b 100644
--- a/src/librustc_error_codes/error_codes/E0752.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0752.md
diff --git a/src/librustc_error_codes/error_codes/E0753.md b/compiler/rustc_error_codes/src/error_codes/E0753.md
index a69da964aee..a69da964aee 100644
--- a/src/librustc_error_codes/error_codes/E0753.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0753.md
diff --git a/src/librustc_error_codes/error_codes/E0754.md b/compiler/rustc_error_codes/src/error_codes/E0754.md
index 57620bcd65c..57620bcd65c 100644
--- a/src/librustc_error_codes/error_codes/E0754.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0754.md
diff --git a/src/librustc_error_codes/error_codes/E0758.md b/compiler/rustc_error_codes/src/error_codes/E0758.md
index ddca4b3d75f..ddca4b3d75f 100644
--- a/src/librustc_error_codes/error_codes/E0758.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0758.md
diff --git a/src/librustc_error_codes/error_codes/E0759.md b/compiler/rustc_error_codes/src/error_codes/E0759.md
index 6d525310f75..6d525310f75 100644
--- a/src/librustc_error_codes/error_codes/E0759.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0759.md
diff --git a/src/librustc_error_codes/error_codes/E0760.md b/compiler/rustc_error_codes/src/error_codes/E0760.md
index e1dcfefebcd..e1dcfefebcd 100644
--- a/src/librustc_error_codes/error_codes/E0760.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0760.md
diff --git a/src/librustc_error_codes/error_codes/E0761.md b/compiler/rustc_error_codes/src/error_codes/E0761.md
index e112674fbcc..e112674fbcc 100644
--- a/src/librustc_error_codes/error_codes/E0761.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0761.md
diff --git a/src/librustc_error_codes/error_codes/E0762.md b/compiler/rustc_error_codes/src/error_codes/E0762.md
index b01ded4a866..b01ded4a866 100644
--- a/src/librustc_error_codes/error_codes/E0762.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0762.md
diff --git a/src/librustc_error_codes/error_codes/E0763.md b/compiler/rustc_error_codes/src/error_codes/E0763.md
index 095b779f3e7..095b779f3e7 100644
--- a/src/librustc_error_codes/error_codes/E0763.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0763.md
diff --git a/src/librustc_error_codes/error_codes/E0764.md b/compiler/rustc_error_codes/src/error_codes/E0764.md
index e9061f988ac..e9061f988ac 100644
--- a/src/librustc_error_codes/error_codes/E0764.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0764.md
diff --git a/src/librustc_error_codes/error_codes/E0765.md b/compiler/rustc_error_codes/src/error_codes/E0765.md
index 456e3f3e9e4..456e3f3e9e4 100644
--- a/src/librustc_error_codes/error_codes/E0765.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0765.md
diff --git a/src/librustc_error_codes/error_codes/E0766.md b/compiler/rustc_error_codes/src/error_codes/E0766.md
index 4e775df2cac..4e775df2cac 100644
--- a/src/librustc_error_codes/error_codes/E0766.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0766.md
diff --git a/src/librustc_error_codes/error_codes/E0767.md b/compiler/rustc_error_codes/src/error_codes/E0767.md
index 679fe7e41e9..679fe7e41e9 100644
--- a/src/librustc_error_codes/error_codes/E0767.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0767.md
diff --git a/src/librustc_error_codes/error_codes/E0768.md b/compiler/rustc_error_codes/src/error_codes/E0768.md
index 24169ef512e..24169ef512e 100644
--- a/src/librustc_error_codes/error_codes/E0768.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0768.md
diff --git a/src/librustc_error_codes/error_codes/E0769.md b/compiler/rustc_error_codes/src/error_codes/E0769.md
index d1995be9899..d1995be9899 100644
--- a/src/librustc_error_codes/error_codes/E0769.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0769.md
diff --git a/src/librustc_error_codes/error_codes/E0770.md b/compiler/rustc_error_codes/src/error_codes/E0770.md
index 278bf9b907b..278bf9b907b 100644
--- a/src/librustc_error_codes/error_codes/E0770.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0770.md
diff --git a/src/librustc_error_codes/error_codes/E0771.md b/compiler/rustc_error_codes/src/error_codes/E0771.md
index 824a955f6b3..824a955f6b3 100644
--- a/src/librustc_error_codes/error_codes/E0771.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0771.md
diff --git a/src/librustc_error_codes/lib.rs b/compiler/rustc_error_codes/src/lib.rs
index 4353a294cc3..4353a294cc3 100644
--- a/src/librustc_error_codes/lib.rs
+++ b/compiler/rustc_error_codes/src/lib.rs
diff --git a/src/librustc_errors/Cargo.toml b/compiler/rustc_errors/Cargo.toml
index 7c794bcd98f..e4dbb8db381 100644
--- a/src/librustc_errors/Cargo.toml
+++ b/compiler/rustc_errors/Cargo.toml
@@ -5,16 +5,14 @@ version = "0.0.0"
 edition = "2018"
 
 [lib]
-name = "rustc_errors"
-path = "lib.rs"
 doctest = false
 
 [dependencies]
 tracing = "0.1"
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_span = { path = "../librustc_span" }
-rustc_macros = { path = "../librustc_macros" }
-rustc_data_structures = { path = "../librustc_data_structures" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_span = { path = "../rustc_span" }
+rustc_macros = { path = "../rustc_macros" }
+rustc_data_structures = { path = "../rustc_data_structures" }
 unicode-width = "0.1.4"
 atty = "0.2"
 termcolor = "1.0"
diff --git a/src/librustc_errors/annotate_snippet_emitter_writer.rs b/compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs
index 265ba59cccb..265ba59cccb 100644
--- a/src/librustc_errors/annotate_snippet_emitter_writer.rs
+++ b/compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs
diff --git a/src/librustc_errors/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs
index 870f7b81e21..870f7b81e21 100644
--- a/src/librustc_errors/diagnostic.rs
+++ b/compiler/rustc_errors/src/diagnostic.rs
diff --git a/src/librustc_errors/diagnostic_builder.rs b/compiler/rustc_errors/src/diagnostic_builder.rs
index d1ff6f721c4..d1ff6f721c4 100644
--- a/src/librustc_errors/diagnostic_builder.rs
+++ b/compiler/rustc_errors/src/diagnostic_builder.rs
diff --git a/src/librustc_errors/emitter.rs b/compiler/rustc_errors/src/emitter.rs
index 5a654e83aed..5a654e83aed 100644
--- a/src/librustc_errors/emitter.rs
+++ b/compiler/rustc_errors/src/emitter.rs
diff --git a/src/librustc_errors/json.rs b/compiler/rustc_errors/src/json.rs
index 750d36d3d89..750d36d3d89 100644
--- a/src/librustc_errors/json.rs
+++ b/compiler/rustc_errors/src/json.rs
diff --git a/src/librustc_errors/json/tests.rs b/compiler/rustc_errors/src/json/tests.rs
index e69e868c8ed..e69e868c8ed 100644
--- a/src/librustc_errors/json/tests.rs
+++ b/compiler/rustc_errors/src/json/tests.rs
diff --git a/src/librustc_errors/lib.rs b/compiler/rustc_errors/src/lib.rs
index d4f0a9d83ef..d4f0a9d83ef 100644
--- a/src/librustc_errors/lib.rs
+++ b/compiler/rustc_errors/src/lib.rs
diff --git a/src/librustc_errors/lock.rs b/compiler/rustc_errors/src/lock.rs
index a73472021d4..a73472021d4 100644
--- a/src/librustc_errors/lock.rs
+++ b/compiler/rustc_errors/src/lock.rs
diff --git a/src/librustc_errors/registry.rs b/compiler/rustc_errors/src/registry.rs
index b1d770d5bd5..b1d770d5bd5 100644
--- a/src/librustc_errors/registry.rs
+++ b/compiler/rustc_errors/src/registry.rs
diff --git a/src/librustc_errors/snippet.rs b/compiler/rustc_errors/src/snippet.rs
index 160bf577799..160bf577799 100644
--- a/src/librustc_errors/snippet.rs
+++ b/compiler/rustc_errors/src/snippet.rs
diff --git a/src/librustc_errors/styled_buffer.rs b/compiler/rustc_errors/src/styled_buffer.rs
index f2d255d7d95..f2d255d7d95 100644
--- a/src/librustc_errors/styled_buffer.rs
+++ b/compiler/rustc_errors/src/styled_buffer.rs
diff --git a/compiler/rustc_expand/Cargo.toml b/compiler/rustc_expand/Cargo.toml
new file mode 100644
index 00000000000..25c2851f6de
--- /dev/null
+++ b/compiler/rustc_expand/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_expand"
+version = "0.0.0"
+edition = "2018"
+build = false
+
+[lib]
+doctest = false
+
+[dependencies]
+rustc_serialize = { path = "../rustc_serialize" }
+tracing = "0.1"
+rustc_span = { path = "../rustc_span" }
+rustc_ast_pretty = { path = "../rustc_ast_pretty" }
+rustc_ast_passes = { path = "../rustc_ast_passes" }
+rustc_attr = { path = "../rustc_attr" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_feature = { path = "../rustc_feature" }
+rustc_macros = { path = "../rustc_macros" }
+rustc_lexer = { path = "../rustc_lexer" }
+rustc_parse = { path = "../rustc_parse" }
+rustc_session = { path = "../rustc_session" }
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+rustc_ast = { path = "../rustc_ast" }
diff --git a/src/librustc_expand/base.rs b/compiler/rustc_expand/src/base.rs
index 4c01cb8159a..4c01cb8159a 100644
--- a/src/librustc_expand/base.rs
+++ b/compiler/rustc_expand/src/base.rs
diff --git a/src/librustc_expand/build.rs b/compiler/rustc_expand/src/build.rs
index 9490b62aa17..9490b62aa17 100644
--- a/src/librustc_expand/build.rs
+++ b/compiler/rustc_expand/src/build.rs
diff --git a/src/librustc_expand/config.rs b/compiler/rustc_expand/src/config.rs
index afd1e606402..afd1e606402 100644
--- a/src/librustc_expand/config.rs
+++ b/compiler/rustc_expand/src/config.rs
diff --git a/src/librustc_expand/expand.rs b/compiler/rustc_expand/src/expand.rs
index 7a21caf255a..7a21caf255a 100644
--- a/src/librustc_expand/expand.rs
+++ b/compiler/rustc_expand/src/expand.rs
diff --git a/src/librustc_expand/lib.rs b/compiler/rustc_expand/src/lib.rs
index 7f631cb71af..7f631cb71af 100644
--- a/src/librustc_expand/lib.rs
+++ b/compiler/rustc_expand/src/lib.rs
diff --git a/src/librustc_expand/mbe.rs b/compiler/rustc_expand/src/mbe.rs
index 9aed307ec93..9aed307ec93 100644
--- a/src/librustc_expand/mbe.rs
+++ b/compiler/rustc_expand/src/mbe.rs
diff --git a/src/librustc_expand/mbe/macro_check.rs b/compiler/rustc_expand/src/mbe/macro_check.rs
index 6b419dae3f6..6b419dae3f6 100644
--- a/src/librustc_expand/mbe/macro_check.rs
+++ b/compiler/rustc_expand/src/mbe/macro_check.rs
diff --git a/src/librustc_expand/mbe/macro_parser.rs b/compiler/rustc_expand/src/mbe/macro_parser.rs
index 92a8f231126..92a8f231126 100644
--- a/src/librustc_expand/mbe/macro_parser.rs
+++ b/compiler/rustc_expand/src/mbe/macro_parser.rs
diff --git a/src/librustc_expand/mbe/macro_rules.rs b/compiler/rustc_expand/src/mbe/macro_rules.rs
index f0e6fe39a3c..f0e6fe39a3c 100644
--- a/src/librustc_expand/mbe/macro_rules.rs
+++ b/compiler/rustc_expand/src/mbe/macro_rules.rs
diff --git a/src/librustc_expand/mbe/quoted.rs b/compiler/rustc_expand/src/mbe/quoted.rs
index 48db532c78f..48db532c78f 100644
--- a/src/librustc_expand/mbe/quoted.rs
+++ b/compiler/rustc_expand/src/mbe/quoted.rs
diff --git a/src/librustc_expand/mbe/transcribe.rs b/compiler/rustc_expand/src/mbe/transcribe.rs
index b908a12c1fc..b908a12c1fc 100644
--- a/src/librustc_expand/mbe/transcribe.rs
+++ b/compiler/rustc_expand/src/mbe/transcribe.rs
diff --git a/src/librustc_expand/module.rs b/compiler/rustc_expand/src/module.rs
index 1e123a2e145..1e123a2e145 100644
--- a/src/librustc_expand/module.rs
+++ b/compiler/rustc_expand/src/module.rs
diff --git a/src/librustc_expand/mut_visit/tests.rs b/compiler/rustc_expand/src/mut_visit/tests.rs
index 38ff594b6e9..38ff594b6e9 100644
--- a/src/librustc_expand/mut_visit/tests.rs
+++ b/compiler/rustc_expand/src/mut_visit/tests.rs
diff --git a/src/librustc_expand/parse/lexer/tests.rs b/compiler/rustc_expand/src/parse/lexer/tests.rs
index 87184444283..87184444283 100644
--- a/src/librustc_expand/parse/lexer/tests.rs
+++ b/compiler/rustc_expand/src/parse/lexer/tests.rs
diff --git a/src/librustc_expand/parse/tests.rs b/compiler/rustc_expand/src/parse/tests.rs
index 643305f153c..643305f153c 100644
--- a/src/librustc_expand/parse/tests.rs
+++ b/compiler/rustc_expand/src/parse/tests.rs
diff --git a/src/librustc_expand/placeholders.rs b/compiler/rustc_expand/src/placeholders.rs
index 29fb4c95ec6..29fb4c95ec6 100644
--- a/src/librustc_expand/placeholders.rs
+++ b/compiler/rustc_expand/src/placeholders.rs
diff --git a/src/librustc_expand/proc_macro.rs b/compiler/rustc_expand/src/proc_macro.rs
index 4e865c20d6f..4e865c20d6f 100644
--- a/src/librustc_expand/proc_macro.rs
+++ b/compiler/rustc_expand/src/proc_macro.rs
diff --git a/src/librustc_expand/proc_macro_server.rs b/compiler/rustc_expand/src/proc_macro_server.rs
index 409784812f5..409784812f5 100644
--- a/src/librustc_expand/proc_macro_server.rs
+++ b/compiler/rustc_expand/src/proc_macro_server.rs
diff --git a/src/librustc_expand/tests.rs b/compiler/rustc_expand/src/tests.rs
index 6993ce58fa6..6993ce58fa6 100644
--- a/src/librustc_expand/tests.rs
+++ b/compiler/rustc_expand/src/tests.rs
diff --git a/src/librustc_expand/tokenstream/tests.rs b/compiler/rustc_expand/src/tokenstream/tests.rs
index 4e818e9feb0..4e818e9feb0 100644
--- a/src/librustc_expand/tokenstream/tests.rs
+++ b/compiler/rustc_expand/src/tokenstream/tests.rs
diff --git a/src/librustc_feature/Cargo.toml b/compiler/rustc_feature/Cargo.toml
index 96fd15ef304..3f8047e931e 100644
--- a/src/librustc_feature/Cargo.toml
+++ b/compiler/rustc_feature/Cargo.toml
@@ -5,11 +5,9 @@ version = "0.0.0"
 edition = "2018"
 
 [lib]
-name = "rustc_feature"
-path = "lib.rs"
 doctest = false
 
 [dependencies]
-rustc_data_structures = { path = "../librustc_data_structures" }
+rustc_data_structures = { path = "../rustc_data_structures" }
 lazy_static = "1.0.0"
-rustc_span = { path = "../librustc_span" }
+rustc_span = { path = "../rustc_span" }
diff --git a/src/librustc_feature/accepted.rs b/compiler/rustc_feature/src/accepted.rs
index d16f023c00a..d16f023c00a 100644
--- a/src/librustc_feature/accepted.rs
+++ b/compiler/rustc_feature/src/accepted.rs
diff --git a/src/librustc_feature/active.rs b/compiler/rustc_feature/src/active.rs
index e858980738d..e858980738d 100644
--- a/src/librustc_feature/active.rs
+++ b/compiler/rustc_feature/src/active.rs
diff --git a/src/librustc_feature/builtin_attrs.rs b/compiler/rustc_feature/src/builtin_attrs.rs
index 879f06f89a7..879f06f89a7 100644
--- a/src/librustc_feature/builtin_attrs.rs
+++ b/compiler/rustc_feature/src/builtin_attrs.rs
diff --git a/src/librustc_feature/lib.rs b/compiler/rustc_feature/src/lib.rs
index f8bf0315d0c..f8bf0315d0c 100644
--- a/src/librustc_feature/lib.rs
+++ b/compiler/rustc_feature/src/lib.rs
diff --git a/src/librustc_feature/removed.rs b/compiler/rustc_feature/src/removed.rs
index 8d410894e8b..8d410894e8b 100644
--- a/src/librustc_feature/removed.rs
+++ b/compiler/rustc_feature/src/removed.rs
diff --git a/src/librustc_fs_util/Cargo.toml b/compiler/rustc_fs_util/Cargo.toml
index e74e3809927..e4414c788a7 100644
--- a/src/librustc_fs_util/Cargo.toml
+++ b/compiler/rustc_fs_util/Cargo.toml
@@ -3,9 +3,3 @@ authors = ["The Rust Project Developers"]
 name = "rustc_fs_util"
 version = "0.0.0"
 edition = "2018"
-
-[lib]
-name = "rustc_fs_util"
-path = "lib.rs"
-
-[dependencies]
diff --git a/src/librustc_fs_util/lib.rs b/compiler/rustc_fs_util/src/lib.rs
index 289b9f30c3b..289b9f30c3b 100644
--- a/src/librustc_fs_util/lib.rs
+++ b/compiler/rustc_fs_util/src/lib.rs
diff --git a/src/librustc_graphviz/Cargo.toml b/compiler/rustc_graphviz/Cargo.toml
index 9a5e78a560c..d07b75a5c8f 100644
--- a/src/librustc_graphviz/Cargo.toml
+++ b/compiler/rustc_graphviz/Cargo.toml
@@ -3,7 +3,3 @@ authors = ["The Rust Project Developers"]
 name = "rustc_graphviz"
 version = "0.0.0"
 edition = "2018"
-
-[lib]
-name = "rustc_graphviz"
-path = "lib.rs"
diff --git a/src/librustc_graphviz/lib.rs b/compiler/rustc_graphviz/src/lib.rs
index 4339092b63e..4339092b63e 100644
--- a/src/librustc_graphviz/lib.rs
+++ b/compiler/rustc_graphviz/src/lib.rs
diff --git a/src/librustc_graphviz/tests.rs b/compiler/rustc_graphviz/src/tests.rs
index 055e13156ae..055e13156ae 100644
--- a/src/librustc_graphviz/tests.rs
+++ b/compiler/rustc_graphviz/src/tests.rs
diff --git a/compiler/rustc_hir/Cargo.toml b/compiler/rustc_hir/Cargo.toml
new file mode 100644
index 00000000000..ed295ff0058
--- /dev/null
+++ b/compiler/rustc_hir/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_hir"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+rustc_target = { path = "../rustc_target" }
+rustc_macros = { path = "../rustc_macros" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_index = { path = "../rustc_index" }
+rustc_span = { path = "../rustc_span" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_ast = { path = "../rustc_ast" }
+lazy_static = "1"
+tracing = "0.1"
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_hir/arena.rs b/compiler/rustc_hir/src/arena.rs
index 85ab7906d25..85ab7906d25 100644
--- a/src/librustc_hir/arena.rs
+++ b/compiler/rustc_hir/src/arena.rs
diff --git a/src/librustc_hir/def.rs b/compiler/rustc_hir/src/def.rs
index 0d61dc037c6..0d61dc037c6 100644
--- a/src/librustc_hir/def.rs
+++ b/compiler/rustc_hir/src/def.rs
diff --git a/src/librustc_hir/definitions.rs b/compiler/rustc_hir/src/definitions.rs
index 45735ead256..45735ead256 100644
--- a/src/librustc_hir/definitions.rs
+++ b/compiler/rustc_hir/src/definitions.rs
diff --git a/src/librustc_hir/hir.rs b/compiler/rustc_hir/src/hir.rs
index cd4185226dc..cd4185226dc 100644
--- a/src/librustc_hir/hir.rs
+++ b/compiler/rustc_hir/src/hir.rs
diff --git a/src/librustc_hir/hir_id.rs b/compiler/rustc_hir/src/hir_id.rs
index fea850c12d9..fea850c12d9 100644
--- a/src/librustc_hir/hir_id.rs
+++ b/compiler/rustc_hir/src/hir_id.rs
diff --git a/src/librustc_hir/intravisit.rs b/compiler/rustc_hir/src/intravisit.rs
index 76cf6bd4776..76cf6bd4776 100644
--- a/src/librustc_hir/intravisit.rs
+++ b/compiler/rustc_hir/src/intravisit.rs
diff --git a/src/librustc_hir/itemlikevisit.rs b/compiler/rustc_hir/src/itemlikevisit.rs
index 369cd49621b..369cd49621b 100644
--- a/src/librustc_hir/itemlikevisit.rs
+++ b/compiler/rustc_hir/src/itemlikevisit.rs
diff --git a/src/librustc_hir/lang_items.rs b/compiler/rustc_hir/src/lang_items.rs
index acf6847c014..acf6847c014 100644
--- a/src/librustc_hir/lang_items.rs
+++ b/compiler/rustc_hir/src/lang_items.rs
diff --git a/src/librustc_hir/lib.rs b/compiler/rustc_hir/src/lib.rs
index 19ea1de5683..19ea1de5683 100644
--- a/src/librustc_hir/lib.rs
+++ b/compiler/rustc_hir/src/lib.rs
diff --git a/src/librustc_hir/pat_util.rs b/compiler/rustc_hir/src/pat_util.rs
index 2f1b5da8e13..2f1b5da8e13 100644
--- a/src/librustc_hir/pat_util.rs
+++ b/compiler/rustc_hir/src/pat_util.rs
diff --git a/src/librustc_hir/stable_hash_impls.rs b/compiler/rustc_hir/src/stable_hash_impls.rs
index 1d3f44a0899..1d3f44a0899 100644
--- a/src/librustc_hir/stable_hash_impls.rs
+++ b/compiler/rustc_hir/src/stable_hash_impls.rs
diff --git a/src/librustc_hir/target.rs b/compiler/rustc_hir/src/target.rs
index 1efc8bc3124..1efc8bc3124 100644
--- a/src/librustc_hir/target.rs
+++ b/compiler/rustc_hir/src/target.rs
diff --git a/src/librustc_hir/weak_lang_items.rs b/compiler/rustc_hir/src/weak_lang_items.rs
index 129eec7d29e..129eec7d29e 100644
--- a/src/librustc_hir/weak_lang_items.rs
+++ b/compiler/rustc_hir/src/weak_lang_items.rs
diff --git a/compiler/rustc_hir_pretty/Cargo.toml b/compiler/rustc_hir_pretty/Cargo.toml
new file mode 100644
index 00000000000..1f7643e9fb4
--- /dev/null
+++ b/compiler/rustc_hir_pretty/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_hir_pretty"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+rustc_ast_pretty = { path = "../rustc_ast_pretty" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_target = { path = "../rustc_target" }
+rustc_span = { path = "../rustc_span" }
+rustc_ast = { path = "../rustc_ast" }
diff --git a/src/librustc_hir_pretty/lib.rs b/compiler/rustc_hir_pretty/src/lib.rs
index f6e4b1fb418..f6e4b1fb418 100644
--- a/src/librustc_hir_pretty/lib.rs
+++ b/compiler/rustc_hir_pretty/src/lib.rs
diff --git a/compiler/rustc_incremental/Cargo.toml b/compiler/rustc_incremental/Cargo.toml
new file mode 100644
index 00000000000..049e5b8b722
--- /dev/null
+++ b/compiler/rustc_incremental/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_incremental"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+rustc_graphviz = { path = "../rustc_graphviz" }
+tracing = "0.1"
+rand = "0.7"
+rustc_middle = { path = "../rustc_middle" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_ast = { path = "../rustc_ast" }
+rustc_macros = { path = "../rustc_macros" }
+rustc_span = { path = "../rustc_span" }
+rustc_fs_util = { path = "../rustc_fs_util" }
+rustc_session = { path = "../rustc_session" }
diff --git a/src/librustc_incremental/assert_dep_graph.rs b/compiler/rustc_incremental/src/assert_dep_graph.rs
index e17396422f1..e17396422f1 100644
--- a/src/librustc_incremental/assert_dep_graph.rs
+++ b/compiler/rustc_incremental/src/assert_dep_graph.rs
diff --git a/src/librustc_incremental/assert_module_sources.rs b/compiler/rustc_incremental/src/assert_module_sources.rs
index 80448c01a26..80448c01a26 100644
--- a/src/librustc_incremental/assert_module_sources.rs
+++ b/compiler/rustc_incremental/src/assert_module_sources.rs
diff --git a/src/librustc_incremental/lib.rs b/compiler/rustc_incremental/src/lib.rs
index ad189138054..ad189138054 100644
--- a/src/librustc_incremental/lib.rs
+++ b/compiler/rustc_incremental/src/lib.rs
diff --git a/src/librustc_incremental/persist/README.md b/compiler/rustc_incremental/src/persist/README.md
index b01fe219e1e..b01fe219e1e 100644
--- a/src/librustc_incremental/persist/README.md
+++ b/compiler/rustc_incremental/src/persist/README.md
diff --git a/src/librustc_incremental/persist/data.rs b/compiler/rustc_incremental/src/persist/data.rs
index 81e5410978d..81e5410978d 100644
--- a/src/librustc_incremental/persist/data.rs
+++ b/compiler/rustc_incremental/src/persist/data.rs
diff --git a/src/librustc_incremental/persist/dirty_clean.rs b/compiler/rustc_incremental/src/persist/dirty_clean.rs
index f0a10885550..f0a10885550 100644
--- a/src/librustc_incremental/persist/dirty_clean.rs
+++ b/compiler/rustc_incremental/src/persist/dirty_clean.rs
diff --git a/src/librustc_incremental/persist/file_format.rs b/compiler/rustc_incremental/src/persist/file_format.rs
index 048a81b81ba..048a81b81ba 100644
--- a/src/librustc_incremental/persist/file_format.rs
+++ b/compiler/rustc_incremental/src/persist/file_format.rs
diff --git a/src/librustc_incremental/persist/fs.rs b/compiler/rustc_incremental/src/persist/fs.rs
index 4926f726f35..4926f726f35 100644
--- a/src/librustc_incremental/persist/fs.rs
+++ b/compiler/rustc_incremental/src/persist/fs.rs
diff --git a/src/librustc_incremental/persist/fs/tests.rs b/compiler/rustc_incremental/src/persist/fs/tests.rs
index 652ef6bcdce..652ef6bcdce 100644
--- a/src/librustc_incremental/persist/fs/tests.rs
+++ b/compiler/rustc_incremental/src/persist/fs/tests.rs
diff --git a/src/librustc_incremental/persist/load.rs b/compiler/rustc_incremental/src/persist/load.rs
index 966faa9639d..966faa9639d 100644
--- a/src/librustc_incremental/persist/load.rs
+++ b/compiler/rustc_incremental/src/persist/load.rs
diff --git a/src/librustc_incremental/persist/mod.rs b/compiler/rustc_incremental/src/persist/mod.rs
index 7bc3b47e15a..7bc3b47e15a 100644
--- a/src/librustc_incremental/persist/mod.rs
+++ b/compiler/rustc_incremental/src/persist/mod.rs
diff --git a/src/librustc_incremental/persist/save.rs b/compiler/rustc_incremental/src/persist/save.rs
index c43d4ad4049..c43d4ad4049 100644
--- a/src/librustc_incremental/persist/save.rs
+++ b/compiler/rustc_incremental/src/persist/save.rs
diff --git a/src/librustc_incremental/persist/work_product.rs b/compiler/rustc_incremental/src/persist/work_product.rs
index 19d64bda56d..19d64bda56d 100644
--- a/src/librustc_incremental/persist/work_product.rs
+++ b/compiler/rustc_incremental/src/persist/work_product.rs
diff --git a/src/librustc_index/Cargo.toml b/compiler/rustc_index/Cargo.toml
index 8aaf1cb9cbc..6ac7c06ee83 100644
--- a/src/librustc_index/Cargo.toml
+++ b/compiler/rustc_index/Cargo.toml
@@ -5,11 +5,9 @@ version = "0.0.0"
 edition = "2018"
 
 [lib]
-name = "rustc_index"
-path = "lib.rs"
 doctest = false
 
 [dependencies]
 arrayvec = "0.5.1"
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_macros = { path = "../librustc_macros" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_macros = { path = "../rustc_macros" }
diff --git a/src/librustc_index/bit_set.rs b/compiler/rustc_index/src/bit_set.rs
index c43d1a6830d..c43d1a6830d 100644
--- a/src/librustc_index/bit_set.rs
+++ b/compiler/rustc_index/src/bit_set.rs
diff --git a/src/librustc_index/bit_set/tests.rs b/compiler/rustc_index/src/bit_set/tests.rs
index 6cc3e9427d1..6cc3e9427d1 100644
--- a/src/librustc_index/bit_set/tests.rs
+++ b/compiler/rustc_index/src/bit_set/tests.rs
diff --git a/src/librustc_index/lib.rs b/compiler/rustc_index/src/lib.rs
index 7ee881b0639..7ee881b0639 100644
--- a/src/librustc_index/lib.rs
+++ b/compiler/rustc_index/src/lib.rs
diff --git a/src/librustc_index/vec.rs b/compiler/rustc_index/src/vec.rs
index 2420f82c041..2420f82c041 100644
--- a/src/librustc_index/vec.rs
+++ b/compiler/rustc_index/src/vec.rs
diff --git a/src/librustc_index/vec/tests.rs b/compiler/rustc_index/src/vec/tests.rs
index 15c43c72c7b..15c43c72c7b 100644
--- a/src/librustc_index/vec/tests.rs
+++ b/compiler/rustc_index/src/vec/tests.rs
diff --git a/compiler/rustc_infer/Cargo.toml b/compiler/rustc_infer/Cargo.toml
new file mode 100644
index 00000000000..5dba4106c94
--- /dev/null
+++ b/compiler/rustc_infer/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_infer"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+rustc_graphviz = { path = "../rustc_graphviz" }
+tracing = "0.1"
+rustc_middle = { path = "../rustc_middle" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_index = { path = "../rustc_index" }
+rustc_macros = { path = "../rustc_macros" }
+rustc_session = { path = "../rustc_session" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_span = { path = "../rustc_span" }
+rustc_target = { path = "../rustc_target" }
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+rustc_ast = { path = "../rustc_ast" }
diff --git a/src/librustc_infer/infer/at.rs b/compiler/rustc_infer/src/infer/at.rs
index a7749d33b7c..a7749d33b7c 100644
--- a/src/librustc_infer/infer/at.rs
+++ b/compiler/rustc_infer/src/infer/at.rs
diff --git a/src/librustc_infer/infer/canonical/canonicalizer.rs b/compiler/rustc_infer/src/infer/canonical/canonicalizer.rs
index ea32a1ae5a5..ea32a1ae5a5 100644
--- a/src/librustc_infer/infer/canonical/canonicalizer.rs
+++ b/compiler/rustc_infer/src/infer/canonical/canonicalizer.rs
diff --git a/src/librustc_infer/infer/canonical/mod.rs b/compiler/rustc_infer/src/infer/canonical/mod.rs
index 2b8c46f1de4..2b8c46f1de4 100644
--- a/src/librustc_infer/infer/canonical/mod.rs
+++ b/compiler/rustc_infer/src/infer/canonical/mod.rs
diff --git a/src/librustc_infer/infer/canonical/query_response.rs b/compiler/rustc_infer/src/infer/canonical/query_response.rs
index 0dbebac7e36..0dbebac7e36 100644
--- a/src/librustc_infer/infer/canonical/query_response.rs
+++ b/compiler/rustc_infer/src/infer/canonical/query_response.rs
diff --git a/src/librustc_infer/infer/canonical/substitute.rs b/compiler/rustc_infer/src/infer/canonical/substitute.rs
index 65791f6fc65..65791f6fc65 100644
--- a/src/librustc_infer/infer/canonical/substitute.rs
+++ b/compiler/rustc_infer/src/infer/canonical/substitute.rs
diff --git a/src/librustc_infer/infer/combine.rs b/compiler/rustc_infer/src/infer/combine.rs
index 3a54a647530..3a54a647530 100644
--- a/src/librustc_infer/infer/combine.rs
+++ b/compiler/rustc_infer/src/infer/combine.rs
diff --git a/src/librustc_infer/infer/equate.rs b/compiler/rustc_infer/src/infer/equate.rs
index 7de752d1de0..7de752d1de0 100644
--- a/src/librustc_infer/infer/equate.rs
+++ b/compiler/rustc_infer/src/infer/equate.rs
diff --git a/src/librustc_infer/infer/error_reporting/mod.rs b/compiler/rustc_infer/src/infer/error_reporting/mod.rs
index d72ed72e3a8..d72ed72e3a8 100644
--- a/src/librustc_infer/infer/error_reporting/mod.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/mod.rs
diff --git a/src/librustc_infer/infer/error_reporting/need_type_info.rs b/compiler/rustc_infer/src/infer/error_reporting/need_type_info.rs
index bf087dfacfa..bf087dfacfa 100644
--- a/src/librustc_infer/infer/error_reporting/need_type_info.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/need_type_info.rs
diff --git a/src/librustc_infer/infer/error_reporting/nice_region_error/different_lifetimes.rs b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/different_lifetimes.rs
index 7ab18e54f7e..7ab18e54f7e 100644
--- a/src/librustc_infer/infer/error_reporting/nice_region_error/different_lifetimes.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/different_lifetimes.rs
diff --git a/src/librustc_infer/infer/error_reporting/nice_region_error/find_anon_type.rs b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/find_anon_type.rs
index eb1521f0565..eb1521f0565 100644
--- a/src/librustc_infer/infer/error_reporting/nice_region_error/find_anon_type.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/find_anon_type.rs
diff --git a/src/librustc_infer/infer/error_reporting/nice_region_error/mod.rs b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/mod.rs
index cc8f1816bc3..cc8f1816bc3 100644
--- a/src/librustc_infer/infer/error_reporting/nice_region_error/mod.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/mod.rs
diff --git a/src/librustc_infer/infer/error_reporting/nice_region_error/named_anon_conflict.rs b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/named_anon_conflict.rs
index 89142edb2dc..89142edb2dc 100644
--- a/src/librustc_infer/infer/error_reporting/nice_region_error/named_anon_conflict.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/named_anon_conflict.rs
diff --git a/src/librustc_infer/infer/error_reporting/nice_region_error/placeholder_error.rs b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs
index 2187064ec5e..2187064ec5e 100644
--- a/src/librustc_infer/infer/error_reporting/nice_region_error/placeholder_error.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs
diff --git a/src/librustc_infer/infer/error_reporting/nice_region_error/static_impl_trait.rs b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/static_impl_trait.rs
index 7493b8b0a9f..7493b8b0a9f 100644
--- a/src/librustc_infer/infer/error_reporting/nice_region_error/static_impl_trait.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/static_impl_trait.rs
diff --git a/src/librustc_infer/infer/error_reporting/nice_region_error/trait_impl_difference.rs b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/trait_impl_difference.rs
index 788eabf296d..788eabf296d 100644
--- a/src/librustc_infer/infer/error_reporting/nice_region_error/trait_impl_difference.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/trait_impl_difference.rs
diff --git a/src/librustc_infer/infer/error_reporting/nice_region_error/util.rs b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/util.rs
index 6e2d49f1ad7..6e2d49f1ad7 100644
--- a/src/librustc_infer/infer/error_reporting/nice_region_error/util.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/nice_region_error/util.rs
diff --git a/src/librustc_infer/infer/error_reporting/note.rs b/compiler/rustc_infer/src/infer/error_reporting/note.rs
index 9ac27030ade..9ac27030ade 100644
--- a/src/librustc_infer/infer/error_reporting/note.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/note.rs
diff --git a/src/librustc_infer/infer/free_regions.rs b/compiler/rustc_infer/src/infer/free_regions.rs
index ffe5fb172be..ffe5fb172be 100644
--- a/src/librustc_infer/infer/free_regions.rs
+++ b/compiler/rustc_infer/src/infer/free_regions.rs
diff --git a/src/librustc_infer/infer/freshen.rs b/compiler/rustc_infer/src/infer/freshen.rs
index 02bebe10ed0..02bebe10ed0 100644
--- a/src/librustc_infer/infer/freshen.rs
+++ b/compiler/rustc_infer/src/infer/freshen.rs
diff --git a/src/librustc_infer/infer/fudge.rs b/compiler/rustc_infer/src/infer/fudge.rs
index c6651108df5..c6651108df5 100644
--- a/src/librustc_infer/infer/fudge.rs
+++ b/compiler/rustc_infer/src/infer/fudge.rs
diff --git a/src/librustc_infer/infer/glb.rs b/compiler/rustc_infer/src/infer/glb.rs
index ccba904df9e..ccba904df9e 100644
--- a/src/librustc_infer/infer/glb.rs
+++ b/compiler/rustc_infer/src/infer/glb.rs
diff --git a/src/librustc_infer/infer/higher_ranked/README.md b/compiler/rustc_infer/src/infer/higher_ranked/README.md
index 533d0ef7e6c..533d0ef7e6c 100644
--- a/src/librustc_infer/infer/higher_ranked/README.md
+++ b/compiler/rustc_infer/src/infer/higher_ranked/README.md
diff --git a/src/librustc_infer/infer/higher_ranked/mod.rs b/compiler/rustc_infer/src/infer/higher_ranked/mod.rs
index ea19dff7db1..ea19dff7db1 100644
--- a/src/librustc_infer/infer/higher_ranked/mod.rs
+++ b/compiler/rustc_infer/src/infer/higher_ranked/mod.rs
diff --git a/src/librustc_infer/infer/lattice.rs b/compiler/rustc_infer/src/infer/lattice.rs
index 1bf43e74dcd..1bf43e74dcd 100644
--- a/src/librustc_infer/infer/lattice.rs
+++ b/compiler/rustc_infer/src/infer/lattice.rs
diff --git a/src/librustc_infer/infer/lexical_region_resolve/README.md b/compiler/rustc_infer/src/infer/lexical_region_resolve/README.md
index e0b2c0bffee..e0b2c0bffee 100644
--- a/src/librustc_infer/infer/lexical_region_resolve/README.md
+++ b/compiler/rustc_infer/src/infer/lexical_region_resolve/README.md
diff --git a/src/librustc_infer/infer/lexical_region_resolve/mod.rs b/compiler/rustc_infer/src/infer/lexical_region_resolve/mod.rs
index fcf1949933b..fcf1949933b 100644
--- a/src/librustc_infer/infer/lexical_region_resolve/mod.rs
+++ b/compiler/rustc_infer/src/infer/lexical_region_resolve/mod.rs
diff --git a/src/librustc_infer/infer/lub.rs b/compiler/rustc_infer/src/infer/lub.rs
index 3e2ea3d0f8f..3e2ea3d0f8f 100644
--- a/src/librustc_infer/infer/lub.rs
+++ b/compiler/rustc_infer/src/infer/lub.rs
diff --git a/src/librustc_infer/infer/mod.rs b/compiler/rustc_infer/src/infer/mod.rs
index 3744ad5d032..3744ad5d032 100644
--- a/src/librustc_infer/infer/mod.rs
+++ b/compiler/rustc_infer/src/infer/mod.rs
diff --git a/src/librustc_infer/infer/nll_relate/mod.rs b/compiler/rustc_infer/src/infer/nll_relate/mod.rs
index 3f5ed36035c..3f5ed36035c 100644
--- a/src/librustc_infer/infer/nll_relate/mod.rs
+++ b/compiler/rustc_infer/src/infer/nll_relate/mod.rs
diff --git a/src/librustc_infer/infer/outlives/env.rs b/compiler/rustc_infer/src/infer/outlives/env.rs
index 1a9e20e79fe..1a9e20e79fe 100644
--- a/src/librustc_infer/infer/outlives/env.rs
+++ b/compiler/rustc_infer/src/infer/outlives/env.rs
diff --git a/src/librustc_infer/infer/outlives/mod.rs b/compiler/rustc_infer/src/infer/outlives/mod.rs
index a1e7f1fa3e5..a1e7f1fa3e5 100644
--- a/src/librustc_infer/infer/outlives/mod.rs
+++ b/compiler/rustc_infer/src/infer/outlives/mod.rs
diff --git a/src/librustc_infer/infer/outlives/obligations.rs b/compiler/rustc_infer/src/infer/outlives/obligations.rs
index 48f6d937f2f..48f6d937f2f 100644
--- a/src/librustc_infer/infer/outlives/obligations.rs
+++ b/compiler/rustc_infer/src/infer/outlives/obligations.rs
diff --git a/src/librustc_infer/infer/outlives/verify.rs b/compiler/rustc_infer/src/infer/outlives/verify.rs
index 8f20b5743df..8f20b5743df 100644
--- a/src/librustc_infer/infer/outlives/verify.rs
+++ b/compiler/rustc_infer/src/infer/outlives/verify.rs
diff --git a/src/librustc_infer/infer/region_constraints/README.md b/compiler/rustc_infer/src/infer/region_constraints/README.md
index 0231dd06677..0231dd06677 100644
--- a/src/librustc_infer/infer/region_constraints/README.md
+++ b/compiler/rustc_infer/src/infer/region_constraints/README.md
diff --git a/src/librustc_infer/infer/region_constraints/leak_check.rs b/compiler/rustc_infer/src/infer/region_constraints/leak_check.rs
index 2d4c1e5d050..2d4c1e5d050 100644
--- a/src/librustc_infer/infer/region_constraints/leak_check.rs
+++ b/compiler/rustc_infer/src/infer/region_constraints/leak_check.rs
diff --git a/src/librustc_infer/infer/region_constraints/mod.rs b/compiler/rustc_infer/src/infer/region_constraints/mod.rs
index 2902c41a6bc..2902c41a6bc 100644
--- a/src/librustc_infer/infer/region_constraints/mod.rs
+++ b/compiler/rustc_infer/src/infer/region_constraints/mod.rs
diff --git a/src/librustc_infer/infer/resolve.rs b/compiler/rustc_infer/src/infer/resolve.rs
index 74f365ced23..74f365ced23 100644
--- a/src/librustc_infer/infer/resolve.rs
+++ b/compiler/rustc_infer/src/infer/resolve.rs
diff --git a/src/librustc_infer/infer/sub.rs b/compiler/rustc_infer/src/infer/sub.rs
index 308f884f9a6..308f884f9a6 100644
--- a/src/librustc_infer/infer/sub.rs
+++ b/compiler/rustc_infer/src/infer/sub.rs
diff --git a/src/librustc_infer/infer/type_variable.rs b/compiler/rustc_infer/src/infer/type_variable.rs
index 53c7dcc6377..53c7dcc6377 100644
--- a/src/librustc_infer/infer/type_variable.rs
+++ b/compiler/rustc_infer/src/infer/type_variable.rs
diff --git a/src/librustc_infer/infer/undo_log.rs b/compiler/rustc_infer/src/infer/undo_log.rs
index 2cfd6bb904c..2cfd6bb904c 100644
--- a/src/librustc_infer/infer/undo_log.rs
+++ b/compiler/rustc_infer/src/infer/undo_log.rs
diff --git a/src/librustc_infer/lib.rs b/compiler/rustc_infer/src/lib.rs
index e05041d8846..e05041d8846 100644
--- a/src/librustc_infer/lib.rs
+++ b/compiler/rustc_infer/src/lib.rs
diff --git a/src/librustc_infer/traits/engine.rs b/compiler/rustc_infer/src/traits/engine.rs
index 2710debea94..2710debea94 100644
--- a/src/librustc_infer/traits/engine.rs
+++ b/compiler/rustc_infer/src/traits/engine.rs
diff --git a/src/librustc_infer/traits/error_reporting/mod.rs b/compiler/rustc_infer/src/traits/error_reporting/mod.rs
index f873358ff9f..f873358ff9f 100644
--- a/src/librustc_infer/traits/error_reporting/mod.rs
+++ b/compiler/rustc_infer/src/traits/error_reporting/mod.rs
diff --git a/src/librustc_infer/traits/mod.rs b/compiler/rustc_infer/src/traits/mod.rs
index 7e7c8588ffb..7e7c8588ffb 100644
--- a/src/librustc_infer/traits/mod.rs
+++ b/compiler/rustc_infer/src/traits/mod.rs
diff --git a/src/librustc_infer/traits/project.rs b/compiler/rustc_infer/src/traits/project.rs
index 65284bcee91..65284bcee91 100644
--- a/src/librustc_infer/traits/project.rs
+++ b/compiler/rustc_infer/src/traits/project.rs
diff --git a/src/librustc_infer/traits/structural_impls.rs b/compiler/rustc_infer/src/traits/structural_impls.rs
index c48e58c0482..c48e58c0482 100644
--- a/src/librustc_infer/traits/structural_impls.rs
+++ b/compiler/rustc_infer/src/traits/structural_impls.rs
diff --git a/src/librustc_infer/traits/util.rs b/compiler/rustc_infer/src/traits/util.rs
index 93fc7f1f3b8..93fc7f1f3b8 100644
--- a/src/librustc_infer/traits/util.rs
+++ b/compiler/rustc_infer/src/traits/util.rs
diff --git a/compiler/rustc_interface/Cargo.toml b/compiler/rustc_interface/Cargo.toml
new file mode 100644
index 00000000000..9affe4ec6d8
--- /dev/null
+++ b/compiler/rustc_interface/Cargo.toml
@@ -0,0 +1,55 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_interface"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+libc = "0.2"
+tracing = "0.1"
+rayon = { version = "0.3.0", package = "rustc-rayon" }
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+rustc_ast = { path = "../rustc_ast" }
+rustc_attr = { path = "../rustc_attr" }
+rustc_builtin_macros = { path = "../rustc_builtin_macros" }
+rustc_expand = { path = "../rustc_expand" }
+rustc_parse = { path = "../rustc_parse" }
+rustc_session = { path = "../rustc_session" }
+rustc_span = { path = "../rustc_span" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_middle = { path = "../rustc_middle" }
+rustc_ast_lowering = { path = "../rustc_ast_lowering" }
+rustc_ast_passes = { path = "../rustc_ast_passes" }
+rustc_incremental = { path = "../rustc_incremental" }
+rustc_traits = { path = "../rustc_traits" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
+rustc_symbol_mangling = { path = "../rustc_symbol_mangling" }
+rustc_codegen_llvm = { path = "../rustc_codegen_llvm", optional = true }
+rustc_hir = { path = "../rustc_hir" }
+rustc_metadata = { path = "../rustc_metadata" }
+rustc_mir = { path = "../rustc_mir" }
+rustc_mir_build = { path = "../rustc_mir_build" }
+rustc_passes = { path = "../rustc_passes" }
+rustc_typeck = { path = "../rustc_typeck" }
+rustc_lint = { path = "../rustc_lint" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_plugin_impl = { path = "../rustc_plugin_impl" }
+rustc_privacy = { path = "../rustc_privacy" }
+rustc_resolve = { path = "../rustc_resolve" }
+rustc_trait_selection = { path = "../rustc_trait_selection" }
+rustc_ty = { path = "../rustc_ty" }
+tempfile = "3.0.5"
+once_cell = "1"
+
+[target.'cfg(windows)'.dependencies]
+winapi = { version = "0.3", features = ["libloaderapi"] }
+
+[dev-dependencies]
+rustc_target = { path = "../rustc_target" }
+
+[features]
+llvm = ['rustc_codegen_llvm']
diff --git a/src/librustc_interface/callbacks.rs b/compiler/rustc_interface/src/callbacks.rs
index 7fa1a3eb0f5..7fa1a3eb0f5 100644
--- a/src/librustc_interface/callbacks.rs
+++ b/compiler/rustc_interface/src/callbacks.rs
diff --git a/src/librustc_interface/interface.rs b/compiler/rustc_interface/src/interface.rs
index 4d84462c42b..4d84462c42b 100644
--- a/src/librustc_interface/interface.rs
+++ b/compiler/rustc_interface/src/interface.rs
diff --git a/src/librustc_interface/lib.rs b/compiler/rustc_interface/src/lib.rs
index fe40c615f79..fe40c615f79 100644
--- a/src/librustc_interface/lib.rs
+++ b/compiler/rustc_interface/src/lib.rs
diff --git a/src/librustc_interface/passes.rs b/compiler/rustc_interface/src/passes.rs
index 403aea8b304..403aea8b304 100644
--- a/src/librustc_interface/passes.rs
+++ b/compiler/rustc_interface/src/passes.rs
diff --git a/src/librustc_interface/proc_macro_decls.rs b/compiler/rustc_interface/src/proc_macro_decls.rs
index d56115fd6ac..d56115fd6ac 100644
--- a/src/librustc_interface/proc_macro_decls.rs
+++ b/compiler/rustc_interface/src/proc_macro_decls.rs
diff --git a/src/librustc_interface/queries.rs b/compiler/rustc_interface/src/queries.rs
index 8b82217a91a..8b82217a91a 100644
--- a/src/librustc_interface/queries.rs
+++ b/compiler/rustc_interface/src/queries.rs
diff --git a/src/librustc_interface/tests.rs b/compiler/rustc_interface/src/tests.rs
index e94745519a4..e94745519a4 100644
--- a/src/librustc_interface/tests.rs
+++ b/compiler/rustc_interface/src/tests.rs
diff --git a/src/librustc_interface/util.rs b/compiler/rustc_interface/src/util.rs
index 8816ba198cf..8816ba198cf 100644
--- a/src/librustc_interface/util.rs
+++ b/compiler/rustc_interface/src/util.rs
diff --git a/src/librustc_lexer/Cargo.toml b/compiler/rustc_lexer/Cargo.toml
index 28b56f6fef4..28b56f6fef4 100644
--- a/src/librustc_lexer/Cargo.toml
+++ b/compiler/rustc_lexer/Cargo.toml
diff --git a/src/librustc_lexer/src/cursor.rs b/compiler/rustc_lexer/src/cursor.rs
index c0045d3f79b..c0045d3f79b 100644
--- a/src/librustc_lexer/src/cursor.rs
+++ b/compiler/rustc_lexer/src/cursor.rs
diff --git a/src/librustc_lexer/src/lib.rs b/compiler/rustc_lexer/src/lib.rs
index b7d6194cd77..b7d6194cd77 100644
--- a/src/librustc_lexer/src/lib.rs
+++ b/compiler/rustc_lexer/src/lib.rs
diff --git a/src/librustc_lexer/src/tests.rs b/compiler/rustc_lexer/src/tests.rs
index a1ea5ceb1f6..a1ea5ceb1f6 100644
--- a/src/librustc_lexer/src/tests.rs
+++ b/compiler/rustc_lexer/src/tests.rs
diff --git a/src/librustc_lexer/src/unescape.rs b/compiler/rustc_lexer/src/unescape.rs
index 697d25fdb58..697d25fdb58 100644
--- a/src/librustc_lexer/src/unescape.rs
+++ b/compiler/rustc_lexer/src/unescape.rs
diff --git a/src/librustc_lexer/src/unescape/tests.rs b/compiler/rustc_lexer/src/unescape/tests.rs
index f2b751a78f2..f2b751a78f2 100644
--- a/src/librustc_lexer/src/unescape/tests.rs
+++ b/compiler/rustc_lexer/src/unescape/tests.rs
diff --git a/compiler/rustc_lint/Cargo.toml b/compiler/rustc_lint/Cargo.toml
new file mode 100644
index 00000000000..760a8e385d6
--- /dev/null
+++ b/compiler/rustc_lint/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_lint"
+version = "0.0.0"
+edition = "2018"
+
+[dependencies]
+tracing = "0.1"
+unicode-security = "0.0.5"
+rustc_middle = { path = "../rustc_middle" }
+rustc_ast_pretty = { path = "../rustc_ast_pretty" }
+rustc_attr = { path = "../rustc_attr" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_target = { path = "../rustc_target" }
+rustc_ast = { path = "../rustc_ast" }
+rustc_span = { path = "../rustc_span" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_feature = { path = "../rustc_feature" }
+rustc_index = { path = "../rustc_index" }
+rustc_session = { path = "../rustc_session" }
+rustc_trait_selection = { path = "../rustc_trait_selection" }
diff --git a/src/librustc_lint/array_into_iter.rs b/compiler/rustc_lint/src/array_into_iter.rs
index 9d74ad3b2f5..9d74ad3b2f5 100644
--- a/src/librustc_lint/array_into_iter.rs
+++ b/compiler/rustc_lint/src/array_into_iter.rs
diff --git a/src/librustc_lint/builtin.rs b/compiler/rustc_lint/src/builtin.rs
index ea624b9ed30..ea624b9ed30 100644
--- a/src/librustc_lint/builtin.rs
+++ b/compiler/rustc_lint/src/builtin.rs
diff --git a/src/librustc_lint/context.rs b/compiler/rustc_lint/src/context.rs
index a6784ffffcd..a6784ffffcd 100644
--- a/src/librustc_lint/context.rs
+++ b/compiler/rustc_lint/src/context.rs
diff --git a/src/librustc_lint/early.rs b/compiler/rustc_lint/src/early.rs
index 998676d44d2..998676d44d2 100644
--- a/src/librustc_lint/early.rs
+++ b/compiler/rustc_lint/src/early.rs
diff --git a/src/librustc_lint/internal.rs b/compiler/rustc_lint/src/internal.rs
index 100e555f299..100e555f299 100644
--- a/src/librustc_lint/internal.rs
+++ b/compiler/rustc_lint/src/internal.rs
diff --git a/src/librustc_lint/late.rs b/compiler/rustc_lint/src/late.rs
index a6c04fb0b4c..a6c04fb0b4c 100644
--- a/src/librustc_lint/late.rs
+++ b/compiler/rustc_lint/src/late.rs
diff --git a/src/librustc_lint/levels.rs b/compiler/rustc_lint/src/levels.rs
index 48254dcee82..48254dcee82 100644
--- a/src/librustc_lint/levels.rs
+++ b/compiler/rustc_lint/src/levels.rs
diff --git a/src/librustc_lint/lib.rs b/compiler/rustc_lint/src/lib.rs
index 0a14b16e274..0a14b16e274 100644
--- a/src/librustc_lint/lib.rs
+++ b/compiler/rustc_lint/src/lib.rs
diff --git a/src/librustc_lint/non_ascii_idents.rs b/compiler/rustc_lint/src/non_ascii_idents.rs
index 2f0b2a8d680..2f0b2a8d680 100644
--- a/src/librustc_lint/non_ascii_idents.rs
+++ b/compiler/rustc_lint/src/non_ascii_idents.rs
diff --git a/src/librustc_lint/nonstandard_style.rs b/compiler/rustc_lint/src/nonstandard_style.rs
index f23e8c5e208..f23e8c5e208 100644
--- a/src/librustc_lint/nonstandard_style.rs
+++ b/compiler/rustc_lint/src/nonstandard_style.rs
diff --git a/src/librustc_lint/nonstandard_style/tests.rs b/compiler/rustc_lint/src/nonstandard_style/tests.rs
index 39c525b8623..39c525b8623 100644
--- a/src/librustc_lint/nonstandard_style/tests.rs
+++ b/compiler/rustc_lint/src/nonstandard_style/tests.rs
diff --git a/src/librustc_lint/passes.rs b/compiler/rustc_lint/src/passes.rs
index 159286c13a4..159286c13a4 100644
--- a/src/librustc_lint/passes.rs
+++ b/compiler/rustc_lint/src/passes.rs
diff --git a/src/librustc_lint/redundant_semicolon.rs b/compiler/rustc_lint/src/redundant_semicolon.rs
index d4aa4968f25..d4aa4968f25 100644
--- a/src/librustc_lint/redundant_semicolon.rs
+++ b/compiler/rustc_lint/src/redundant_semicolon.rs
diff --git a/src/librustc_lint/types.rs b/compiler/rustc_lint/src/types.rs
index 35c462c24c8..35c462c24c8 100644
--- a/src/librustc_lint/types.rs
+++ b/compiler/rustc_lint/src/types.rs
diff --git a/src/librustc_lint/unused.rs b/compiler/rustc_lint/src/unused.rs
index c793e81ebe3..c793e81ebe3 100644
--- a/src/librustc_lint/unused.rs
+++ b/compiler/rustc_lint/src/unused.rs
diff --git a/src/librustc_macros/Cargo.toml b/compiler/rustc_macros/Cargo.toml
index 73eb0dd56d7..73eb0dd56d7 100644
--- a/src/librustc_macros/Cargo.toml
+++ b/compiler/rustc_macros/Cargo.toml
diff --git a/src/librustc_macros/src/hash_stable.rs b/compiler/rustc_macros/src/hash_stable.rs
index c955c137782..c955c137782 100644
--- a/src/librustc_macros/src/hash_stable.rs
+++ b/compiler/rustc_macros/src/hash_stable.rs
diff --git a/src/librustc_macros/src/lib.rs b/compiler/rustc_macros/src/lib.rs
index 7fb3b0e7ea6..7fb3b0e7ea6 100644
--- a/src/librustc_macros/src/lib.rs
+++ b/compiler/rustc_macros/src/lib.rs
diff --git a/src/librustc_macros/src/lift.rs b/compiler/rustc_macros/src/lift.rs
index 4bf4ce00a4d..4bf4ce00a4d 100644
--- a/src/librustc_macros/src/lift.rs
+++ b/compiler/rustc_macros/src/lift.rs
diff --git a/src/librustc_macros/src/query.rs b/compiler/rustc_macros/src/query.rs
index c17d5311e8f..c17d5311e8f 100644
--- a/src/librustc_macros/src/query.rs
+++ b/compiler/rustc_macros/src/query.rs
diff --git a/src/librustc_macros/src/serialize.rs b/compiler/rustc_macros/src/serialize.rs
index dbeb3c75504..dbeb3c75504 100644
--- a/src/librustc_macros/src/serialize.rs
+++ b/compiler/rustc_macros/src/serialize.rs
diff --git a/src/librustc_macros/src/symbols.rs b/compiler/rustc_macros/src/symbols.rs
index 352665f0ab1..352665f0ab1 100644
--- a/src/librustc_macros/src/symbols.rs
+++ b/compiler/rustc_macros/src/symbols.rs
diff --git a/src/librustc_macros/src/type_foldable.rs b/compiler/rustc_macros/src/type_foldable.rs
index 6931e6552ad..6931e6552ad 100644
--- a/src/librustc_macros/src/type_foldable.rs
+++ b/compiler/rustc_macros/src/type_foldable.rs
diff --git a/compiler/rustc_metadata/Cargo.toml b/compiler/rustc_metadata/Cargo.toml
new file mode 100644
index 00000000000..4b144f94ea7
--- /dev/null
+++ b/compiler/rustc_metadata/Cargo.toml
@@ -0,0 +1,33 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_metadata"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+libc = "0.2"
+snap = "1"
+tracing = "0.1"
+memmap = "0.7"
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+rustc_middle = { path = "../rustc_middle" }
+rustc_attr = { path = "../rustc_attr" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_hir_pretty = { path = "../rustc_hir_pretty" }
+rustc_target = { path = "../rustc_target" }
+rustc_index = { path = "../rustc_index" }
+rustc_macros = { path = "../rustc_macros" }
+rustc_serialize = { path = "../rustc_serialize" }
+stable_deref_trait = "1.0.0"
+rustc_ast = { path = "../rustc_ast" }
+rustc_expand = { path = "../rustc_expand" }
+rustc_span = { path = "../rustc_span" }
+rustc_session = { path = "../rustc_session" }
+
+[target.'cfg(windows)'.dependencies]
+winapi = { version = "0.3", features = ["errhandlingapi", "libloaderapi"] }
diff --git a/src/librustc_metadata/creader.rs b/compiler/rustc_metadata/src/creader.rs
index 7562da6d782..7562da6d782 100644
--- a/src/librustc_metadata/creader.rs
+++ b/compiler/rustc_metadata/src/creader.rs
diff --git a/src/librustc_metadata/dependency_format.rs b/compiler/rustc_metadata/src/dependency_format.rs
index f7454da90a3..f7454da90a3 100644
--- a/src/librustc_metadata/dependency_format.rs
+++ b/compiler/rustc_metadata/src/dependency_format.rs
diff --git a/src/librustc_metadata/dynamic_lib.rs b/compiler/rustc_metadata/src/dynamic_lib.rs
index bdb53e3f75a..bdb53e3f75a 100644
--- a/src/librustc_metadata/dynamic_lib.rs
+++ b/compiler/rustc_metadata/src/dynamic_lib.rs
diff --git a/src/librustc_metadata/dynamic_lib/tests.rs b/compiler/rustc_metadata/src/dynamic_lib/tests.rs
index 7090bbf61c7..7090bbf61c7 100644
--- a/src/librustc_metadata/dynamic_lib/tests.rs
+++ b/compiler/rustc_metadata/src/dynamic_lib/tests.rs
diff --git a/src/librustc_metadata/foreign_modules.rs b/compiler/rustc_metadata/src/foreign_modules.rs
index 8675197656a..8675197656a 100644
--- a/src/librustc_metadata/foreign_modules.rs
+++ b/compiler/rustc_metadata/src/foreign_modules.rs
diff --git a/src/librustc_metadata/lib.rs b/compiler/rustc_metadata/src/lib.rs
index 85490f5f6e9..85490f5f6e9 100644
--- a/src/librustc_metadata/lib.rs
+++ b/compiler/rustc_metadata/src/lib.rs
diff --git a/src/librustc_metadata/link_args.rs b/compiler/rustc_metadata/src/link_args.rs
index d8f16796083..d8f16796083 100644
--- a/src/librustc_metadata/link_args.rs
+++ b/compiler/rustc_metadata/src/link_args.rs
diff --git a/src/librustc_metadata/locator.rs b/compiler/rustc_metadata/src/locator.rs
index 0869ec28367..0869ec28367 100644
--- a/src/librustc_metadata/locator.rs
+++ b/compiler/rustc_metadata/src/locator.rs
diff --git a/src/librustc_metadata/native_libs.rs b/compiler/rustc_metadata/src/native_libs.rs
index 3976475cb06..3976475cb06 100644
--- a/src/librustc_metadata/native_libs.rs
+++ b/compiler/rustc_metadata/src/native_libs.rs
diff --git a/src/librustc_metadata/rmeta/decoder.rs b/compiler/rustc_metadata/src/rmeta/decoder.rs
index 43d76e9fdb4..43d76e9fdb4 100644
--- a/src/librustc_metadata/rmeta/decoder.rs
+++ b/compiler/rustc_metadata/src/rmeta/decoder.rs
diff --git a/src/librustc_metadata/rmeta/decoder/cstore_impl.rs b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
index 36ff65fc5eb..36ff65fc5eb 100644
--- a/src/librustc_metadata/rmeta/decoder/cstore_impl.rs
+++ b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
diff --git a/src/librustc_metadata/rmeta/encoder.rs b/compiler/rustc_metadata/src/rmeta/encoder.rs
index 509ef1caf1a..509ef1caf1a 100644
--- a/src/librustc_metadata/rmeta/encoder.rs
+++ b/compiler/rustc_metadata/src/rmeta/encoder.rs
diff --git a/src/librustc_metadata/rmeta/mod.rs b/compiler/rustc_metadata/src/rmeta/mod.rs
index 1ba5962d119..1ba5962d119 100644
--- a/src/librustc_metadata/rmeta/mod.rs
+++ b/compiler/rustc_metadata/src/rmeta/mod.rs
diff --git a/src/librustc_metadata/rmeta/table.rs b/compiler/rustc_metadata/src/rmeta/table.rs
index 03bd4170ea9..03bd4170ea9 100644
--- a/src/librustc_metadata/rmeta/table.rs
+++ b/compiler/rustc_metadata/src/rmeta/table.rs
diff --git a/compiler/rustc_middle/Cargo.toml b/compiler/rustc_middle/Cargo.toml
new file mode 100644
index 00000000000..5a82cbf2997
--- /dev/null
+++ b/compiler/rustc_middle/Cargo.toml
@@ -0,0 +1,33 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_middle"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+rustc_arena = { path = "../rustc_arena" }
+bitflags = "1.2.1"
+tracing = "0.1"
+rustc-rayon-core = "0.3.0"
+polonius-engine = "0.12.0"
+rustc_apfloat = { path = "../rustc_apfloat" }
+rustc_attr = { path = "../rustc_attr" }
+rustc_feature = { path = "../rustc_feature" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_target = { path = "../rustc_target" }
+rustc_macros = { path = "../rustc_macros" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_query_system = { path = "../rustc_query_system" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_index = { path = "../rustc_index" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_ast = { path = "../rustc_ast" }
+rustc_span = { path = "../rustc_span" }
+byteorder = { version = "1.3" }
+chalk-ir = "0.14.0"
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+measureme = "0.7.1"
+rustc_session = { path = "../rustc_session" }
diff --git a/src/librustc_middle/README.md b/compiler/rustc_middle/README.md
index de58f546cd3..de58f546cd3 100644
--- a/src/librustc_middle/README.md
+++ b/compiler/rustc_middle/README.md
diff --git a/src/librustc_middle/benches/lib.rs b/compiler/rustc_middle/benches/lib.rs
index 237751bcbd7..237751bcbd7 100644
--- a/src/librustc_middle/benches/lib.rs
+++ b/compiler/rustc_middle/benches/lib.rs
diff --git a/src/librustc_middle/arena.rs b/compiler/rustc_middle/src/arena.rs
index f6570cc95d2..f6570cc95d2 100644
--- a/src/librustc_middle/arena.rs
+++ b/compiler/rustc_middle/src/arena.rs
diff --git a/src/librustc_middle/dep_graph/dep_node.rs b/compiler/rustc_middle/src/dep_graph/dep_node.rs
index a61b9af9bac..a61b9af9bac 100644
--- a/src/librustc_middle/dep_graph/dep_node.rs
+++ b/compiler/rustc_middle/src/dep_graph/dep_node.rs
diff --git a/src/librustc_middle/dep_graph/mod.rs b/compiler/rustc_middle/src/dep_graph/mod.rs
index 66975242798..66975242798 100644
--- a/src/librustc_middle/dep_graph/mod.rs
+++ b/compiler/rustc_middle/src/dep_graph/mod.rs
diff --git a/src/librustc_middle/hir/exports.rs b/compiler/rustc_middle/src/hir/exports.rs
index be9e38aca65..be9e38aca65 100644
--- a/src/librustc_middle/hir/exports.rs
+++ b/compiler/rustc_middle/src/hir/exports.rs
diff --git a/src/librustc_middle/hir/map/blocks.rs b/compiler/rustc_middle/src/hir/map/blocks.rs
index 6f572a4875f..6f572a4875f 100644
--- a/src/librustc_middle/hir/map/blocks.rs
+++ b/compiler/rustc_middle/src/hir/map/blocks.rs
diff --git a/src/librustc_middle/hir/map/collector.rs b/compiler/rustc_middle/src/hir/map/collector.rs
index dce06a5f7ee..dce06a5f7ee 100644
--- a/src/librustc_middle/hir/map/collector.rs
+++ b/compiler/rustc_middle/src/hir/map/collector.rs
diff --git a/src/librustc_middle/hir/map/mod.rs b/compiler/rustc_middle/src/hir/map/mod.rs
index 1e57411f9c5..1e57411f9c5 100644
--- a/src/librustc_middle/hir/map/mod.rs
+++ b/compiler/rustc_middle/src/hir/map/mod.rs
diff --git a/src/librustc_middle/hir/mod.rs b/compiler/rustc_middle/src/hir/mod.rs
index ae3b30217cc..ae3b30217cc 100644
--- a/src/librustc_middle/hir/mod.rs
+++ b/compiler/rustc_middle/src/hir/mod.rs
diff --git a/src/librustc_middle/hir/place.rs b/compiler/rustc_middle/src/hir/place.rs
index bcb56fae170..bcb56fae170 100644
--- a/src/librustc_middle/hir/place.rs
+++ b/compiler/rustc_middle/src/hir/place.rs
diff --git a/src/librustc_middle/ich/hcx.rs b/compiler/rustc_middle/src/ich/hcx.rs
index 084fe4cfa16..084fe4cfa16 100644
--- a/src/librustc_middle/ich/hcx.rs
+++ b/compiler/rustc_middle/src/ich/hcx.rs
diff --git a/src/librustc_middle/ich/impls_hir.rs b/compiler/rustc_middle/src/ich/impls_hir.rs
index c2d177b69b6..c2d177b69b6 100644
--- a/src/librustc_middle/ich/impls_hir.rs
+++ b/compiler/rustc_middle/src/ich/impls_hir.rs
diff --git a/src/librustc_middle/ich/impls_syntax.rs b/compiler/rustc_middle/src/ich/impls_syntax.rs
index e3d4655831b..e3d4655831b 100644
--- a/src/librustc_middle/ich/impls_syntax.rs
+++ b/compiler/rustc_middle/src/ich/impls_syntax.rs
diff --git a/src/librustc_middle/ich/impls_ty.rs b/compiler/rustc_middle/src/ich/impls_ty.rs
index 8f15c99f951..8f15c99f951 100644
--- a/src/librustc_middle/ich/impls_ty.rs
+++ b/compiler/rustc_middle/src/ich/impls_ty.rs
diff --git a/src/librustc_middle/ich/mod.rs b/compiler/rustc_middle/src/ich/mod.rs
index c8fb2bf39cc..c8fb2bf39cc 100644
--- a/src/librustc_middle/ich/mod.rs
+++ b/compiler/rustc_middle/src/ich/mod.rs
diff --git a/src/librustc_middle/infer/canonical.rs b/compiler/rustc_middle/src/infer/canonical.rs
index 1e15ae49a0c..1e15ae49a0c 100644
--- a/src/librustc_middle/infer/canonical.rs
+++ b/compiler/rustc_middle/src/infer/canonical.rs
diff --git a/src/librustc_middle/infer/mod.rs b/compiler/rustc_middle/src/infer/mod.rs
index 497d3811f28..497d3811f28 100644
--- a/src/librustc_middle/infer/mod.rs
+++ b/compiler/rustc_middle/src/infer/mod.rs
diff --git a/src/librustc_middle/infer/unify_key.rs b/compiler/rustc_middle/src/infer/unify_key.rs
index 2580ac6bebd..2580ac6bebd 100644
--- a/src/librustc_middle/infer/unify_key.rs
+++ b/compiler/rustc_middle/src/infer/unify_key.rs
diff --git a/src/librustc_middle/lib.rs b/compiler/rustc_middle/src/lib.rs
index 1b2dea8a378..1b2dea8a378 100644
--- a/src/librustc_middle/lib.rs
+++ b/compiler/rustc_middle/src/lib.rs
diff --git a/src/librustc_middle/lint.rs b/compiler/rustc_middle/src/lint.rs
index 25e5379881e..25e5379881e 100644
--- a/src/librustc_middle/lint.rs
+++ b/compiler/rustc_middle/src/lint.rs
diff --git a/src/librustc_middle/macros.rs b/compiler/rustc_middle/src/macros.rs
index a5482b7bdcf..a5482b7bdcf 100644
--- a/src/librustc_middle/macros.rs
+++ b/compiler/rustc_middle/src/macros.rs
diff --git a/src/librustc_middle/middle/codegen_fn_attrs.rs b/compiler/rustc_middle/src/middle/codegen_fn_attrs.rs
index 62a6198b9b4..62a6198b9b4 100644
--- a/src/librustc_middle/middle/codegen_fn_attrs.rs
+++ b/compiler/rustc_middle/src/middle/codegen_fn_attrs.rs
diff --git a/src/librustc_middle/middle/cstore.rs b/compiler/rustc_middle/src/middle/cstore.rs
index 1af1d581817..1af1d581817 100644
--- a/src/librustc_middle/middle/cstore.rs
+++ b/compiler/rustc_middle/src/middle/cstore.rs
diff --git a/src/librustc_middle/middle/dependency_format.rs b/compiler/rustc_middle/src/middle/dependency_format.rs
index e079843bfbc..e079843bfbc 100644
--- a/src/librustc_middle/middle/dependency_format.rs
+++ b/compiler/rustc_middle/src/middle/dependency_format.rs
diff --git a/src/librustc_middle/middle/exported_symbols.rs b/compiler/rustc_middle/src/middle/exported_symbols.rs
index 276e45ce99b..276e45ce99b 100644
--- a/src/librustc_middle/middle/exported_symbols.rs
+++ b/compiler/rustc_middle/src/middle/exported_symbols.rs
diff --git a/src/librustc_middle/middle/lang_items.rs b/compiler/rustc_middle/src/middle/lang_items.rs
index 7194a035e89..7194a035e89 100644
--- a/src/librustc_middle/middle/lang_items.rs
+++ b/compiler/rustc_middle/src/middle/lang_items.rs
diff --git a/src/librustc_middle/middle/limits.rs b/compiler/rustc_middle/src/middle/limits.rs
index def9e5ebb52..def9e5ebb52 100644
--- a/src/librustc_middle/middle/limits.rs
+++ b/compiler/rustc_middle/src/middle/limits.rs
diff --git a/src/librustc_middle/middle/mod.rs b/compiler/rustc_middle/src/middle/mod.rs
index 9bc9ca6707a..9bc9ca6707a 100644
--- a/src/librustc_middle/middle/mod.rs
+++ b/compiler/rustc_middle/src/middle/mod.rs
diff --git a/src/librustc_middle/middle/privacy.rs b/compiler/rustc_middle/src/middle/privacy.rs
index 4756e83b5e9..4756e83b5e9 100644
--- a/src/librustc_middle/middle/privacy.rs
+++ b/compiler/rustc_middle/src/middle/privacy.rs
diff --git a/src/librustc_middle/middle/region.rs b/compiler/rustc_middle/src/middle/region.rs
index 4c6ac820604..4c6ac820604 100644
--- a/src/librustc_middle/middle/region.rs
+++ b/compiler/rustc_middle/src/middle/region.rs
diff --git a/src/librustc_middle/middle/resolve_lifetime.rs b/compiler/rustc_middle/src/middle/resolve_lifetime.rs
index 3d0144e9c8a..3d0144e9c8a 100644
--- a/src/librustc_middle/middle/resolve_lifetime.rs
+++ b/compiler/rustc_middle/src/middle/resolve_lifetime.rs
diff --git a/src/librustc_middle/middle/stability.rs b/compiler/rustc_middle/src/middle/stability.rs
index b32eebbb11e..b32eebbb11e 100644
--- a/src/librustc_middle/middle/stability.rs
+++ b/compiler/rustc_middle/src/middle/stability.rs
diff --git a/src/librustc_middle/mir/coverage/mod.rs b/compiler/rustc_middle/src/mir/coverage/mod.rs
index ce311c2ee52..ce311c2ee52 100644
--- a/src/librustc_middle/mir/coverage/mod.rs
+++ b/compiler/rustc_middle/src/mir/coverage/mod.rs
diff --git a/src/librustc_middle/mir/interpret/allocation.rs b/compiler/rustc_middle/src/mir/interpret/allocation.rs
index 505939d56ed..505939d56ed 100644
--- a/src/librustc_middle/mir/interpret/allocation.rs
+++ b/compiler/rustc_middle/src/mir/interpret/allocation.rs
diff --git a/src/librustc_middle/mir/interpret/error.rs b/compiler/rustc_middle/src/mir/interpret/error.rs
index 059925088ce..059925088ce 100644
--- a/src/librustc_middle/mir/interpret/error.rs
+++ b/compiler/rustc_middle/src/mir/interpret/error.rs
diff --git a/src/librustc_middle/mir/interpret/mod.rs b/compiler/rustc_middle/src/mir/interpret/mod.rs
index 0dc3d6e344a..0dc3d6e344a 100644
--- a/src/librustc_middle/mir/interpret/mod.rs
+++ b/compiler/rustc_middle/src/mir/interpret/mod.rs
diff --git a/src/librustc_middle/mir/interpret/pointer.rs b/compiler/rustc_middle/src/mir/interpret/pointer.rs
index e3d5a085613..e3d5a085613 100644
--- a/src/librustc_middle/mir/interpret/pointer.rs
+++ b/compiler/rustc_middle/src/mir/interpret/pointer.rs
diff --git a/src/librustc_middle/mir/interpret/queries.rs b/compiler/rustc_middle/src/mir/interpret/queries.rs
index dcc1f8b1a4b..dcc1f8b1a4b 100644
--- a/src/librustc_middle/mir/interpret/queries.rs
+++ b/compiler/rustc_middle/src/mir/interpret/queries.rs
diff --git a/src/librustc_middle/mir/interpret/value.rs b/compiler/rustc_middle/src/mir/interpret/value.rs
index 7d6ff3eb5c1..7d6ff3eb5c1 100644
--- a/src/librustc_middle/mir/interpret/value.rs
+++ b/compiler/rustc_middle/src/mir/interpret/value.rs
diff --git a/src/librustc_middle/mir/mod.rs b/compiler/rustc_middle/src/mir/mod.rs
index 785a7f0c51a..785a7f0c51a 100644
--- a/src/librustc_middle/mir/mod.rs
+++ b/compiler/rustc_middle/src/mir/mod.rs
diff --git a/src/librustc_middle/mir/mono.rs b/compiler/rustc_middle/src/mir/mono.rs
index 0d5f6619df5..0d5f6619df5 100644
--- a/src/librustc_middle/mir/mono.rs
+++ b/compiler/rustc_middle/src/mir/mono.rs
diff --git a/src/librustc_middle/mir/predecessors.rs b/compiler/rustc_middle/src/mir/predecessors.rs
index b16a1d53fff..b16a1d53fff 100644
--- a/src/librustc_middle/mir/predecessors.rs
+++ b/compiler/rustc_middle/src/mir/predecessors.rs
diff --git a/src/librustc_middle/mir/query.rs b/compiler/rustc_middle/src/mir/query.rs
index 0878e9313d8..0878e9313d8 100644
--- a/src/librustc_middle/mir/query.rs
+++ b/compiler/rustc_middle/src/mir/query.rs
diff --git a/src/librustc_middle/mir/tcx.rs b/compiler/rustc_middle/src/mir/tcx.rs
index efcd41e5c18..efcd41e5c18 100644
--- a/src/librustc_middle/mir/tcx.rs
+++ b/compiler/rustc_middle/src/mir/tcx.rs
diff --git a/src/librustc_middle/mir/terminator/mod.rs b/compiler/rustc_middle/src/mir/terminator/mod.rs
index fcfd648c2b7..fcfd648c2b7 100644
--- a/src/librustc_middle/mir/terminator/mod.rs
+++ b/compiler/rustc_middle/src/mir/terminator/mod.rs
diff --git a/src/librustc_middle/mir/traversal.rs b/compiler/rustc_middle/src/mir/traversal.rs
index 36e277d1a88..36e277d1a88 100644
--- a/src/librustc_middle/mir/traversal.rs
+++ b/compiler/rustc_middle/src/mir/traversal.rs
diff --git a/src/librustc_middle/mir/type_foldable.rs b/compiler/rustc_middle/src/mir/type_foldable.rs
index 6bb6abe0289..6bb6abe0289 100644
--- a/src/librustc_middle/mir/type_foldable.rs
+++ b/compiler/rustc_middle/src/mir/type_foldable.rs
diff --git a/src/librustc_middle/mir/visit.rs b/compiler/rustc_middle/src/mir/visit.rs
index 6515ae31b46..6515ae31b46 100644
--- a/src/librustc_middle/mir/visit.rs
+++ b/compiler/rustc_middle/src/mir/visit.rs
diff --git a/src/librustc_middle/query/mod.rs b/compiler/rustc_middle/src/query/mod.rs
index e05752f08f6..e05752f08f6 100644
--- a/src/librustc_middle/query/mod.rs
+++ b/compiler/rustc_middle/src/query/mod.rs
diff --git a/src/librustc_middle/tests.rs b/compiler/rustc_middle/src/tests.rs
index 757e0bd3bfb..757e0bd3bfb 100644
--- a/src/librustc_middle/tests.rs
+++ b/compiler/rustc_middle/src/tests.rs
diff --git a/src/librustc_middle/traits/chalk.rs b/compiler/rustc_middle/src/traits/chalk.rs
index 405af8cb240..405af8cb240 100644
--- a/src/librustc_middle/traits/chalk.rs
+++ b/compiler/rustc_middle/src/traits/chalk.rs
diff --git a/src/librustc_middle/traits/mod.rs b/compiler/rustc_middle/src/traits/mod.rs
index f86403fa502..f86403fa502 100644
--- a/src/librustc_middle/traits/mod.rs
+++ b/compiler/rustc_middle/src/traits/mod.rs
diff --git a/src/librustc_middle/traits/query.rs b/compiler/rustc_middle/src/traits/query.rs
index 4b7663e9ade..4b7663e9ade 100644
--- a/src/librustc_middle/traits/query.rs
+++ b/compiler/rustc_middle/src/traits/query.rs
diff --git a/src/librustc_middle/traits/select.rs b/compiler/rustc_middle/src/traits/select.rs
index 6ad514c6be2..6ad514c6be2 100644
--- a/src/librustc_middle/traits/select.rs
+++ b/compiler/rustc_middle/src/traits/select.rs
diff --git a/src/librustc_middle/traits/specialization_graph.rs b/compiler/rustc_middle/src/traits/specialization_graph.rs
index 969404c68ca..969404c68ca 100644
--- a/src/librustc_middle/traits/specialization_graph.rs
+++ b/compiler/rustc_middle/src/traits/specialization_graph.rs
diff --git a/src/librustc_middle/traits/structural_impls.rs b/compiler/rustc_middle/src/traits/structural_impls.rs
index d73fc628ceb..d73fc628ceb 100644
--- a/src/librustc_middle/traits/structural_impls.rs
+++ b/compiler/rustc_middle/src/traits/structural_impls.rs
diff --git a/src/librustc_middle/ty/_match.rs b/compiler/rustc_middle/src/ty/_match.rs
index 4693a2f66fb..4693a2f66fb 100644
--- a/src/librustc_middle/ty/_match.rs
+++ b/compiler/rustc_middle/src/ty/_match.rs
diff --git a/src/librustc_middle/ty/adjustment.rs b/compiler/rustc_middle/src/ty/adjustment.rs
index 6a9bb8d6c28..6a9bb8d6c28 100644
--- a/src/librustc_middle/ty/adjustment.rs
+++ b/compiler/rustc_middle/src/ty/adjustment.rs
diff --git a/src/librustc_middle/ty/binding.rs b/compiler/rustc_middle/src/ty/binding.rs
index 3237147c8ba..3237147c8ba 100644
--- a/src/librustc_middle/ty/binding.rs
+++ b/compiler/rustc_middle/src/ty/binding.rs
diff --git a/src/librustc_middle/ty/cast.rs b/compiler/rustc_middle/src/ty/cast.rs
index 79a3008c364..79a3008c364 100644
--- a/src/librustc_middle/ty/cast.rs
+++ b/compiler/rustc_middle/src/ty/cast.rs
diff --git a/src/librustc_middle/ty/codec.rs b/compiler/rustc_middle/src/ty/codec.rs
index 291648869fb..291648869fb 100644
--- a/src/librustc_middle/ty/codec.rs
+++ b/compiler/rustc_middle/src/ty/codec.rs
diff --git a/src/librustc_middle/ty/consts.rs b/compiler/rustc_middle/src/ty/consts.rs
index 64faacc1c0b..64faacc1c0b 100644
--- a/src/librustc_middle/ty/consts.rs
+++ b/compiler/rustc_middle/src/ty/consts.rs
diff --git a/src/librustc_middle/ty/consts/int.rs b/compiler/rustc_middle/src/ty/consts/int.rs
index ced0429deab..ced0429deab 100644
--- a/src/librustc_middle/ty/consts/int.rs
+++ b/compiler/rustc_middle/src/ty/consts/int.rs
diff --git a/src/librustc_middle/ty/consts/kind.rs b/compiler/rustc_middle/src/ty/consts/kind.rs
index ede28522000..ede28522000 100644
--- a/src/librustc_middle/ty/consts/kind.rs
+++ b/compiler/rustc_middle/src/ty/consts/kind.rs
diff --git a/src/librustc_middle/ty/context.rs b/compiler/rustc_middle/src/ty/context.rs
index 18ae744cb1e..18ae744cb1e 100644
--- a/src/librustc_middle/ty/context.rs
+++ b/compiler/rustc_middle/src/ty/context.rs
diff --git a/src/librustc_middle/ty/diagnostics.rs b/compiler/rustc_middle/src/ty/diagnostics.rs
index b22727bdd75..b22727bdd75 100644
--- a/src/librustc_middle/ty/diagnostics.rs
+++ b/compiler/rustc_middle/src/ty/diagnostics.rs
diff --git a/src/librustc_middle/ty/erase_regions.rs b/compiler/rustc_middle/src/ty/erase_regions.rs
index 48d0fc1839e..48d0fc1839e 100644
--- a/src/librustc_middle/ty/erase_regions.rs
+++ b/compiler/rustc_middle/src/ty/erase_regions.rs
diff --git a/src/librustc_middle/ty/error.rs b/compiler/rustc_middle/src/ty/error.rs
index 1963881626e..1963881626e 100644
--- a/src/librustc_middle/ty/error.rs
+++ b/compiler/rustc_middle/src/ty/error.rs
diff --git a/src/librustc_middle/ty/fast_reject.rs b/compiler/rustc_middle/src/ty/fast_reject.rs
index 1bee2d60f75..1bee2d60f75 100644
--- a/src/librustc_middle/ty/fast_reject.rs
+++ b/compiler/rustc_middle/src/ty/fast_reject.rs
diff --git a/src/librustc_middle/ty/flags.rs b/compiler/rustc_middle/src/ty/flags.rs
index 27f50c240db..27f50c240db 100644
--- a/src/librustc_middle/ty/flags.rs
+++ b/compiler/rustc_middle/src/ty/flags.rs
diff --git a/src/librustc_middle/ty/fold.rs b/compiler/rustc_middle/src/ty/fold.rs
index 492f8ce9ef1..492f8ce9ef1 100644
--- a/src/librustc_middle/ty/fold.rs
+++ b/compiler/rustc_middle/src/ty/fold.rs
diff --git a/src/librustc_middle/ty/inhabitedness/def_id_forest.rs b/compiler/rustc_middle/src/ty/inhabitedness/def_id_forest.rs
index ee6b06a1cc8..ee6b06a1cc8 100644
--- a/src/librustc_middle/ty/inhabitedness/def_id_forest.rs
+++ b/compiler/rustc_middle/src/ty/inhabitedness/def_id_forest.rs
diff --git a/src/librustc_middle/ty/inhabitedness/mod.rs b/compiler/rustc_middle/src/ty/inhabitedness/mod.rs
index d1b5eed921b..d1b5eed921b 100644
--- a/src/librustc_middle/ty/inhabitedness/mod.rs
+++ b/compiler/rustc_middle/src/ty/inhabitedness/mod.rs
diff --git a/src/librustc_middle/ty/instance.rs b/compiler/rustc_middle/src/ty/instance.rs
index 8e08fe4b87b..8e08fe4b87b 100644
--- a/src/librustc_middle/ty/instance.rs
+++ b/compiler/rustc_middle/src/ty/instance.rs
diff --git a/src/librustc_middle/ty/layout.rs b/compiler/rustc_middle/src/ty/layout.rs
index 08bd131565b..08bd131565b 100644
--- a/src/librustc_middle/ty/layout.rs
+++ b/compiler/rustc_middle/src/ty/layout.rs
diff --git a/src/librustc_middle/ty/list.rs b/compiler/rustc_middle/src/ty/list.rs
index 83a2bdf90f9..83a2bdf90f9 100644
--- a/src/librustc_middle/ty/list.rs
+++ b/compiler/rustc_middle/src/ty/list.rs
diff --git a/src/librustc_middle/ty/mod.rs b/compiler/rustc_middle/src/ty/mod.rs
index b6300a40b0d..b6300a40b0d 100644
--- a/src/librustc_middle/ty/mod.rs
+++ b/compiler/rustc_middle/src/ty/mod.rs
diff --git a/src/librustc_middle/ty/normalize_erasing_regions.rs b/compiler/rustc_middle/src/ty/normalize_erasing_regions.rs
index 48a62b64604..48a62b64604 100644
--- a/src/librustc_middle/ty/normalize_erasing_regions.rs
+++ b/compiler/rustc_middle/src/ty/normalize_erasing_regions.rs
diff --git a/src/librustc_middle/ty/outlives.rs b/compiler/rustc_middle/src/ty/outlives.rs
index 1a8693b8df7..1a8693b8df7 100644
--- a/src/librustc_middle/ty/outlives.rs
+++ b/compiler/rustc_middle/src/ty/outlives.rs
diff --git a/src/librustc_middle/ty/print/mod.rs b/compiler/rustc_middle/src/ty/print/mod.rs
index 6c8f23c139f..6c8f23c139f 100644
--- a/src/librustc_middle/ty/print/mod.rs
+++ b/compiler/rustc_middle/src/ty/print/mod.rs
diff --git a/src/librustc_middle/ty/print/obsolete.rs b/compiler/rustc_middle/src/ty/print/obsolete.rs
index 2ea7cd2a6dc..2ea7cd2a6dc 100644
--- a/src/librustc_middle/ty/print/obsolete.rs
+++ b/compiler/rustc_middle/src/ty/print/obsolete.rs
diff --git a/src/librustc_middle/ty/print/pretty.rs b/compiler/rustc_middle/src/ty/print/pretty.rs
index 999a1d52a26..999a1d52a26 100644
--- a/src/librustc_middle/ty/print/pretty.rs
+++ b/compiler/rustc_middle/src/ty/print/pretty.rs
diff --git a/src/librustc_middle/ty/query/README.md b/compiler/rustc_middle/src/ty/query/README.md
index 8ec07b9fdeb..8ec07b9fdeb 100644
--- a/src/librustc_middle/ty/query/README.md
+++ b/compiler/rustc_middle/src/ty/query/README.md
diff --git a/src/librustc_middle/ty/query/job.rs b/compiler/rustc_middle/src/ty/query/job.rs
index bd2e7747b7d..bd2e7747b7d 100644
--- a/src/librustc_middle/ty/query/job.rs
+++ b/compiler/rustc_middle/src/ty/query/job.rs
diff --git a/src/librustc_middle/ty/query/keys.rs b/compiler/rustc_middle/src/ty/query/keys.rs
index 3f7a20bba2b..3f7a20bba2b 100644
--- a/src/librustc_middle/ty/query/keys.rs
+++ b/compiler/rustc_middle/src/ty/query/keys.rs
diff --git a/src/librustc_middle/ty/query/mod.rs b/compiler/rustc_middle/src/ty/query/mod.rs
index ee9b203b151..ee9b203b151 100644
--- a/src/librustc_middle/ty/query/mod.rs
+++ b/compiler/rustc_middle/src/ty/query/mod.rs
diff --git a/src/librustc_middle/ty/query/on_disk_cache.rs b/compiler/rustc_middle/src/ty/query/on_disk_cache.rs
index dcfb8d31430..dcfb8d31430 100644
--- a/src/librustc_middle/ty/query/on_disk_cache.rs
+++ b/compiler/rustc_middle/src/ty/query/on_disk_cache.rs
diff --git a/src/librustc_middle/ty/query/plumbing.rs b/compiler/rustc_middle/src/ty/query/plumbing.rs
index f3fa3634026..f3fa3634026 100644
--- a/src/librustc_middle/ty/query/plumbing.rs
+++ b/compiler/rustc_middle/src/ty/query/plumbing.rs
diff --git a/src/librustc_middle/ty/query/profiling_support.rs b/compiler/rustc_middle/src/ty/query/profiling_support.rs
index 9b1837356e3..9b1837356e3 100644
--- a/src/librustc_middle/ty/query/profiling_support.rs
+++ b/compiler/rustc_middle/src/ty/query/profiling_support.rs
diff --git a/src/librustc_middle/ty/query/stats.rs b/compiler/rustc_middle/src/ty/query/stats.rs
index b496bf839ab..b496bf839ab 100644
--- a/src/librustc_middle/ty/query/stats.rs
+++ b/compiler/rustc_middle/src/ty/query/stats.rs
diff --git a/src/librustc_middle/ty/query/values.rs b/compiler/rustc_middle/src/ty/query/values.rs
index f28b0f499f0..f28b0f499f0 100644
--- a/src/librustc_middle/ty/query/values.rs
+++ b/compiler/rustc_middle/src/ty/query/values.rs
diff --git a/src/librustc_middle/ty/relate.rs b/compiler/rustc_middle/src/ty/relate.rs
index ae2820b460f..ae2820b460f 100644
--- a/src/librustc_middle/ty/relate.rs
+++ b/compiler/rustc_middle/src/ty/relate.rs
diff --git a/src/librustc_middle/ty/steal.rs b/compiler/rustc_middle/src/ty/steal.rs
index 224e76845d7..224e76845d7 100644
--- a/src/librustc_middle/ty/steal.rs
+++ b/compiler/rustc_middle/src/ty/steal.rs
diff --git a/src/librustc_middle/ty/structural_impls.rs b/compiler/rustc_middle/src/ty/structural_impls.rs
index 605e3545dea..605e3545dea 100644
--- a/src/librustc_middle/ty/structural_impls.rs
+++ b/compiler/rustc_middle/src/ty/structural_impls.rs
diff --git a/src/librustc_middle/ty/sty.rs b/compiler/rustc_middle/src/ty/sty.rs
index c1f354c7a15..c1f354c7a15 100644
--- a/src/librustc_middle/ty/sty.rs
+++ b/compiler/rustc_middle/src/ty/sty.rs
diff --git a/src/librustc_middle/ty/subst.rs b/compiler/rustc_middle/src/ty/subst.rs
index acd58ab7f96..acd58ab7f96 100644
--- a/src/librustc_middle/ty/subst.rs
+++ b/compiler/rustc_middle/src/ty/subst.rs
diff --git a/src/librustc_middle/ty/trait_def.rs b/compiler/rustc_middle/src/ty/trait_def.rs
index 86fe3ac3751..86fe3ac3751 100644
--- a/src/librustc_middle/ty/trait_def.rs
+++ b/compiler/rustc_middle/src/ty/trait_def.rs
diff --git a/src/librustc_middle/ty/util.rs b/compiler/rustc_middle/src/ty/util.rs
index 63d4dcca080..63d4dcca080 100644
--- a/src/librustc_middle/ty/util.rs
+++ b/compiler/rustc_middle/src/ty/util.rs
diff --git a/src/librustc_middle/ty/walk.rs b/compiler/rustc_middle/src/ty/walk.rs
index 82c649b8f54..82c649b8f54 100644
--- a/src/librustc_middle/ty/walk.rs
+++ b/compiler/rustc_middle/src/ty/walk.rs
diff --git a/src/librustc_middle/util/bug.rs b/compiler/rustc_middle/src/util/bug.rs
index 0903ef50898..0903ef50898 100644
--- a/src/librustc_middle/util/bug.rs
+++ b/compiler/rustc_middle/src/util/bug.rs
diff --git a/src/librustc_middle/util/common.rs b/compiler/rustc_middle/src/util/common.rs
index 1e09702bf27..1e09702bf27 100644
--- a/src/librustc_middle/util/common.rs
+++ b/compiler/rustc_middle/src/util/common.rs
diff --git a/src/librustc_middle/util/common/tests.rs b/compiler/rustc_middle/src/util/common/tests.rs
index 9a9fb203c62..9a9fb203c62 100644
--- a/src/librustc_middle/util/common/tests.rs
+++ b/compiler/rustc_middle/src/util/common/tests.rs
diff --git a/compiler/rustc_mir/Cargo.toml b/compiler/rustc_mir/Cargo.toml
new file mode 100644
index 00000000000..6b0412ece7a
--- /dev/null
+++ b/compiler/rustc_mir/Cargo.toml
@@ -0,0 +1,33 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_mir"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+either = "1.5.0"
+rustc_graphviz = { path = "../rustc_graphviz" }
+itertools = "0.8"
+tracing = "0.1"
+log_settings = "0.1.1"
+polonius-engine = "0.12.0"
+rustc_middle = { path = "../rustc_middle" }
+rustc_attr = { path = "../rustc_attr" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_index = { path = "../rustc_index" }
+rustc_infer = { path = "../rustc_infer" }
+rustc_lexer = { path = "../rustc_lexer" }
+rustc_macros = { path = "../rustc_macros" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_session = { path = "../rustc_session" }
+rustc_target = { path = "../rustc_target" }
+rustc_trait_selection = { path = "../rustc_trait_selection" }
+rustc_ast = { path = "../rustc_ast" }
+rustc_span = { path = "../rustc_span" }
+rustc_apfloat = { path = "../rustc_apfloat" }
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_mir/borrow_check/borrow_set.rs b/compiler/rustc_mir/src/borrow_check/borrow_set.rs
index b4299fbc5a1..b4299fbc5a1 100644
--- a/src/librustc_mir/borrow_check/borrow_set.rs
+++ b/compiler/rustc_mir/src/borrow_check/borrow_set.rs
diff --git a/src/librustc_mir/borrow_check/constraint_generation.rs b/compiler/rustc_mir/src/borrow_check/constraint_generation.rs
index 33b09dcb888..33b09dcb888 100644
--- a/src/librustc_mir/borrow_check/constraint_generation.rs
+++ b/compiler/rustc_mir/src/borrow_check/constraint_generation.rs
diff --git a/src/librustc_mir/borrow_check/constraints/graph.rs b/compiler/rustc_mir/src/borrow_check/constraints/graph.rs
index f3f6b8c10da..f3f6b8c10da 100644
--- a/src/librustc_mir/borrow_check/constraints/graph.rs
+++ b/compiler/rustc_mir/src/borrow_check/constraints/graph.rs
diff --git a/src/librustc_mir/borrow_check/constraints/mod.rs b/compiler/rustc_mir/src/borrow_check/constraints/mod.rs
index 3772b7d8f98..3772b7d8f98 100644
--- a/src/librustc_mir/borrow_check/constraints/mod.rs
+++ b/compiler/rustc_mir/src/borrow_check/constraints/mod.rs
diff --git a/src/librustc_mir/borrow_check/def_use.rs b/compiler/rustc_mir/src/borrow_check/def_use.rs
index 6574e584406..6574e584406 100644
--- a/src/librustc_mir/borrow_check/def_use.rs
+++ b/compiler/rustc_mir/src/borrow_check/def_use.rs
diff --git a/src/librustc_mir/borrow_check/diagnostics/conflict_errors.rs b/compiler/rustc_mir/src/borrow_check/diagnostics/conflict_errors.rs
index 9076dbccb52..9076dbccb52 100644
--- a/src/librustc_mir/borrow_check/diagnostics/conflict_errors.rs
+++ b/compiler/rustc_mir/src/borrow_check/diagnostics/conflict_errors.rs
diff --git a/src/librustc_mir/borrow_check/diagnostics/explain_borrow.rs b/compiler/rustc_mir/src/borrow_check/diagnostics/explain_borrow.rs
index b591b938b5a..b591b938b5a 100644
--- a/src/librustc_mir/borrow_check/diagnostics/explain_borrow.rs
+++ b/compiler/rustc_mir/src/borrow_check/diagnostics/explain_borrow.rs
diff --git a/src/librustc_mir/borrow_check/diagnostics/find_use.rs b/compiler/rustc_mir/src/borrow_check/diagnostics/find_use.rs
index 8d8cdfb5293..8d8cdfb5293 100644
--- a/src/librustc_mir/borrow_check/diagnostics/find_use.rs
+++ b/compiler/rustc_mir/src/borrow_check/diagnostics/find_use.rs
diff --git a/src/librustc_mir/borrow_check/diagnostics/mod.rs b/compiler/rustc_mir/src/borrow_check/diagnostics/mod.rs
index dfaa75d9f23..dfaa75d9f23 100644
--- a/src/librustc_mir/borrow_check/diagnostics/mod.rs
+++ b/compiler/rustc_mir/src/borrow_check/diagnostics/mod.rs
diff --git a/src/librustc_mir/borrow_check/diagnostics/move_errors.rs b/compiler/rustc_mir/src/borrow_check/diagnostics/move_errors.rs
index 1c8da212f10..1c8da212f10 100644
--- a/src/librustc_mir/borrow_check/diagnostics/move_errors.rs
+++ b/compiler/rustc_mir/src/borrow_check/diagnostics/move_errors.rs
diff --git a/src/librustc_mir/borrow_check/diagnostics/mutability_errors.rs b/compiler/rustc_mir/src/borrow_check/diagnostics/mutability_errors.rs
index d26436ff1de..d26436ff1de 100644
--- a/src/librustc_mir/borrow_check/diagnostics/mutability_errors.rs
+++ b/compiler/rustc_mir/src/borrow_check/diagnostics/mutability_errors.rs
diff --git a/src/librustc_mir/borrow_check/diagnostics/outlives_suggestion.rs b/compiler/rustc_mir/src/borrow_check/diagnostics/outlives_suggestion.rs
index a775fa59c1b..a775fa59c1b 100644
--- a/src/librustc_mir/borrow_check/diagnostics/outlives_suggestion.rs
+++ b/compiler/rustc_mir/src/borrow_check/diagnostics/outlives_suggestion.rs
diff --git a/src/librustc_mir/borrow_check/diagnostics/region_errors.rs b/compiler/rustc_mir/src/borrow_check/diagnostics/region_errors.rs
index a0d99ac33c0..a0d99ac33c0 100644
--- a/src/librustc_mir/borrow_check/diagnostics/region_errors.rs
+++ b/compiler/rustc_mir/src/borrow_check/diagnostics/region_errors.rs
diff --git a/src/librustc_mir/borrow_check/diagnostics/region_name.rs b/compiler/rustc_mir/src/borrow_check/diagnostics/region_name.rs
index 2603b1e048d..2603b1e048d 100644
--- a/src/librustc_mir/borrow_check/diagnostics/region_name.rs
+++ b/compiler/rustc_mir/src/borrow_check/diagnostics/region_name.rs
diff --git a/src/librustc_mir/borrow_check/diagnostics/var_name.rs b/compiler/rustc_mir/src/borrow_check/diagnostics/var_name.rs
index a850b85e9bb..a850b85e9bb 100644
--- a/src/librustc_mir/borrow_check/diagnostics/var_name.rs
+++ b/compiler/rustc_mir/src/borrow_check/diagnostics/var_name.rs
diff --git a/src/librustc_mir/borrow_check/facts.rs b/compiler/rustc_mir/src/borrow_check/facts.rs
index 6d6b94ecf64..6d6b94ecf64 100644
--- a/src/librustc_mir/borrow_check/facts.rs
+++ b/compiler/rustc_mir/src/borrow_check/facts.rs
diff --git a/src/librustc_mir/borrow_check/invalidation.rs b/compiler/rustc_mir/src/borrow_check/invalidation.rs
index c84ccafaff5..c84ccafaff5 100644
--- a/src/librustc_mir/borrow_check/invalidation.rs
+++ b/compiler/rustc_mir/src/borrow_check/invalidation.rs
diff --git a/src/librustc_mir/borrow_check/location.rs b/compiler/rustc_mir/src/borrow_check/location.rs
index 375ff72679f..375ff72679f 100644
--- a/src/librustc_mir/borrow_check/location.rs
+++ b/compiler/rustc_mir/src/borrow_check/location.rs
diff --git a/src/librustc_mir/borrow_check/member_constraints.rs b/compiler/rustc_mir/src/borrow_check/member_constraints.rs
index d4baa5d809a..d4baa5d809a 100644
--- a/src/librustc_mir/borrow_check/member_constraints.rs
+++ b/compiler/rustc_mir/src/borrow_check/member_constraints.rs
diff --git a/src/librustc_mir/borrow_check/mod.rs b/compiler/rustc_mir/src/borrow_check/mod.rs
index 86908eaabd1..86908eaabd1 100644
--- a/src/librustc_mir/borrow_check/mod.rs
+++ b/compiler/rustc_mir/src/borrow_check/mod.rs
diff --git a/src/librustc_mir/borrow_check/nll.rs b/compiler/rustc_mir/src/borrow_check/nll.rs
index 66a17cba6bb..66a17cba6bb 100644
--- a/src/librustc_mir/borrow_check/nll.rs
+++ b/compiler/rustc_mir/src/borrow_check/nll.rs
diff --git a/src/librustc_mir/borrow_check/path_utils.rs b/compiler/rustc_mir/src/borrow_check/path_utils.rs
index 934729553a7..934729553a7 100644
--- a/src/librustc_mir/borrow_check/path_utils.rs
+++ b/compiler/rustc_mir/src/borrow_check/path_utils.rs
diff --git a/src/librustc_mir/borrow_check/place_ext.rs b/compiler/rustc_mir/src/borrow_check/place_ext.rs
index cadf1ebf1b7..cadf1ebf1b7 100644
--- a/src/librustc_mir/borrow_check/place_ext.rs
+++ b/compiler/rustc_mir/src/borrow_check/place_ext.rs
diff --git a/src/librustc_mir/borrow_check/places_conflict.rs b/compiler/rustc_mir/src/borrow_check/places_conflict.rs
index 246e4826e0e..246e4826e0e 100644
--- a/src/librustc_mir/borrow_check/places_conflict.rs
+++ b/compiler/rustc_mir/src/borrow_check/places_conflict.rs
diff --git a/src/librustc_mir/borrow_check/prefixes.rs b/compiler/rustc_mir/src/borrow_check/prefixes.rs
index a2475e0ff29..a2475e0ff29 100644
--- a/src/librustc_mir/borrow_check/prefixes.rs
+++ b/compiler/rustc_mir/src/borrow_check/prefixes.rs
diff --git a/src/librustc_mir/borrow_check/region_infer/dump_mir.rs b/compiler/rustc_mir/src/borrow_check/region_infer/dump_mir.rs
index d6e48deb031..d6e48deb031 100644
--- a/src/librustc_mir/borrow_check/region_infer/dump_mir.rs
+++ b/compiler/rustc_mir/src/borrow_check/region_infer/dump_mir.rs
diff --git a/src/librustc_mir/borrow_check/region_infer/graphviz.rs b/compiler/rustc_mir/src/borrow_check/region_infer/graphviz.rs
index a272e922a50..a272e922a50 100644
--- a/src/librustc_mir/borrow_check/region_infer/graphviz.rs
+++ b/compiler/rustc_mir/src/borrow_check/region_infer/graphviz.rs
diff --git a/src/librustc_mir/borrow_check/region_infer/mod.rs b/compiler/rustc_mir/src/borrow_check/region_infer/mod.rs
index 081125cb625..081125cb625 100644
--- a/src/librustc_mir/borrow_check/region_infer/mod.rs
+++ b/compiler/rustc_mir/src/borrow_check/region_infer/mod.rs
diff --git a/src/librustc_mir/borrow_check/region_infer/opaque_types.rs b/compiler/rustc_mir/src/borrow_check/region_infer/opaque_types.rs
index 325dca8c8ca..325dca8c8ca 100644
--- a/src/librustc_mir/borrow_check/region_infer/opaque_types.rs
+++ b/compiler/rustc_mir/src/borrow_check/region_infer/opaque_types.rs
diff --git a/src/librustc_mir/borrow_check/region_infer/reverse_sccs.rs b/compiler/rustc_mir/src/borrow_check/region_infer/reverse_sccs.rs
index 5d345a6e63d..5d345a6e63d 100644
--- a/src/librustc_mir/borrow_check/region_infer/reverse_sccs.rs
+++ b/compiler/rustc_mir/src/borrow_check/region_infer/reverse_sccs.rs
diff --git a/src/librustc_mir/borrow_check/region_infer/values.rs b/compiler/rustc_mir/src/borrow_check/region_infer/values.rs
index 8a5a600cfdd..8a5a600cfdd 100644
--- a/src/librustc_mir/borrow_check/region_infer/values.rs
+++ b/compiler/rustc_mir/src/borrow_check/region_infer/values.rs
diff --git a/src/librustc_mir/borrow_check/renumber.rs b/compiler/rustc_mir/src/borrow_check/renumber.rs
index 5df033b48c1..5df033b48c1 100644
--- a/src/librustc_mir/borrow_check/renumber.rs
+++ b/compiler/rustc_mir/src/borrow_check/renumber.rs
diff --git a/src/librustc_mir/borrow_check/type_check/constraint_conversion.rs b/compiler/rustc_mir/src/borrow_check/type_check/constraint_conversion.rs
index 711271a63fb..711271a63fb 100644
--- a/src/librustc_mir/borrow_check/type_check/constraint_conversion.rs
+++ b/compiler/rustc_mir/src/borrow_check/type_check/constraint_conversion.rs
diff --git a/src/librustc_mir/borrow_check/type_check/free_region_relations.rs b/compiler/rustc_mir/src/borrow_check/type_check/free_region_relations.rs
index beee3181256..beee3181256 100644
--- a/src/librustc_mir/borrow_check/type_check/free_region_relations.rs
+++ b/compiler/rustc_mir/src/borrow_check/type_check/free_region_relations.rs
diff --git a/src/librustc_mir/borrow_check/type_check/input_output.rs b/compiler/rustc_mir/src/borrow_check/type_check/input_output.rs
index 4846ef06a8b..4846ef06a8b 100644
--- a/src/librustc_mir/borrow_check/type_check/input_output.rs
+++ b/compiler/rustc_mir/src/borrow_check/type_check/input_output.rs
diff --git a/src/librustc_mir/borrow_check/type_check/liveness/local_use_map.rs b/compiler/rustc_mir/src/borrow_check/type_check/liveness/local_use_map.rs
index 995e3a60a0c..995e3a60a0c 100644
--- a/src/librustc_mir/borrow_check/type_check/liveness/local_use_map.rs
+++ b/compiler/rustc_mir/src/borrow_check/type_check/liveness/local_use_map.rs
diff --git a/src/librustc_mir/borrow_check/type_check/liveness/mod.rs b/compiler/rustc_mir/src/borrow_check/type_check/liveness/mod.rs
index bddcd34ed3e..bddcd34ed3e 100644
--- a/src/librustc_mir/borrow_check/type_check/liveness/mod.rs
+++ b/compiler/rustc_mir/src/borrow_check/type_check/liveness/mod.rs
diff --git a/src/librustc_mir/borrow_check/type_check/liveness/polonius.rs b/compiler/rustc_mir/src/borrow_check/type_check/liveness/polonius.rs
index d285098c52a..d285098c52a 100644
--- a/src/librustc_mir/borrow_check/type_check/liveness/polonius.rs
+++ b/compiler/rustc_mir/src/borrow_check/type_check/liveness/polonius.rs
diff --git a/src/librustc_mir/borrow_check/type_check/liveness/trace.rs b/compiler/rustc_mir/src/borrow_check/type_check/liveness/trace.rs
index f04736e04a0..f04736e04a0 100644
--- a/src/librustc_mir/borrow_check/type_check/liveness/trace.rs
+++ b/compiler/rustc_mir/src/borrow_check/type_check/liveness/trace.rs
diff --git a/src/librustc_mir/borrow_check/type_check/mod.rs b/compiler/rustc_mir/src/borrow_check/type_check/mod.rs
index 69c4f633770..69c4f633770 100644
--- a/src/librustc_mir/borrow_check/type_check/mod.rs
+++ b/compiler/rustc_mir/src/borrow_check/type_check/mod.rs
diff --git a/src/librustc_mir/borrow_check/type_check/relate_tys.rs b/compiler/rustc_mir/src/borrow_check/type_check/relate_tys.rs
index 91b1a1fbd97..91b1a1fbd97 100644
--- a/src/librustc_mir/borrow_check/type_check/relate_tys.rs
+++ b/compiler/rustc_mir/src/borrow_check/type_check/relate_tys.rs
diff --git a/src/librustc_mir/borrow_check/universal_regions.rs b/compiler/rustc_mir/src/borrow_check/universal_regions.rs
index 9dfc67bcf67..9dfc67bcf67 100644
--- a/src/librustc_mir/borrow_check/universal_regions.rs
+++ b/compiler/rustc_mir/src/borrow_check/universal_regions.rs
diff --git a/src/librustc_mir/borrow_check/used_muts.rs b/compiler/rustc_mir/src/borrow_check/used_muts.rs
index e027056842d..e027056842d 100644
--- a/src/librustc_mir/borrow_check/used_muts.rs
+++ b/compiler/rustc_mir/src/borrow_check/used_muts.rs
diff --git a/src/librustc_mir/const_eval/error.rs b/compiler/rustc_mir/src/const_eval/error.rs
index 044d27a6a9d..044d27a6a9d 100644
--- a/src/librustc_mir/const_eval/error.rs
+++ b/compiler/rustc_mir/src/const_eval/error.rs
diff --git a/src/librustc_mir/const_eval/eval_queries.rs b/compiler/rustc_mir/src/const_eval/eval_queries.rs
index 291b42c12d7..291b42c12d7 100644
--- a/src/librustc_mir/const_eval/eval_queries.rs
+++ b/compiler/rustc_mir/src/const_eval/eval_queries.rs
diff --git a/src/librustc_mir/const_eval/fn_queries.rs b/compiler/rustc_mir/src/const_eval/fn_queries.rs
index 9ef63b3322d..9ef63b3322d 100644
--- a/src/librustc_mir/const_eval/fn_queries.rs
+++ b/compiler/rustc_mir/src/const_eval/fn_queries.rs
diff --git a/src/librustc_mir/const_eval/machine.rs b/compiler/rustc_mir/src/const_eval/machine.rs
index b0357c508a3..b0357c508a3 100644
--- a/src/librustc_mir/const_eval/machine.rs
+++ b/compiler/rustc_mir/src/const_eval/machine.rs
diff --git a/src/librustc_mir/const_eval/mod.rs b/compiler/rustc_mir/src/const_eval/mod.rs
index e7eeb4b4de4..e7eeb4b4de4 100644
--- a/src/librustc_mir/const_eval/mod.rs
+++ b/compiler/rustc_mir/src/const_eval/mod.rs
diff --git a/src/librustc_mir/dataflow/drop_flag_effects.rs b/compiler/rustc_mir/src/dataflow/drop_flag_effects.rs
index 707e136678e..707e136678e 100644
--- a/src/librustc_mir/dataflow/drop_flag_effects.rs
+++ b/compiler/rustc_mir/src/dataflow/drop_flag_effects.rs
diff --git a/src/librustc_mir/dataflow/framework/cursor.rs b/compiler/rustc_mir/src/dataflow/framework/cursor.rs
index 4f5930dc3f5..4f5930dc3f5 100644
--- a/src/librustc_mir/dataflow/framework/cursor.rs
+++ b/compiler/rustc_mir/src/dataflow/framework/cursor.rs
diff --git a/src/librustc_mir/dataflow/framework/direction.rs b/compiler/rustc_mir/src/dataflow/framework/direction.rs
index 4512ae96c08..4512ae96c08 100644
--- a/src/librustc_mir/dataflow/framework/direction.rs
+++ b/compiler/rustc_mir/src/dataflow/framework/direction.rs
diff --git a/src/librustc_mir/dataflow/framework/engine.rs b/compiler/rustc_mir/src/dataflow/framework/engine.rs
index b703852b1de..b703852b1de 100644
--- a/src/librustc_mir/dataflow/framework/engine.rs
+++ b/compiler/rustc_mir/src/dataflow/framework/engine.rs
diff --git a/src/librustc_mir/dataflow/framework/graphviz.rs b/compiler/rustc_mir/src/dataflow/framework/graphviz.rs
index 896616a2175..896616a2175 100644
--- a/src/librustc_mir/dataflow/framework/graphviz.rs
+++ b/compiler/rustc_mir/src/dataflow/framework/graphviz.rs
diff --git a/src/librustc_mir/dataflow/framework/mod.rs b/compiler/rustc_mir/src/dataflow/framework/mod.rs
index a21bbacb467..a21bbacb467 100644
--- a/src/librustc_mir/dataflow/framework/mod.rs
+++ b/compiler/rustc_mir/src/dataflow/framework/mod.rs
diff --git a/src/librustc_mir/dataflow/framework/tests.rs b/compiler/rustc_mir/src/dataflow/framework/tests.rs
index 9349f5133a5..9349f5133a5 100644
--- a/src/librustc_mir/dataflow/framework/tests.rs
+++ b/compiler/rustc_mir/src/dataflow/framework/tests.rs
diff --git a/src/librustc_mir/dataflow/framework/visitor.rs b/compiler/rustc_mir/src/dataflow/framework/visitor.rs
index 257f3cb9a6d..257f3cb9a6d 100644
--- a/src/librustc_mir/dataflow/framework/visitor.rs
+++ b/compiler/rustc_mir/src/dataflow/framework/visitor.rs
diff --git a/src/librustc_mir/dataflow/impls/borrowed_locals.rs b/compiler/rustc_mir/src/dataflow/impls/borrowed_locals.rs
index a3fc51cad65..a3fc51cad65 100644
--- a/src/librustc_mir/dataflow/impls/borrowed_locals.rs
+++ b/compiler/rustc_mir/src/dataflow/impls/borrowed_locals.rs
diff --git a/src/librustc_mir/dataflow/impls/borrows.rs b/compiler/rustc_mir/src/dataflow/impls/borrows.rs
index aeb7ffe3e3b..aeb7ffe3e3b 100644
--- a/src/librustc_mir/dataflow/impls/borrows.rs
+++ b/compiler/rustc_mir/src/dataflow/impls/borrows.rs
diff --git a/src/librustc_mir/dataflow/impls/init_locals.rs b/compiler/rustc_mir/src/dataflow/impls/init_locals.rs
index 0e7cd1bb0e4..0e7cd1bb0e4 100644
--- a/src/librustc_mir/dataflow/impls/init_locals.rs
+++ b/compiler/rustc_mir/src/dataflow/impls/init_locals.rs
diff --git a/src/librustc_mir/dataflow/impls/liveness.rs b/compiler/rustc_mir/src/dataflow/impls/liveness.rs
index 784b0bd9293..784b0bd9293 100644
--- a/src/librustc_mir/dataflow/impls/liveness.rs
+++ b/compiler/rustc_mir/src/dataflow/impls/liveness.rs
diff --git a/src/librustc_mir/dataflow/impls/mod.rs b/compiler/rustc_mir/src/dataflow/impls/mod.rs
index 8975faec487..8975faec487 100644
--- a/src/librustc_mir/dataflow/impls/mod.rs
+++ b/compiler/rustc_mir/src/dataflow/impls/mod.rs
diff --git a/src/librustc_mir/dataflow/impls/storage_liveness.rs b/compiler/rustc_mir/src/dataflow/impls/storage_liveness.rs
index 21623e3cad5..21623e3cad5 100644
--- a/src/librustc_mir/dataflow/impls/storage_liveness.rs
+++ b/compiler/rustc_mir/src/dataflow/impls/storage_liveness.rs
diff --git a/src/librustc_mir/dataflow/mod.rs b/compiler/rustc_mir/src/dataflow/mod.rs
index a0c24636059..a0c24636059 100644
--- a/src/librustc_mir/dataflow/mod.rs
+++ b/compiler/rustc_mir/src/dataflow/mod.rs
diff --git a/src/librustc_mir/dataflow/move_paths/abs_domain.rs b/compiler/rustc_mir/src/dataflow/move_paths/abs_domain.rs
index 28936274baa..28936274baa 100644
--- a/src/librustc_mir/dataflow/move_paths/abs_domain.rs
+++ b/compiler/rustc_mir/src/dataflow/move_paths/abs_domain.rs
diff --git a/src/librustc_mir/dataflow/move_paths/builder.rs b/compiler/rustc_mir/src/dataflow/move_paths/builder.rs
index e088dc6a954..e088dc6a954 100644
--- a/src/librustc_mir/dataflow/move_paths/builder.rs
+++ b/compiler/rustc_mir/src/dataflow/move_paths/builder.rs
diff --git a/src/librustc_mir/dataflow/move_paths/mod.rs b/compiler/rustc_mir/src/dataflow/move_paths/mod.rs
index d66d2625d78..d66d2625d78 100644
--- a/src/librustc_mir/dataflow/move_paths/mod.rs
+++ b/compiler/rustc_mir/src/dataflow/move_paths/mod.rs
diff --git a/src/librustc_mir/interpret/cast.rs b/compiler/rustc_mir/src/interpret/cast.rs
index 501a5bcddb3..501a5bcddb3 100644
--- a/src/librustc_mir/interpret/cast.rs
+++ b/compiler/rustc_mir/src/interpret/cast.rs
diff --git a/src/librustc_mir/interpret/eval_context.rs b/compiler/rustc_mir/src/interpret/eval_context.rs
index 525da87463a..525da87463a 100644
--- a/src/librustc_mir/interpret/eval_context.rs
+++ b/compiler/rustc_mir/src/interpret/eval_context.rs
diff --git a/src/librustc_mir/interpret/intern.rs b/compiler/rustc_mir/src/interpret/intern.rs
index 606be7cad2b..606be7cad2b 100644
--- a/src/librustc_mir/interpret/intern.rs
+++ b/compiler/rustc_mir/src/interpret/intern.rs
diff --git a/src/librustc_mir/interpret/intrinsics.rs b/compiler/rustc_mir/src/interpret/intrinsics.rs
index b37dcd42f4c..b37dcd42f4c 100644
--- a/src/librustc_mir/interpret/intrinsics.rs
+++ b/compiler/rustc_mir/src/interpret/intrinsics.rs
diff --git a/src/librustc_mir/interpret/intrinsics/caller_location.rs b/compiler/rustc_mir/src/interpret/intrinsics/caller_location.rs
index d9be28cf9db..d9be28cf9db 100644
--- a/src/librustc_mir/interpret/intrinsics/caller_location.rs
+++ b/compiler/rustc_mir/src/interpret/intrinsics/caller_location.rs
diff --git a/src/librustc_mir/interpret/intrinsics/type_name.rs b/compiler/rustc_mir/src/interpret/intrinsics/type_name.rs
index 379117f3b84..379117f3b84 100644
--- a/src/librustc_mir/interpret/intrinsics/type_name.rs
+++ b/compiler/rustc_mir/src/interpret/intrinsics/type_name.rs
diff --git a/src/librustc_mir/interpret/machine.rs b/compiler/rustc_mir/src/interpret/machine.rs
index 3718da1723b..3718da1723b 100644
--- a/src/librustc_mir/interpret/machine.rs
+++ b/compiler/rustc_mir/src/interpret/machine.rs
diff --git a/src/librustc_mir/interpret/memory.rs b/compiler/rustc_mir/src/interpret/memory.rs
index d4be2ce0568..d4be2ce0568 100644
--- a/src/librustc_mir/interpret/memory.rs
+++ b/compiler/rustc_mir/src/interpret/memory.rs
diff --git a/src/librustc_mir/interpret/mod.rs b/compiler/rustc_mir/src/interpret/mod.rs
index a931b0bbe97..a931b0bbe97 100644
--- a/src/librustc_mir/interpret/mod.rs
+++ b/compiler/rustc_mir/src/interpret/mod.rs
diff --git a/src/librustc_mir/interpret/operand.rs b/compiler/rustc_mir/src/interpret/operand.rs
index 0b58caef54d..0b58caef54d 100644
--- a/src/librustc_mir/interpret/operand.rs
+++ b/compiler/rustc_mir/src/interpret/operand.rs
diff --git a/src/librustc_mir/interpret/operator.rs b/compiler/rustc_mir/src/interpret/operator.rs
index 30c40b8fde9..30c40b8fde9 100644
--- a/src/librustc_mir/interpret/operator.rs
+++ b/compiler/rustc_mir/src/interpret/operator.rs
diff --git a/src/librustc_mir/interpret/place.rs b/compiler/rustc_mir/src/interpret/place.rs
index 6ba6103b311..6ba6103b311 100644
--- a/src/librustc_mir/interpret/place.rs
+++ b/compiler/rustc_mir/src/interpret/place.rs
diff --git a/src/librustc_mir/interpret/step.rs b/compiler/rustc_mir/src/interpret/step.rs
index 156da84f291..156da84f291 100644
--- a/src/librustc_mir/interpret/step.rs
+++ b/compiler/rustc_mir/src/interpret/step.rs
diff --git a/src/librustc_mir/interpret/terminator.rs b/compiler/rustc_mir/src/interpret/terminator.rs
index 9a036a0f299..9a036a0f299 100644
--- a/src/librustc_mir/interpret/terminator.rs
+++ b/compiler/rustc_mir/src/interpret/terminator.rs
diff --git a/src/librustc_mir/interpret/traits.rs b/compiler/rustc_mir/src/interpret/traits.rs
index 77f4593fa16..77f4593fa16 100644
--- a/src/librustc_mir/interpret/traits.rs
+++ b/compiler/rustc_mir/src/interpret/traits.rs
diff --git a/src/librustc_mir/interpret/util.rs b/compiler/rustc_mir/src/interpret/util.rs
index 57c5fc59cc0..57c5fc59cc0 100644
--- a/src/librustc_mir/interpret/util.rs
+++ b/compiler/rustc_mir/src/interpret/util.rs
diff --git a/src/librustc_mir/interpret/validity.rs b/compiler/rustc_mir/src/interpret/validity.rs
index 9cd20340138..9cd20340138 100644
--- a/src/librustc_mir/interpret/validity.rs
+++ b/compiler/rustc_mir/src/interpret/validity.rs
diff --git a/src/librustc_mir/interpret/visitor.rs b/compiler/rustc_mir/src/interpret/visitor.rs
index 6c53df40a7c..6c53df40a7c 100644
--- a/src/librustc_mir/interpret/visitor.rs
+++ b/compiler/rustc_mir/src/interpret/visitor.rs
diff --git a/src/librustc_mir/lib.rs b/compiler/rustc_mir/src/lib.rs
index 2e3b5084635..2e3b5084635 100644
--- a/src/librustc_mir/lib.rs
+++ b/compiler/rustc_mir/src/lib.rs
diff --git a/src/librustc_mir/monomorphize/collector.rs b/compiler/rustc_mir/src/monomorphize/collector.rs
index d379f4ef428..d379f4ef428 100644
--- a/src/librustc_mir/monomorphize/collector.rs
+++ b/compiler/rustc_mir/src/monomorphize/collector.rs
diff --git a/src/librustc_mir/monomorphize/mod.rs b/compiler/rustc_mir/src/monomorphize/mod.rs
index edafa00a03a..edafa00a03a 100644
--- a/src/librustc_mir/monomorphize/mod.rs
+++ b/compiler/rustc_mir/src/monomorphize/mod.rs
diff --git a/src/librustc_mir/monomorphize/partitioning/default.rs b/compiler/rustc_mir/src/monomorphize/partitioning/default.rs
index b48bae83787..b48bae83787 100644
--- a/src/librustc_mir/monomorphize/partitioning/default.rs
+++ b/compiler/rustc_mir/src/monomorphize/partitioning/default.rs
diff --git a/src/librustc_mir/monomorphize/partitioning/merging.rs b/compiler/rustc_mir/src/monomorphize/partitioning/merging.rs
index 1787e6df1b9..1787e6df1b9 100644
--- a/src/librustc_mir/monomorphize/partitioning/merging.rs
+++ b/compiler/rustc_mir/src/monomorphize/partitioning/merging.rs
diff --git a/src/librustc_mir/monomorphize/partitioning/mod.rs b/compiler/rustc_mir/src/monomorphize/partitioning/mod.rs
index 9dfbd65e1b1..9dfbd65e1b1 100644
--- a/src/librustc_mir/monomorphize/partitioning/mod.rs
+++ b/compiler/rustc_mir/src/monomorphize/partitioning/mod.rs
diff --git a/src/librustc_mir/monomorphize/polymorphize.rs b/compiler/rustc_mir/src/monomorphize/polymorphize.rs
index 69f3288ee39..69f3288ee39 100644
--- a/src/librustc_mir/monomorphize/polymorphize.rs
+++ b/compiler/rustc_mir/src/monomorphize/polymorphize.rs
diff --git a/src/librustc_mir/shim.rs b/compiler/rustc_mir/src/shim.rs
index 479b6c2a6ca..479b6c2a6ca 100644
--- a/src/librustc_mir/shim.rs
+++ b/compiler/rustc_mir/src/shim.rs
diff --git a/src/librustc_mir/transform/add_call_guards.rs b/compiler/rustc_mir/src/transform/add_call_guards.rs
index 33859115359..33859115359 100644
--- a/src/librustc_mir/transform/add_call_guards.rs
+++ b/compiler/rustc_mir/src/transform/add_call_guards.rs
diff --git a/src/librustc_mir/transform/add_moves_for_packed_drops.rs b/compiler/rustc_mir/src/transform/add_moves_for_packed_drops.rs
index a02d0f65560..a02d0f65560 100644
--- a/src/librustc_mir/transform/add_moves_for_packed_drops.rs
+++ b/compiler/rustc_mir/src/transform/add_moves_for_packed_drops.rs
diff --git a/src/librustc_mir/transform/add_retag.rs b/compiler/rustc_mir/src/transform/add_retag.rs
index 324289166b9..324289166b9 100644
--- a/src/librustc_mir/transform/add_retag.rs
+++ b/compiler/rustc_mir/src/transform/add_retag.rs
diff --git a/src/librustc_mir/transform/check_consts/mod.rs b/compiler/rustc_mir/src/transform/check_consts/mod.rs
index 81c1b0b5bd4..81c1b0b5bd4 100644
--- a/src/librustc_mir/transform/check_consts/mod.rs
+++ b/compiler/rustc_mir/src/transform/check_consts/mod.rs
diff --git a/src/librustc_mir/transform/check_consts/ops.rs b/compiler/rustc_mir/src/transform/check_consts/ops.rs
index ea025f208e4..ea025f208e4 100644
--- a/src/librustc_mir/transform/check_consts/ops.rs
+++ b/compiler/rustc_mir/src/transform/check_consts/ops.rs
diff --git a/src/librustc_mir/transform/check_consts/post_drop_elaboration.rs b/compiler/rustc_mir/src/transform/check_consts/post_drop_elaboration.rs
index 55075b3ab5e..55075b3ab5e 100644
--- a/src/librustc_mir/transform/check_consts/post_drop_elaboration.rs
+++ b/compiler/rustc_mir/src/transform/check_consts/post_drop_elaboration.rs
diff --git a/src/librustc_mir/transform/check_consts/qualifs.rs b/compiler/rustc_mir/src/transform/check_consts/qualifs.rs
index 445a0230afd..445a0230afd 100644
--- a/src/librustc_mir/transform/check_consts/qualifs.rs
+++ b/compiler/rustc_mir/src/transform/check_consts/qualifs.rs
diff --git a/src/librustc_mir/transform/check_consts/resolver.rs b/compiler/rustc_mir/src/transform/check_consts/resolver.rs
index b8104292aab..b8104292aab 100644
--- a/src/librustc_mir/transform/check_consts/resolver.rs
+++ b/compiler/rustc_mir/src/transform/check_consts/resolver.rs
diff --git a/src/librustc_mir/transform/check_consts/validation.rs b/compiler/rustc_mir/src/transform/check_consts/validation.rs
index e21f314ca15..e21f314ca15 100644
--- a/src/librustc_mir/transform/check_consts/validation.rs
+++ b/compiler/rustc_mir/src/transform/check_consts/validation.rs
diff --git a/src/librustc_mir/transform/check_packed_ref.rs b/compiler/rustc_mir/src/transform/check_packed_ref.rs
index 043b2d0d170..043b2d0d170 100644
--- a/src/librustc_mir/transform/check_packed_ref.rs
+++ b/compiler/rustc_mir/src/transform/check_packed_ref.rs
diff --git a/src/librustc_mir/transform/check_unsafety.rs b/compiler/rustc_mir/src/transform/check_unsafety.rs
index c3e04e698db..c3e04e698db 100644
--- a/src/librustc_mir/transform/check_unsafety.rs
+++ b/compiler/rustc_mir/src/transform/check_unsafety.rs
diff --git a/src/librustc_mir/transform/cleanup_post_borrowck.rs b/compiler/rustc_mir/src/transform/cleanup_post_borrowck.rs
index 3f3d247a829..3f3d247a829 100644
--- a/src/librustc_mir/transform/cleanup_post_borrowck.rs
+++ b/compiler/rustc_mir/src/transform/cleanup_post_borrowck.rs
diff --git a/src/librustc_mir/transform/const_prop.rs b/compiler/rustc_mir/src/transform/const_prop.rs
index 56479b047fa..56479b047fa 100644
--- a/src/librustc_mir/transform/const_prop.rs
+++ b/compiler/rustc_mir/src/transform/const_prop.rs
diff --git a/src/librustc_mir/transform/copy_prop.rs b/compiler/rustc_mir/src/transform/copy_prop.rs
index ba406c72df8..ba406c72df8 100644
--- a/src/librustc_mir/transform/copy_prop.rs
+++ b/compiler/rustc_mir/src/transform/copy_prop.rs
diff --git a/src/librustc_mir/transform/deaggregator.rs b/compiler/rustc_mir/src/transform/deaggregator.rs
index 66989a90244..66989a90244 100644
--- a/src/librustc_mir/transform/deaggregator.rs
+++ b/compiler/rustc_mir/src/transform/deaggregator.rs
diff --git a/src/librustc_mir/transform/dump_mir.rs b/compiler/rustc_mir/src/transform/dump_mir.rs
index 5ce6f4fa741..5ce6f4fa741 100644
--- a/src/librustc_mir/transform/dump_mir.rs
+++ b/compiler/rustc_mir/src/transform/dump_mir.rs
diff --git a/src/librustc_mir/transform/elaborate_drops.rs b/compiler/rustc_mir/src/transform/elaborate_drops.rs
index 5f193069356..5f193069356 100644
--- a/src/librustc_mir/transform/elaborate_drops.rs
+++ b/compiler/rustc_mir/src/transform/elaborate_drops.rs
diff --git a/src/librustc_mir/transform/generator.rs b/compiler/rustc_mir/src/transform/generator.rs
index a22075e760a..a22075e760a 100644
--- a/src/librustc_mir/transform/generator.rs
+++ b/compiler/rustc_mir/src/transform/generator.rs
diff --git a/src/librustc_mir/transform/inline.rs b/compiler/rustc_mir/src/transform/inline.rs
index 315d4fa9d47..315d4fa9d47 100644
--- a/src/librustc_mir/transform/inline.rs
+++ b/compiler/rustc_mir/src/transform/inline.rs
diff --git a/src/librustc_mir/transform/instcombine.rs b/compiler/rustc_mir/src/transform/instcombine.rs
index 7967137e01e..7967137e01e 100644
--- a/src/librustc_mir/transform/instcombine.rs
+++ b/compiler/rustc_mir/src/transform/instcombine.rs
diff --git a/src/librustc_mir/transform/instrument_coverage.rs b/compiler/rustc_mir/src/transform/instrument_coverage.rs
index f60e6da714a..f60e6da714a 100644
--- a/src/librustc_mir/transform/instrument_coverage.rs
+++ b/compiler/rustc_mir/src/transform/instrument_coverage.rs
diff --git a/src/librustc_mir/transform/match_branches.rs b/compiler/rustc_mir/src/transform/match_branches.rs
index c1d574d6ef2..c1d574d6ef2 100644
--- a/src/librustc_mir/transform/match_branches.rs
+++ b/compiler/rustc_mir/src/transform/match_branches.rs
diff --git a/src/librustc_mir/transform/mod.rs b/compiler/rustc_mir/src/transform/mod.rs
index c3a34756122..c3a34756122 100644
--- a/src/librustc_mir/transform/mod.rs
+++ b/compiler/rustc_mir/src/transform/mod.rs
diff --git a/src/librustc_mir/transform/no_landing_pads.rs b/compiler/rustc_mir/src/transform/no_landing_pads.rs
index 1d83733e4cd..1d83733e4cd 100644
--- a/src/librustc_mir/transform/no_landing_pads.rs
+++ b/compiler/rustc_mir/src/transform/no_landing_pads.rs
diff --git a/src/librustc_mir/transform/nrvo.rs b/compiler/rustc_mir/src/transform/nrvo.rs
index 1f3d7bb7cc6..1f3d7bb7cc6 100644
--- a/src/librustc_mir/transform/nrvo.rs
+++ b/compiler/rustc_mir/src/transform/nrvo.rs
diff --git a/src/librustc_mir/transform/promote_consts.rs b/compiler/rustc_mir/src/transform/promote_consts.rs
index b2dda1caa54..b2dda1caa54 100644
--- a/src/librustc_mir/transform/promote_consts.rs
+++ b/compiler/rustc_mir/src/transform/promote_consts.rs
diff --git a/src/librustc_mir/transform/qualify_min_const_fn.rs b/compiler/rustc_mir/src/transform/qualify_min_const_fn.rs
index 26db4600a2b..26db4600a2b 100644
--- a/src/librustc_mir/transform/qualify_min_const_fn.rs
+++ b/compiler/rustc_mir/src/transform/qualify_min_const_fn.rs
diff --git a/src/librustc_mir/transform/remove_noop_landing_pads.rs b/compiler/rustc_mir/src/transform/remove_noop_landing_pads.rs
index 0bad1e5037a..0bad1e5037a 100644
--- a/src/librustc_mir/transform/remove_noop_landing_pads.rs
+++ b/compiler/rustc_mir/src/transform/remove_noop_landing_pads.rs
diff --git a/src/librustc_mir/transform/required_consts.rs b/compiler/rustc_mir/src/transform/required_consts.rs
index a63ab30a68f..a63ab30a68f 100644
--- a/src/librustc_mir/transform/required_consts.rs
+++ b/compiler/rustc_mir/src/transform/required_consts.rs
diff --git a/src/librustc_mir/transform/rustc_peek.rs b/compiler/rustc_mir/src/transform/rustc_peek.rs
index 00d269a4af8..00d269a4af8 100644
--- a/src/librustc_mir/transform/rustc_peek.rs
+++ b/compiler/rustc_mir/src/transform/rustc_peek.rs
diff --git a/src/librustc_mir/transform/simplify.rs b/compiler/rustc_mir/src/transform/simplify.rs
index d8995e92abf..d8995e92abf 100644
--- a/src/librustc_mir/transform/simplify.rs
+++ b/compiler/rustc_mir/src/transform/simplify.rs
diff --git a/src/librustc_mir/transform/simplify_branches.rs b/compiler/rustc_mir/src/transform/simplify_branches.rs
index 4c30a0946bc..4c30a0946bc 100644
--- a/src/librustc_mir/transform/simplify_branches.rs
+++ b/compiler/rustc_mir/src/transform/simplify_branches.rs
diff --git a/src/librustc_mir/transform/simplify_comparison_integral.rs b/compiler/rustc_mir/src/transform/simplify_comparison_integral.rs
index a450a75d091..a450a75d091 100644
--- a/src/librustc_mir/transform/simplify_comparison_integral.rs
+++ b/compiler/rustc_mir/src/transform/simplify_comparison_integral.rs
diff --git a/src/librustc_mir/transform/simplify_try.rs b/compiler/rustc_mir/src/transform/simplify_try.rs
index 06829cc2f14..06829cc2f14 100644
--- a/src/librustc_mir/transform/simplify_try.rs
+++ b/compiler/rustc_mir/src/transform/simplify_try.rs
diff --git a/src/librustc_mir/transform/uninhabited_enum_branching.rs b/compiler/rustc_mir/src/transform/uninhabited_enum_branching.rs
index 4cca4d223c0..4cca4d223c0 100644
--- a/src/librustc_mir/transform/uninhabited_enum_branching.rs
+++ b/compiler/rustc_mir/src/transform/uninhabited_enum_branching.rs
diff --git a/src/librustc_mir/transform/unreachable_prop.rs b/compiler/rustc_mir/src/transform/unreachable_prop.rs
index fa362c66fb2..fa362c66fb2 100644
--- a/src/librustc_mir/transform/unreachable_prop.rs
+++ b/compiler/rustc_mir/src/transform/unreachable_prop.rs
diff --git a/src/librustc_mir/transform/validate.rs b/compiler/rustc_mir/src/transform/validate.rs
index d7c9ecd0655..d7c9ecd0655 100644
--- a/src/librustc_mir/transform/validate.rs
+++ b/compiler/rustc_mir/src/transform/validate.rs
diff --git a/src/librustc_mir/util/aggregate.rs b/compiler/rustc_mir/src/util/aggregate.rs
index 130409b9df5..130409b9df5 100644
--- a/src/librustc_mir/util/aggregate.rs
+++ b/compiler/rustc_mir/src/util/aggregate.rs
diff --git a/src/librustc_mir/util/alignment.rs b/compiler/rustc_mir/src/util/alignment.rs
index 202e5e27f1d..202e5e27f1d 100644
--- a/src/librustc_mir/util/alignment.rs
+++ b/compiler/rustc_mir/src/util/alignment.rs
diff --git a/src/librustc_mir/util/borrowck_errors.rs b/compiler/rustc_mir/src/util/borrowck_errors.rs
index f8bb7e7a85d..f8bb7e7a85d 100644
--- a/src/librustc_mir/util/borrowck_errors.rs
+++ b/compiler/rustc_mir/src/util/borrowck_errors.rs
diff --git a/src/librustc_mir/util/collect_writes.rs b/compiler/rustc_mir/src/util/collect_writes.rs
index ecf3b08a96e..ecf3b08a96e 100644
--- a/src/librustc_mir/util/collect_writes.rs
+++ b/compiler/rustc_mir/src/util/collect_writes.rs
diff --git a/src/librustc_mir/util/def_use.rs b/compiler/rustc_mir/src/util/def_use.rs
index b4448ead8eb..b4448ead8eb 100644
--- a/src/librustc_mir/util/def_use.rs
+++ b/compiler/rustc_mir/src/util/def_use.rs
diff --git a/src/librustc_mir/util/elaborate_drops.rs b/compiler/rustc_mir/src/util/elaborate_drops.rs
index 642935d243d..642935d243d 100644
--- a/src/librustc_mir/util/elaborate_drops.rs
+++ b/compiler/rustc_mir/src/util/elaborate_drops.rs
diff --git a/src/librustc_mir/util/graphviz.rs b/compiler/rustc_mir/src/util/graphviz.rs
index 50193c4a0db..50193c4a0db 100644
--- a/src/librustc_mir/util/graphviz.rs
+++ b/compiler/rustc_mir/src/util/graphviz.rs
diff --git a/src/librustc_mir/util/mod.rs b/compiler/rustc_mir/src/util/mod.rs
index 8bbe207c077..8bbe207c077 100644
--- a/src/librustc_mir/util/mod.rs
+++ b/compiler/rustc_mir/src/util/mod.rs
diff --git a/src/librustc_mir/util/patch.rs b/compiler/rustc_mir/src/util/patch.rs
index 6566a996fe4..6566a996fe4 100644
--- a/src/librustc_mir/util/patch.rs
+++ b/compiler/rustc_mir/src/util/patch.rs
diff --git a/src/librustc_mir/util/pretty.rs b/compiler/rustc_mir/src/util/pretty.rs
index 2a9cbc7fc0e..2a9cbc7fc0e 100644
--- a/src/librustc_mir/util/pretty.rs
+++ b/compiler/rustc_mir/src/util/pretty.rs
diff --git a/src/librustc_mir/util/storage.rs b/compiler/rustc_mir/src/util/storage.rs
index 0b7b1c29537..0b7b1c29537 100644
--- a/src/librustc_mir/util/storage.rs
+++ b/compiler/rustc_mir/src/util/storage.rs
diff --git a/compiler/rustc_mir_build/Cargo.toml b/compiler/rustc_mir_build/Cargo.toml
new file mode 100644
index 00000000000..2dd894a67a6
--- /dev/null
+++ b/compiler/rustc_mir_build/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_mir_build"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+rustc_arena = { path = "../rustc_arena" }
+tracing = "0.1"
+rustc_middle = { path = "../rustc_middle" }
+rustc_apfloat = { path = "../rustc_apfloat" }
+rustc_attr = { path = "../rustc_attr" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_index = { path = "../rustc_index" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_infer = { path = "../rustc_infer" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_session = { path = "../rustc_session" }
+rustc_span = { path = "../rustc_span" }
+rustc_target = { path = "../rustc_target" }
+rustc_trait_selection = { path = "../rustc_trait_selection" }
+rustc_ast = { path = "../rustc_ast" }
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_mir_build/build/block.rs b/compiler/rustc_mir_build/src/build/block.rs
index d1cbf209b06..d1cbf209b06 100644
--- a/src/librustc_mir_build/build/block.rs
+++ b/compiler/rustc_mir_build/src/build/block.rs
diff --git a/src/librustc_mir_build/build/cfg.rs b/compiler/rustc_mir_build/src/build/cfg.rs
index 42e2b242d77..42e2b242d77 100644
--- a/src/librustc_mir_build/build/cfg.rs
+++ b/compiler/rustc_mir_build/src/build/cfg.rs
diff --git a/src/librustc_mir_build/build/expr/as_constant.rs b/compiler/rustc_mir_build/src/build/expr/as_constant.rs
index 982aefcf604..982aefcf604 100644
--- a/src/librustc_mir_build/build/expr/as_constant.rs
+++ b/compiler/rustc_mir_build/src/build/expr/as_constant.rs
diff --git a/src/librustc_mir_build/build/expr/as_operand.rs b/compiler/rustc_mir_build/src/build/expr/as_operand.rs
index aac93f313f4..aac93f313f4 100644
--- a/src/librustc_mir_build/build/expr/as_operand.rs
+++ b/compiler/rustc_mir_build/src/build/expr/as_operand.rs
diff --git a/src/librustc_mir_build/build/expr/as_place.rs b/compiler/rustc_mir_build/src/build/expr/as_place.rs
index 1e3e104c2ba..1e3e104c2ba 100644
--- a/src/librustc_mir_build/build/expr/as_place.rs
+++ b/compiler/rustc_mir_build/src/build/expr/as_place.rs
diff --git a/src/librustc_mir_build/build/expr/as_rvalue.rs b/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs
index 9c5fddc6b77..9c5fddc6b77 100644
--- a/src/librustc_mir_build/build/expr/as_rvalue.rs
+++ b/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs
diff --git a/src/librustc_mir_build/build/expr/as_temp.rs b/compiler/rustc_mir_build/src/build/expr/as_temp.rs
index a9cc0cc2f24..a9cc0cc2f24 100644
--- a/src/librustc_mir_build/build/expr/as_temp.rs
+++ b/compiler/rustc_mir_build/src/build/expr/as_temp.rs
diff --git a/src/librustc_mir_build/build/expr/category.rs b/compiler/rustc_mir_build/src/build/expr/category.rs
index 9cabd186d84..9cabd186d84 100644
--- a/src/librustc_mir_build/build/expr/category.rs
+++ b/compiler/rustc_mir_build/src/build/expr/category.rs
diff --git a/src/librustc_mir_build/build/expr/into.rs b/compiler/rustc_mir_build/src/build/expr/into.rs
index 3d623abfa6e..3d623abfa6e 100644
--- a/src/librustc_mir_build/build/expr/into.rs
+++ b/compiler/rustc_mir_build/src/build/expr/into.rs
diff --git a/src/librustc_mir_build/build/expr/mod.rs b/compiler/rustc_mir_build/src/build/expr/mod.rs
index ac8c7e725e1..ac8c7e725e1 100644
--- a/src/librustc_mir_build/build/expr/mod.rs
+++ b/compiler/rustc_mir_build/src/build/expr/mod.rs
diff --git a/src/librustc_mir_build/build/expr/stmt.rs b/compiler/rustc_mir_build/src/build/expr/stmt.rs
index f117689d940..f117689d940 100644
--- a/src/librustc_mir_build/build/expr/stmt.rs
+++ b/compiler/rustc_mir_build/src/build/expr/stmt.rs
diff --git a/src/librustc_mir_build/build/into.rs b/compiler/rustc_mir_build/src/build/into.rs
index 7264e495b84..7264e495b84 100644
--- a/src/librustc_mir_build/build/into.rs
+++ b/compiler/rustc_mir_build/src/build/into.rs
diff --git a/src/librustc_mir_build/build/matches/mod.rs b/compiler/rustc_mir_build/src/build/matches/mod.rs
index 3a525d10b08..3a525d10b08 100644
--- a/src/librustc_mir_build/build/matches/mod.rs
+++ b/compiler/rustc_mir_build/src/build/matches/mod.rs
diff --git a/src/librustc_mir_build/build/matches/simplify.rs b/compiler/rustc_mir_build/src/build/matches/simplify.rs
index e584aeb9226..e584aeb9226 100644
--- a/src/librustc_mir_build/build/matches/simplify.rs
+++ b/compiler/rustc_mir_build/src/build/matches/simplify.rs
diff --git a/src/librustc_mir_build/build/matches/test.rs b/compiler/rustc_mir_build/src/build/matches/test.rs
index c4a87a554a3..c4a87a554a3 100644
--- a/src/librustc_mir_build/build/matches/test.rs
+++ b/compiler/rustc_mir_build/src/build/matches/test.rs
diff --git a/src/librustc_mir_build/build/matches/util.rs b/compiler/rustc_mir_build/src/build/matches/util.rs
index c6d39947f7d..c6d39947f7d 100644
--- a/src/librustc_mir_build/build/matches/util.rs
+++ b/compiler/rustc_mir_build/src/build/matches/util.rs
diff --git a/src/librustc_mir_build/build/misc.rs b/compiler/rustc_mir_build/src/build/misc.rs
index 29651d9bc66..29651d9bc66 100644
--- a/src/librustc_mir_build/build/misc.rs
+++ b/compiler/rustc_mir_build/src/build/misc.rs
diff --git a/src/librustc_mir_build/build/mod.rs b/compiler/rustc_mir_build/src/build/mod.rs
index 249cce0ba19..249cce0ba19 100644
--- a/src/librustc_mir_build/build/mod.rs
+++ b/compiler/rustc_mir_build/src/build/mod.rs
diff --git a/src/librustc_mir_build/build/scope.rs b/compiler/rustc_mir_build/src/build/scope.rs
index 2a03bb78c6b..2a03bb78c6b 100644
--- a/src/librustc_mir_build/build/scope.rs
+++ b/compiler/rustc_mir_build/src/build/scope.rs
diff --git a/src/librustc_mir_build/lib.rs b/compiler/rustc_mir_build/src/lib.rs
index 313bb979a51..313bb979a51 100644
--- a/src/librustc_mir_build/lib.rs
+++ b/compiler/rustc_mir_build/src/lib.rs
diff --git a/src/librustc_mir_build/lints.rs b/compiler/rustc_mir_build/src/lints.rs
index fd2d5a4abd4..fd2d5a4abd4 100644
--- a/src/librustc_mir_build/lints.rs
+++ b/compiler/rustc_mir_build/src/lints.rs
diff --git a/src/librustc_mir_build/thir/constant.rs b/compiler/rustc_mir_build/src/thir/constant.rs
index dd5515d39b0..dd5515d39b0 100644
--- a/src/librustc_mir_build/thir/constant.rs
+++ b/compiler/rustc_mir_build/src/thir/constant.rs
diff --git a/src/librustc_mir_build/thir/cx/block.rs b/compiler/rustc_mir_build/src/thir/cx/block.rs
index 980888df7fe..980888df7fe 100644
--- a/src/librustc_mir_build/thir/cx/block.rs
+++ b/compiler/rustc_mir_build/src/thir/cx/block.rs
diff --git a/src/librustc_mir_build/thir/cx/expr.rs b/compiler/rustc_mir_build/src/thir/cx/expr.rs
index 066e46fec14..066e46fec14 100644
--- a/src/librustc_mir_build/thir/cx/expr.rs
+++ b/compiler/rustc_mir_build/src/thir/cx/expr.rs
diff --git a/src/librustc_mir_build/thir/cx/mod.rs b/compiler/rustc_mir_build/src/thir/cx/mod.rs
index cf42fee873e..cf42fee873e 100644
--- a/src/librustc_mir_build/thir/cx/mod.rs
+++ b/compiler/rustc_mir_build/src/thir/cx/mod.rs
diff --git a/src/librustc_mir_build/thir/cx/to_ref.rs b/compiler/rustc_mir_build/src/thir/cx/to_ref.rs
index 53a988ebb79..53a988ebb79 100644
--- a/src/librustc_mir_build/thir/cx/to_ref.rs
+++ b/compiler/rustc_mir_build/src/thir/cx/to_ref.rs
diff --git a/src/librustc_mir_build/thir/mod.rs b/compiler/rustc_mir_build/src/thir/mod.rs
index 2837bfa040f..2837bfa040f 100644
--- a/src/librustc_mir_build/thir/mod.rs
+++ b/compiler/rustc_mir_build/src/thir/mod.rs
diff --git a/src/librustc_mir_build/thir/pattern/_match.rs b/compiler/rustc_mir_build/src/thir/pattern/_match.rs
index 3202f7d1b1b..3202f7d1b1b 100644
--- a/src/librustc_mir_build/thir/pattern/_match.rs
+++ b/compiler/rustc_mir_build/src/thir/pattern/_match.rs
diff --git a/src/librustc_mir_build/thir/pattern/check_match.rs b/compiler/rustc_mir_build/src/thir/pattern/check_match.rs
index 4e7108667e1..4e7108667e1 100644
--- a/src/librustc_mir_build/thir/pattern/check_match.rs
+++ b/compiler/rustc_mir_build/src/thir/pattern/check_match.rs
diff --git a/src/librustc_mir_build/thir/pattern/const_to_pat.rs b/compiler/rustc_mir_build/src/thir/pattern/const_to_pat.rs
index f6d3ccc1ae0..f6d3ccc1ae0 100644
--- a/src/librustc_mir_build/thir/pattern/const_to_pat.rs
+++ b/compiler/rustc_mir_build/src/thir/pattern/const_to_pat.rs
diff --git a/src/librustc_mir_build/thir/pattern/mod.rs b/compiler/rustc_mir_build/src/thir/pattern/mod.rs
index c163cb0e60c..c163cb0e60c 100644
--- a/src/librustc_mir_build/thir/pattern/mod.rs
+++ b/compiler/rustc_mir_build/src/thir/pattern/mod.rs
diff --git a/src/librustc_mir_build/thir/util.rs b/compiler/rustc_mir_build/src/thir/util.rs
index 7de60ddda41..7de60ddda41 100644
--- a/src/librustc_mir_build/thir/util.rs
+++ b/compiler/rustc_mir_build/src/thir/util.rs
diff --git a/compiler/rustc_parse/Cargo.toml b/compiler/rustc_parse/Cargo.toml
new file mode 100644
index 00000000000..52835e5c8a9
--- /dev/null
+++ b/compiler/rustc_parse/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_parse"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+bitflags = "1.0"
+tracing = "0.1"
+rustc_ast_pretty = { path = "../rustc_ast_pretty" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_feature = { path = "../rustc_feature" }
+rustc_lexer = { path = "../rustc_lexer" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_session = { path = "../rustc_session" }
+rustc_span = { path = "../rustc_span" }
+rustc_ast = { path = "../rustc_ast" }
+unicode-normalization = "0.1.11"
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_parse/lexer/mod.rs b/compiler/rustc_parse/src/lexer/mod.rs
index a65d3446819..a65d3446819 100644
--- a/src/librustc_parse/lexer/mod.rs
+++ b/compiler/rustc_parse/src/lexer/mod.rs
diff --git a/src/librustc_parse/lexer/tokentrees.rs b/compiler/rustc_parse/src/lexer/tokentrees.rs
index c08659ec9f6..c08659ec9f6 100644
--- a/src/librustc_parse/lexer/tokentrees.rs
+++ b/compiler/rustc_parse/src/lexer/tokentrees.rs
diff --git a/src/librustc_parse/lexer/unescape_error_reporting.rs b/compiler/rustc_parse/src/lexer/unescape_error_reporting.rs
index 6f249f491a6..6f249f491a6 100644
--- a/src/librustc_parse/lexer/unescape_error_reporting.rs
+++ b/compiler/rustc_parse/src/lexer/unescape_error_reporting.rs
diff --git a/src/librustc_parse/lexer/unicode_chars.rs b/compiler/rustc_parse/src/lexer/unicode_chars.rs
index ac395f6cbc2..ac395f6cbc2 100644
--- a/src/librustc_parse/lexer/unicode_chars.rs
+++ b/compiler/rustc_parse/src/lexer/unicode_chars.rs
diff --git a/src/librustc_parse/lib.rs b/compiler/rustc_parse/src/lib.rs
index bc857c97742..bc857c97742 100644
--- a/src/librustc_parse/lib.rs
+++ b/compiler/rustc_parse/src/lib.rs
diff --git a/src/librustc_parse/parser/attr.rs b/compiler/rustc_parse/src/parser/attr.rs
index 4e4429e461f..4e4429e461f 100644
--- a/src/librustc_parse/parser/attr.rs
+++ b/compiler/rustc_parse/src/parser/attr.rs
diff --git a/src/librustc_parse/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs
index 12efe391fb9..12efe391fb9 100644
--- a/src/librustc_parse/parser/diagnostics.rs
+++ b/compiler/rustc_parse/src/parser/diagnostics.rs
diff --git a/src/librustc_parse/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs
index f022c628fe2..f022c628fe2 100644
--- a/src/librustc_parse/parser/expr.rs
+++ b/compiler/rustc_parse/src/parser/expr.rs
diff --git a/src/librustc_parse/parser/generics.rs b/compiler/rustc_parse/src/parser/generics.rs
index dd99a7587dd..dd99a7587dd 100644
--- a/src/librustc_parse/parser/generics.rs
+++ b/compiler/rustc_parse/src/parser/generics.rs
diff --git a/src/librustc_parse/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs
index 9143af651df..9143af651df 100644
--- a/src/librustc_parse/parser/item.rs
+++ b/compiler/rustc_parse/src/parser/item.rs
diff --git a/src/librustc_parse/parser/mod.rs b/compiler/rustc_parse/src/parser/mod.rs
index d67ed74bc99..d67ed74bc99 100644
--- a/src/librustc_parse/parser/mod.rs
+++ b/compiler/rustc_parse/src/parser/mod.rs
diff --git a/src/librustc_parse/parser/nonterminal.rs b/compiler/rustc_parse/src/parser/nonterminal.rs
index f40cd1131d2..f40cd1131d2 100644
--- a/src/librustc_parse/parser/nonterminal.rs
+++ b/compiler/rustc_parse/src/parser/nonterminal.rs
diff --git a/src/librustc_parse/parser/pat.rs b/compiler/rustc_parse/src/parser/pat.rs
index 2c0133a24dc..2c0133a24dc 100644
--- a/src/librustc_parse/parser/pat.rs
+++ b/compiler/rustc_parse/src/parser/pat.rs
diff --git a/src/librustc_parse/parser/path.rs b/compiler/rustc_parse/src/parser/path.rs
index 54b4df8613f..54b4df8613f 100644
--- a/src/librustc_parse/parser/path.rs
+++ b/compiler/rustc_parse/src/parser/path.rs
diff --git a/src/librustc_parse/parser/stmt.rs b/compiler/rustc_parse/src/parser/stmt.rs
index ac067cb0eab..ac067cb0eab 100644
--- a/src/librustc_parse/parser/stmt.rs
+++ b/compiler/rustc_parse/src/parser/stmt.rs
diff --git a/src/librustc_parse/parser/ty.rs b/compiler/rustc_parse/src/parser/ty.rs
index 4356850818e..4356850818e 100644
--- a/src/librustc_parse/parser/ty.rs
+++ b/compiler/rustc_parse/src/parser/ty.rs
diff --git a/src/librustc_parse/validate_attr.rs b/compiler/rustc_parse/src/validate_attr.rs
index f4bb9610940..f4bb9610940 100644
--- a/src/librustc_parse/validate_attr.rs
+++ b/compiler/rustc_parse/src/validate_attr.rs
diff --git a/compiler/rustc_parse_format/Cargo.toml b/compiler/rustc_parse_format/Cargo.toml
new file mode 100644
index 00000000000..c2317d91a6e
--- /dev/null
+++ b/compiler/rustc_parse_format/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_parse_format"
+version = "0.0.0"
+edition = "2018"
+
+[dependencies]
+rustc_span = { path = "../rustc_span" }
+rustc_lexer = { path = "../rustc_lexer" }
diff --git a/src/librustc_parse_format/lib.rs b/compiler/rustc_parse_format/src/lib.rs
index e07b8b86aef..e07b8b86aef 100644
--- a/src/librustc_parse_format/lib.rs
+++ b/compiler/rustc_parse_format/src/lib.rs
diff --git a/src/librustc_parse_format/tests.rs b/compiler/rustc_parse_format/src/tests.rs
index 9fd0497fffe..9fd0497fffe 100644
--- a/src/librustc_parse_format/tests.rs
+++ b/compiler/rustc_parse_format/src/tests.rs
diff --git a/compiler/rustc_passes/Cargo.toml b/compiler/rustc_passes/Cargo.toml
new file mode 100644
index 00000000000..4c3a96eed04
--- /dev/null
+++ b/compiler/rustc_passes/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_passes"
+version = "0.0.0"
+edition = "2018"
+
+[dependencies]
+tracing = "0.1"
+rustc_middle = { path = "../rustc_middle" }
+rustc_attr = { path = "../rustc_attr" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_index = { path = "../rustc_index" }
+rustc_session = { path = "../rustc_session" }
+rustc_target = { path = "../rustc_target" }
+rustc_ast = { path = "../rustc_ast" }
+rustc_span = { path = "../rustc_span" }
+rustc_trait_selection = { path = "../rustc_trait_selection" }
diff --git a/src/librustc_passes/check_attr.rs b/compiler/rustc_passes/src/check_attr.rs
index 832cde86d0b..832cde86d0b 100644
--- a/src/librustc_passes/check_attr.rs
+++ b/compiler/rustc_passes/src/check_attr.rs
diff --git a/src/librustc_passes/check_const.rs b/compiler/rustc_passes/src/check_const.rs
index dd0bcbf208d..dd0bcbf208d 100644
--- a/src/librustc_passes/check_const.rs
+++ b/compiler/rustc_passes/src/check_const.rs
diff --git a/src/librustc_passes/dead.rs b/compiler/rustc_passes/src/dead.rs
index 01da33ddd2e..01da33ddd2e 100644
--- a/src/librustc_passes/dead.rs
+++ b/compiler/rustc_passes/src/dead.rs
diff --git a/src/librustc_passes/diagnostic_items.rs b/compiler/rustc_passes/src/diagnostic_items.rs
index df0f9f157ae..df0f9f157ae 100644
--- a/src/librustc_passes/diagnostic_items.rs
+++ b/compiler/rustc_passes/src/diagnostic_items.rs
diff --git a/src/librustc_passes/entry.rs b/compiler/rustc_passes/src/entry.rs
index 8aa6e7936be..8aa6e7936be 100644
--- a/src/librustc_passes/entry.rs
+++ b/compiler/rustc_passes/src/entry.rs
diff --git a/src/librustc_passes/hir_id_validator.rs b/compiler/rustc_passes/src/hir_id_validator.rs
index 2edbc29b7ef..2edbc29b7ef 100644
--- a/src/librustc_passes/hir_id_validator.rs
+++ b/compiler/rustc_passes/src/hir_id_validator.rs
diff --git a/src/librustc_passes/hir_stats.rs b/compiler/rustc_passes/src/hir_stats.rs
index 9537321026e..9537321026e 100644
--- a/src/librustc_passes/hir_stats.rs
+++ b/compiler/rustc_passes/src/hir_stats.rs
diff --git a/src/librustc_passes/intrinsicck.rs b/compiler/rustc_passes/src/intrinsicck.rs
index ebe231009d3..ebe231009d3 100644
--- a/src/librustc_passes/intrinsicck.rs
+++ b/compiler/rustc_passes/src/intrinsicck.rs
diff --git a/src/librustc_passes/lang_items.rs b/compiler/rustc_passes/src/lang_items.rs
index 0ae0c381a11..0ae0c381a11 100644
--- a/src/librustc_passes/lang_items.rs
+++ b/compiler/rustc_passes/src/lang_items.rs
diff --git a/src/librustc_passes/layout_test.rs b/compiler/rustc_passes/src/layout_test.rs
index 504cbbfcb76..504cbbfcb76 100644
--- a/src/librustc_passes/layout_test.rs
+++ b/compiler/rustc_passes/src/layout_test.rs
diff --git a/src/librustc_passes/lib.rs b/compiler/rustc_passes/src/lib.rs
index be4c542ec3a..be4c542ec3a 100644
--- a/src/librustc_passes/lib.rs
+++ b/compiler/rustc_passes/src/lib.rs
diff --git a/src/librustc_passes/lib_features.rs b/compiler/rustc_passes/src/lib_features.rs
index 7c62a234dba..7c62a234dba 100644
--- a/src/librustc_passes/lib_features.rs
+++ b/compiler/rustc_passes/src/lib_features.rs
diff --git a/src/librustc_passes/liveness.rs b/compiler/rustc_passes/src/liveness.rs
index 55525586479..55525586479 100644
--- a/src/librustc_passes/liveness.rs
+++ b/compiler/rustc_passes/src/liveness.rs
diff --git a/src/librustc_passes/loops.rs b/compiler/rustc_passes/src/loops.rs
index 9b4da71e5e9..9b4da71e5e9 100644
--- a/src/librustc_passes/loops.rs
+++ b/compiler/rustc_passes/src/loops.rs
diff --git a/src/librustc_passes/reachable.rs b/compiler/rustc_passes/src/reachable.rs
index 8d5c980609c..8d5c980609c 100644
--- a/src/librustc_passes/reachable.rs
+++ b/compiler/rustc_passes/src/reachable.rs
diff --git a/src/librustc_passes/region.rs b/compiler/rustc_passes/src/region.rs
index 1af79abe4b9..1af79abe4b9 100644
--- a/src/librustc_passes/region.rs
+++ b/compiler/rustc_passes/src/region.rs
diff --git a/src/librustc_passes/stability.rs b/compiler/rustc_passes/src/stability.rs
index 91edc7d9db7..91edc7d9db7 100644
--- a/src/librustc_passes/stability.rs
+++ b/compiler/rustc_passes/src/stability.rs
diff --git a/src/librustc_passes/upvars.rs b/compiler/rustc_passes/src/upvars.rs
index 91b8ae07637..91b8ae07637 100644
--- a/src/librustc_passes/upvars.rs
+++ b/compiler/rustc_passes/src/upvars.rs
diff --git a/src/librustc_passes/weak_lang_items.rs b/compiler/rustc_passes/src/weak_lang_items.rs
index 6bc2110bfb3..6bc2110bfb3 100644
--- a/src/librustc_passes/weak_lang_items.rs
+++ b/compiler/rustc_passes/src/weak_lang_items.rs
diff --git a/compiler/rustc_plugin_impl/Cargo.toml b/compiler/rustc_plugin_impl/Cargo.toml
new file mode 100644
index 00000000000..500d13a8c16
--- /dev/null
+++ b/compiler/rustc_plugin_impl/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_plugin_impl"
+version = "0.0.0"
+build = false
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+rustc_middle = { path = "../rustc_middle" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_lint = { path = "../rustc_lint" }
+rustc_metadata = { path = "../rustc_metadata" }
+rustc_ast = { path = "../rustc_ast" }
+rustc_session = { path = "../rustc_session" }
+rustc_span = { path = "../rustc_span" }
diff --git a/src/librustc_plugin_impl/build.rs b/compiler/rustc_plugin_impl/src/build.rs
index d16dd701a12..d16dd701a12 100644
--- a/src/librustc_plugin_impl/build.rs
+++ b/compiler/rustc_plugin_impl/src/build.rs
diff --git a/src/librustc_plugin_impl/lib.rs b/compiler/rustc_plugin_impl/src/lib.rs
index 1eb65dd96ba..1eb65dd96ba 100644
--- a/src/librustc_plugin_impl/lib.rs
+++ b/compiler/rustc_plugin_impl/src/lib.rs
diff --git a/src/librustc_plugin_impl/load.rs b/compiler/rustc_plugin_impl/src/load.rs
index 687f7db221f..687f7db221f 100644
--- a/src/librustc_plugin_impl/load.rs
+++ b/compiler/rustc_plugin_impl/src/load.rs
diff --git a/compiler/rustc_privacy/Cargo.toml b/compiler/rustc_privacy/Cargo.toml
new file mode 100644
index 00000000000..ce83dc1de78
--- /dev/null
+++ b/compiler/rustc_privacy/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_privacy"
+version = "0.0.0"
+edition = "2018"
+
+[dependencies]
+rustc_middle = { path = "../rustc_middle" }
+rustc_attr = { path = "../rustc_attr" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_typeck = { path = "../rustc_typeck" }
+rustc_session = { path = "../rustc_session" }
+rustc_span = { path = "../rustc_span" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+tracing = "0.1"
diff --git a/src/librustc_privacy/lib.rs b/compiler/rustc_privacy/src/lib.rs
index deb4277cb38..deb4277cb38 100644
--- a/src/librustc_privacy/lib.rs
+++ b/compiler/rustc_privacy/src/lib.rs
diff --git a/compiler/rustc_query_system/Cargo.toml b/compiler/rustc_query_system/Cargo.toml
new file mode 100644
index 00000000000..7defb00a881
--- /dev/null
+++ b/compiler/rustc_query_system/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_query_system"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+rustc_arena = { path = "../rustc_arena" }
+tracing = "0.1"
+rustc-rayon-core = "0.3.0"
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_macros = { path = "../rustc_macros" }
+rustc_index = { path = "../rustc_index" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_span = { path = "../rustc_span" }
+parking_lot = "0.10"
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_query_system/cache.rs b/compiler/rustc_query_system/src/cache.rs
index be3d3607728..be3d3607728 100644
--- a/src/librustc_query_system/cache.rs
+++ b/compiler/rustc_query_system/src/cache.rs
diff --git a/src/librustc_query_system/dep_graph/README.md b/compiler/rustc_query_system/src/dep_graph/README.md
index b9d91cd35a8..b9d91cd35a8 100644
--- a/src/librustc_query_system/dep_graph/README.md
+++ b/compiler/rustc_query_system/src/dep_graph/README.md
diff --git a/src/librustc_query_system/dep_graph/debug.rs b/compiler/rustc_query_system/src/dep_graph/debug.rs
index 718a2f1039a..718a2f1039a 100644
--- a/src/librustc_query_system/dep_graph/debug.rs
+++ b/compiler/rustc_query_system/src/dep_graph/debug.rs
diff --git a/src/librustc_query_system/dep_graph/dep_node.rs b/compiler/rustc_query_system/src/dep_graph/dep_node.rs
index e302784cc3e..e302784cc3e 100644
--- a/src/librustc_query_system/dep_graph/dep_node.rs
+++ b/compiler/rustc_query_system/src/dep_graph/dep_node.rs
diff --git a/src/librustc_query_system/dep_graph/graph.rs b/compiler/rustc_query_system/src/dep_graph/graph.rs
index d70306b4869..d70306b4869 100644
--- a/src/librustc_query_system/dep_graph/graph.rs
+++ b/compiler/rustc_query_system/src/dep_graph/graph.rs
diff --git a/src/librustc_query_system/dep_graph/mod.rs b/compiler/rustc_query_system/src/dep_graph/mod.rs
index e8d02692f37..e8d02692f37 100644
--- a/src/librustc_query_system/dep_graph/mod.rs
+++ b/compiler/rustc_query_system/src/dep_graph/mod.rs
diff --git a/src/librustc_query_system/dep_graph/prev.rs b/compiler/rustc_query_system/src/dep_graph/prev.rs
index 29357ce9449..29357ce9449 100644
--- a/src/librustc_query_system/dep_graph/prev.rs
+++ b/compiler/rustc_query_system/src/dep_graph/prev.rs
diff --git a/src/librustc_query_system/dep_graph/query.rs b/compiler/rustc_query_system/src/dep_graph/query.rs
index fb313d2658f..fb313d2658f 100644
--- a/src/librustc_query_system/dep_graph/query.rs
+++ b/compiler/rustc_query_system/src/dep_graph/query.rs
diff --git a/src/librustc_query_system/dep_graph/serialized.rs b/compiler/rustc_query_system/src/dep_graph/serialized.rs
index 932c6d2a2f1..932c6d2a2f1 100644
--- a/src/librustc_query_system/dep_graph/serialized.rs
+++ b/compiler/rustc_query_system/src/dep_graph/serialized.rs
diff --git a/src/librustc_query_system/lib.rs b/compiler/rustc_query_system/src/lib.rs
index 26b76a9c006..26b76a9c006 100644
--- a/src/librustc_query_system/lib.rs
+++ b/compiler/rustc_query_system/src/lib.rs
diff --git a/src/librustc_query_system/query/README.md b/compiler/rustc_query_system/src/query/README.md
index 8ec07b9fdeb..8ec07b9fdeb 100644
--- a/src/librustc_query_system/query/README.md
+++ b/compiler/rustc_query_system/src/query/README.md
diff --git a/src/librustc_query_system/query/caches.rs b/compiler/rustc_query_system/src/query/caches.rs
index 1839e1af45e..1839e1af45e 100644
--- a/src/librustc_query_system/query/caches.rs
+++ b/compiler/rustc_query_system/src/query/caches.rs
diff --git a/src/librustc_query_system/query/config.rs b/compiler/rustc_query_system/src/query/config.rs
index 549056570f9..549056570f9 100644
--- a/src/librustc_query_system/query/config.rs
+++ b/compiler/rustc_query_system/src/query/config.rs
diff --git a/src/librustc_query_system/query/job.rs b/compiler/rustc_query_system/src/query/job.rs
index 190312bb330..190312bb330 100644
--- a/src/librustc_query_system/query/job.rs
+++ b/compiler/rustc_query_system/src/query/job.rs
diff --git a/src/librustc_query_system/query/mod.rs b/compiler/rustc_query_system/src/query/mod.rs
index 49097725bc9..49097725bc9 100644
--- a/src/librustc_query_system/query/mod.rs
+++ b/compiler/rustc_query_system/src/query/mod.rs
diff --git a/src/librustc_query_system/query/plumbing.rs b/compiler/rustc_query_system/src/query/plumbing.rs
index ae042cc8081..ae042cc8081 100644
--- a/src/librustc_query_system/query/plumbing.rs
+++ b/compiler/rustc_query_system/src/query/plumbing.rs
diff --git a/compiler/rustc_resolve/Cargo.toml b/compiler/rustc_resolve/Cargo.toml
new file mode 100644
index 00000000000..821f9ea4738
--- /dev/null
+++ b/compiler/rustc_resolve/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_resolve"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+test = false
+doctest = false
+
+[dependencies]
+bitflags = "1.2.1"
+tracing = "0.1"
+rustc_ast = { path = "../rustc_ast" }
+rustc_arena = { path = "../rustc_arena" }
+rustc_middle = { path = "../rustc_middle" }
+rustc_ast_lowering = { path = "../rustc_ast_lowering" }
+rustc_ast_pretty = { path = "../rustc_ast_pretty" }
+rustc_attr = { path = "../rustc_attr" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_expand = { path = "../rustc_expand" }
+rustc_feature = { path = "../rustc_feature" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_index = { path = "../rustc_index" }
+rustc_metadata = { path = "../rustc_metadata" }
+rustc_session = { path = "../rustc_session" }
+rustc_span = { path = "../rustc_span" }
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_resolve/build_reduced_graph.rs b/compiler/rustc_resolve/src/build_reduced_graph.rs
index 761724be57d..761724be57d 100644
--- a/src/librustc_resolve/build_reduced_graph.rs
+++ b/compiler/rustc_resolve/src/build_reduced_graph.rs
diff --git a/src/librustc_resolve/check_unused.rs b/compiler/rustc_resolve/src/check_unused.rs
index 5624a6b6acc..5624a6b6acc 100644
--- a/src/librustc_resolve/check_unused.rs
+++ b/compiler/rustc_resolve/src/check_unused.rs
diff --git a/src/librustc_resolve/def_collector.rs b/compiler/rustc_resolve/src/def_collector.rs
index 5d5088de31b..5d5088de31b 100644
--- a/src/librustc_resolve/def_collector.rs
+++ b/compiler/rustc_resolve/src/def_collector.rs
diff --git a/src/librustc_resolve/diagnostics.rs b/compiler/rustc_resolve/src/diagnostics.rs
index 48e1068b8da..48e1068b8da 100644
--- a/src/librustc_resolve/diagnostics.rs
+++ b/compiler/rustc_resolve/src/diagnostics.rs
diff --git a/src/librustc_resolve/imports.rs b/compiler/rustc_resolve/src/imports.rs
index b02fc427d60..b02fc427d60 100644
--- a/src/librustc_resolve/imports.rs
+++ b/compiler/rustc_resolve/src/imports.rs
diff --git a/src/librustc_resolve/late.rs b/compiler/rustc_resolve/src/late.rs
index d113eb22aba..d113eb22aba 100644
--- a/src/librustc_resolve/late.rs
+++ b/compiler/rustc_resolve/src/late.rs
diff --git a/src/librustc_resolve/late/diagnostics.rs b/compiler/rustc_resolve/src/late/diagnostics.rs
index d392967af38..d392967af38 100644
--- a/src/librustc_resolve/late/diagnostics.rs
+++ b/compiler/rustc_resolve/src/late/diagnostics.rs
diff --git a/src/librustc_resolve/late/lifetimes.rs b/compiler/rustc_resolve/src/late/lifetimes.rs
index 31360d47473..31360d47473 100644
--- a/src/librustc_resolve/late/lifetimes.rs
+++ b/compiler/rustc_resolve/src/late/lifetimes.rs
diff --git a/src/librustc_resolve/lib.rs b/compiler/rustc_resolve/src/lib.rs
index 5892edf7652..5892edf7652 100644
--- a/src/librustc_resolve/lib.rs
+++ b/compiler/rustc_resolve/src/lib.rs
diff --git a/src/librustc_resolve/macros.rs b/compiler/rustc_resolve/src/macros.rs
index 51518d63ae9..51518d63ae9 100644
--- a/src/librustc_resolve/macros.rs
+++ b/compiler/rustc_resolve/src/macros.rs
diff --git a/compiler/rustc_save_analysis/Cargo.toml b/compiler/rustc_save_analysis/Cargo.toml
new file mode 100644
index 00000000000..da1bed37a96
--- /dev/null
+++ b/compiler/rustc_save_analysis/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_save_analysis"
+version = "0.0.0"
+edition = "2018"
+
+[dependencies]
+tracing = "0.1"
+rustc_middle = { path = "../rustc_middle" }
+rustc_ast = { path = "../rustc_ast" }
+rustc_ast_pretty = { path = "../rustc_ast_pretty" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_hir_pretty = { path = "../rustc_hir_pretty" }
+rustc_lexer = { path = "../rustc_lexer" }
+serde_json = "1"
+rustc_session = { path = "../rustc_session" }
+rustc_span = { path = "../rustc_span" }
+rls-data = "0.19"
+rls-span = "0.5"
diff --git a/src/librustc_save_analysis/dump_visitor.rs b/compiler/rustc_save_analysis/src/dump_visitor.rs
index ce484858cbb..ce484858cbb 100644
--- a/src/librustc_save_analysis/dump_visitor.rs
+++ b/compiler/rustc_save_analysis/src/dump_visitor.rs
diff --git a/src/librustc_save_analysis/dumper.rs b/compiler/rustc_save_analysis/src/dumper.rs
index 5a2628287d6..5a2628287d6 100644
--- a/src/librustc_save_analysis/dumper.rs
+++ b/compiler/rustc_save_analysis/src/dumper.rs
diff --git a/src/librustc_save_analysis/lib.rs b/compiler/rustc_save_analysis/src/lib.rs
index 629051c1820..629051c1820 100644
--- a/src/librustc_save_analysis/lib.rs
+++ b/compiler/rustc_save_analysis/src/lib.rs
diff --git a/src/librustc_save_analysis/sig.rs b/compiler/rustc_save_analysis/src/sig.rs
index 6dd7f89d594..6dd7f89d594 100644
--- a/src/librustc_save_analysis/sig.rs
+++ b/compiler/rustc_save_analysis/src/sig.rs
diff --git a/src/librustc_save_analysis/span_utils.rs b/compiler/rustc_save_analysis/src/span_utils.rs
index edcd4925773..edcd4925773 100644
--- a/src/librustc_save_analysis/span_utils.rs
+++ b/compiler/rustc_save_analysis/src/span_utils.rs
diff --git a/src/librustc_serialize/Cargo.toml b/compiler/rustc_serialize/Cargo.toml
index 939e6a59ba0..16c5dff7341 100644
--- a/src/librustc_serialize/Cargo.toml
+++ b/compiler/rustc_serialize/Cargo.toml
@@ -4,13 +4,9 @@ name = "rustc_serialize"
 version = "0.0.0"
 edition = "2018"
 
-[lib]
-name = "rustc_serialize"
-path = "lib.rs"
-
 [dependencies]
 indexmap = "1"
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
 
 [dev-dependencies]
-rustc_macros = { path = "../librustc_macros" }
+rustc_macros = { path = "../rustc_macros" }
diff --git a/src/librustc_serialize/collection_impls.rs b/compiler/rustc_serialize/src/collection_impls.rs
index 3d274cb0150..3d274cb0150 100644
--- a/src/librustc_serialize/collection_impls.rs
+++ b/compiler/rustc_serialize/src/collection_impls.rs
diff --git a/src/librustc_serialize/json.rs b/compiler/rustc_serialize/src/json.rs
index 6c8965aa2e3..6c8965aa2e3 100644
--- a/src/librustc_serialize/json.rs
+++ b/compiler/rustc_serialize/src/json.rs
diff --git a/src/librustc_serialize/json/tests.rs b/compiler/rustc_serialize/src/json/tests.rs
index 01678fbf0b7..01678fbf0b7 100644
--- a/src/librustc_serialize/json/tests.rs
+++ b/compiler/rustc_serialize/src/json/tests.rs
diff --git a/src/librustc_serialize/leb128.rs b/compiler/rustc_serialize/src/leb128.rs
index 1fe6a309e96..1fe6a309e96 100644
--- a/src/librustc_serialize/leb128.rs
+++ b/compiler/rustc_serialize/src/leb128.rs
diff --git a/src/librustc_serialize/lib.rs b/compiler/rustc_serialize/src/lib.rs
index 265b3b95e95..265b3b95e95 100644
--- a/src/librustc_serialize/lib.rs
+++ b/compiler/rustc_serialize/src/lib.rs
diff --git a/src/librustc_serialize/opaque.rs b/compiler/rustc_serialize/src/opaque.rs
index fa4423e261d..fa4423e261d 100644
--- a/src/librustc_serialize/opaque.rs
+++ b/compiler/rustc_serialize/src/opaque.rs
diff --git a/src/librustc_serialize/serialize.rs b/compiler/rustc_serialize/src/serialize.rs
index c0e23b89a60..c0e23b89a60 100644
--- a/src/librustc_serialize/serialize.rs
+++ b/compiler/rustc_serialize/src/serialize.rs
diff --git a/src/librustc_serialize/tests/json.rs b/compiler/rustc_serialize/tests/json.rs
index e3a823127d9..e3a823127d9 100644
--- a/src/librustc_serialize/tests/json.rs
+++ b/compiler/rustc_serialize/tests/json.rs
diff --git a/src/librustc_serialize/tests/leb128.rs b/compiler/rustc_serialize/tests/leb128.rs
index b0f7e785b78..b0f7e785b78 100644
--- a/src/librustc_serialize/tests/leb128.rs
+++ b/compiler/rustc_serialize/tests/leb128.rs
diff --git a/src/librustc_serialize/tests/opaque.rs b/compiler/rustc_serialize/tests/opaque.rs
index 13b3676a56c..13b3676a56c 100644
--- a/src/librustc_serialize/tests/opaque.rs
+++ b/compiler/rustc_serialize/tests/opaque.rs
diff --git a/compiler/rustc_session/Cargo.toml b/compiler/rustc_session/Cargo.toml
new file mode 100644
index 00000000000..cdff1662fdb
--- /dev/null
+++ b/compiler/rustc_session/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_session"
+version = "0.0.0"
+edition = "2018"
+
+[dependencies]
+bitflags = "1.2.1"
+getopts = "0.2"
+rustc_macros = { path = "../rustc_macros" }
+tracing = "0.1"
+rustc_errors = { path = "../rustc_errors" }
+rustc_feature = { path = "../rustc_feature" }
+rustc_target = { path = "../rustc_target" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_span = { path = "../rustc_span" }
+rustc_fs_util = { path = "../rustc_fs_util" }
+num_cpus = "1.0"
+rustc_ast = { path = "../rustc_ast" }
diff --git a/src/librustc_session/cgu_reuse_tracker.rs b/compiler/rustc_session/src/cgu_reuse_tracker.rs
index 0eec12aa03f..0eec12aa03f 100644
--- a/src/librustc_session/cgu_reuse_tracker.rs
+++ b/compiler/rustc_session/src/cgu_reuse_tracker.rs
diff --git a/src/librustc_session/code_stats.rs b/compiler/rustc_session/src/code_stats.rs
index c263da69c35..c263da69c35 100644
--- a/src/librustc_session/code_stats.rs
+++ b/compiler/rustc_session/src/code_stats.rs
diff --git a/src/librustc_session/config.rs b/compiler/rustc_session/src/config.rs
index 1808a0ca59b..1808a0ca59b 100644
--- a/src/librustc_session/config.rs
+++ b/compiler/rustc_session/src/config.rs
diff --git a/src/librustc_session/filesearch.rs b/compiler/rustc_session/src/filesearch.rs
index 284fca652ec..284fca652ec 100644
--- a/src/librustc_session/filesearch.rs
+++ b/compiler/rustc_session/src/filesearch.rs
diff --git a/src/librustc_session/lib.rs b/compiler/rustc_session/src/lib.rs
index c2ea141a06f..c2ea141a06f 100644
--- a/src/librustc_session/lib.rs
+++ b/compiler/rustc_session/src/lib.rs
diff --git a/src/librustc_session/lint.rs b/compiler/rustc_session/src/lint.rs
index 0dcbee08abe..0dcbee08abe 100644
--- a/src/librustc_session/lint.rs
+++ b/compiler/rustc_session/src/lint.rs
diff --git a/src/librustc_session/lint/builtin.rs b/compiler/rustc_session/src/lint/builtin.rs
index 2db4d2a7f51..2db4d2a7f51 100644
--- a/src/librustc_session/lint/builtin.rs
+++ b/compiler/rustc_session/src/lint/builtin.rs
diff --git a/src/librustc_session/options.rs b/compiler/rustc_session/src/options.rs
index d05f1a3f34b..d05f1a3f34b 100644
--- a/src/librustc_session/options.rs
+++ b/compiler/rustc_session/src/options.rs
diff --git a/src/librustc_session/output.rs b/compiler/rustc_session/src/output.rs
index bf9c96c6c94..bf9c96c6c94 100644
--- a/src/librustc_session/output.rs
+++ b/compiler/rustc_session/src/output.rs
diff --git a/src/librustc_session/parse.rs b/compiler/rustc_session/src/parse.rs
index 6f10d0c4b89..6f10d0c4b89 100644
--- a/src/librustc_session/parse.rs
+++ b/compiler/rustc_session/src/parse.rs
diff --git a/src/librustc_session/search_paths.rs b/compiler/rustc_session/src/search_paths.rs
index e12364b7dac..e12364b7dac 100644
--- a/src/librustc_session/search_paths.rs
+++ b/compiler/rustc_session/src/search_paths.rs
diff --git a/src/librustc_session/session.rs b/compiler/rustc_session/src/session.rs
index c006e593e47..c006e593e47 100644
--- a/src/librustc_session/session.rs
+++ b/compiler/rustc_session/src/session.rs
diff --git a/src/librustc_session/utils.rs b/compiler/rustc_session/src/utils.rs
index 15447c01d1e..15447c01d1e 100644
--- a/src/librustc_session/utils.rs
+++ b/compiler/rustc_session/src/utils.rs
diff --git a/compiler/rustc_span/Cargo.toml b/compiler/rustc_span/Cargo.toml
new file mode 100644
index 00000000000..1abfd50f003
--- /dev/null
+++ b/compiler/rustc_span/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_span"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_macros = { path = "../rustc_macros" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_index = { path = "../rustc_index" }
+rustc_arena = { path = "../rustc_arena" }
+scoped-tls = "1.0"
+unicode-width = "0.1.4"
+cfg-if = "0.1.2"
+tracing = "0.1"
+sha-1 = "0.8"
+md-5 = "0.8"
diff --git a/src/librustc_span/analyze_source_file.rs b/compiler/rustc_span/src/analyze_source_file.rs
index b4beb3dc376..b4beb3dc376 100644
--- a/src/librustc_span/analyze_source_file.rs
+++ b/compiler/rustc_span/src/analyze_source_file.rs
diff --git a/src/librustc_span/analyze_source_file/tests.rs b/compiler/rustc_span/src/analyze_source_file/tests.rs
index cb418a4bdaf..cb418a4bdaf 100644
--- a/src/librustc_span/analyze_source_file/tests.rs
+++ b/compiler/rustc_span/src/analyze_source_file/tests.rs
diff --git a/src/librustc_span/caching_source_map_view.rs b/compiler/rustc_span/src/caching_source_map_view.rs
index 68b0bd1a574..68b0bd1a574 100644
--- a/src/librustc_span/caching_source_map_view.rs
+++ b/compiler/rustc_span/src/caching_source_map_view.rs
diff --git a/src/librustc_span/def_id.rs b/compiler/rustc_span/src/def_id.rs
index aae778217d3..aae778217d3 100644
--- a/src/librustc_span/def_id.rs
+++ b/compiler/rustc_span/src/def_id.rs
diff --git a/src/librustc_span/edition.rs b/compiler/rustc_span/src/edition.rs
index 4d0c92f51d7..4d0c92f51d7 100644
--- a/src/librustc_span/edition.rs
+++ b/compiler/rustc_span/src/edition.rs
diff --git a/src/librustc_span/fatal_error.rs b/compiler/rustc_span/src/fatal_error.rs
index 718c0ddbc63..718c0ddbc63 100644
--- a/src/librustc_span/fatal_error.rs
+++ b/compiler/rustc_span/src/fatal_error.rs
diff --git a/src/librustc_span/hygiene.rs b/compiler/rustc_span/src/hygiene.rs
index 942c6648340..942c6648340 100644
--- a/src/librustc_span/hygiene.rs
+++ b/compiler/rustc_span/src/hygiene.rs
diff --git a/src/librustc_span/lib.rs b/compiler/rustc_span/src/lib.rs
index c654dade2ab..c654dade2ab 100644
--- a/src/librustc_span/lib.rs
+++ b/compiler/rustc_span/src/lib.rs
diff --git a/src/librustc_span/source_map.rs b/compiler/rustc_span/src/source_map.rs
index 7c656db22ed..7c656db22ed 100644
--- a/src/librustc_span/source_map.rs
+++ b/compiler/rustc_span/src/source_map.rs
diff --git a/src/librustc_span/source_map/tests.rs b/compiler/rustc_span/src/source_map/tests.rs
index b8459eee4ec..b8459eee4ec 100644
--- a/src/librustc_span/source_map/tests.rs
+++ b/compiler/rustc_span/src/source_map/tests.rs
diff --git a/src/librustc_span/span_encoding.rs b/compiler/rustc_span/src/span_encoding.rs
index b05e01d666b..b05e01d666b 100644
--- a/src/librustc_span/span_encoding.rs
+++ b/compiler/rustc_span/src/span_encoding.rs
diff --git a/src/librustc_span/symbol.rs b/compiler/rustc_span/src/symbol.rs
index 5092b945f72..5092b945f72 100644
--- a/src/librustc_span/symbol.rs
+++ b/compiler/rustc_span/src/symbol.rs
diff --git a/src/librustc_span/symbol/tests.rs b/compiler/rustc_span/src/symbol/tests.rs
index 47da03424b7..47da03424b7 100644
--- a/src/librustc_span/symbol/tests.rs
+++ b/compiler/rustc_span/src/symbol/tests.rs
diff --git a/src/librustc_span/tests.rs b/compiler/rustc_span/src/tests.rs
index 3c8eb8bcd31..3c8eb8bcd31 100644
--- a/src/librustc_span/tests.rs
+++ b/compiler/rustc_span/src/tests.rs
diff --git a/compiler/rustc_symbol_mangling/Cargo.toml b/compiler/rustc_symbol_mangling/Cargo.toml
new file mode 100644
index 00000000000..c0dacd24c38
--- /dev/null
+++ b/compiler/rustc_symbol_mangling/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_symbol_mangling"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+tracing = "0.1"
+punycode = "0.4.0"
+rustc-demangle = "0.1.16"
+
+rustc_ast = { path = "../rustc_ast" }
+rustc_span = { path = "../rustc_span" }
+rustc_middle = { path = "../rustc_middle" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_target = { path = "../rustc_target" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_session = { path = "../rustc_session" }
diff --git a/src/librustc_symbol_mangling/legacy.rs b/compiler/rustc_symbol_mangling/src/legacy.rs
index 24356844baf..24356844baf 100644
--- a/src/librustc_symbol_mangling/legacy.rs
+++ b/compiler/rustc_symbol_mangling/src/legacy.rs
diff --git a/src/librustc_symbol_mangling/lib.rs b/compiler/rustc_symbol_mangling/src/lib.rs
index 296b40c4e39..296b40c4e39 100644
--- a/src/librustc_symbol_mangling/lib.rs
+++ b/compiler/rustc_symbol_mangling/src/lib.rs
diff --git a/src/librustc_symbol_mangling/test.rs b/compiler/rustc_symbol_mangling/src/test.rs
index 24850a8a0d2..24850a8a0d2 100644
--- a/src/librustc_symbol_mangling/test.rs
+++ b/compiler/rustc_symbol_mangling/src/test.rs
diff --git a/src/librustc_symbol_mangling/v0.rs b/compiler/rustc_symbol_mangling/src/v0.rs
index f01c3da8b5f..f01c3da8b5f 100644
--- a/src/librustc_symbol_mangling/v0.rs
+++ b/compiler/rustc_symbol_mangling/src/v0.rs
diff --git a/compiler/rustc_target/Cargo.toml b/compiler/rustc_target/Cargo.toml
new file mode 100644
index 00000000000..2d7d9f1d82d
--- /dev/null
+++ b/compiler/rustc_target/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_target"
+version = "0.0.0"
+edition = "2018"
+
+[dependencies]
+bitflags = "1.2.1"
+tracing = "0.1"
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_macros = { path = "../rustc_macros" }
+rustc_serialize = { path = "../rustc_serialize" }
+rustc_span = { path = "../rustc_span" }
+rustc_index = { path = "../rustc_index" }
diff --git a/src/librustc_target/README.md b/compiler/rustc_target/README.md
index ac1e03385d1..ac1e03385d1 100644
--- a/src/librustc_target/README.md
+++ b/compiler/rustc_target/README.md
diff --git a/src/librustc_target/abi/call/aarch64.rs b/compiler/rustc_target/src/abi/call/aarch64.rs
index 1ab7722edab..1ab7722edab 100644
--- a/src/librustc_target/abi/call/aarch64.rs
+++ b/compiler/rustc_target/src/abi/call/aarch64.rs
diff --git a/src/librustc_target/abi/call/amdgpu.rs b/compiler/rustc_target/src/abi/call/amdgpu.rs
index 0b4f279fece..0b4f279fece 100644
--- a/src/librustc_target/abi/call/amdgpu.rs
+++ b/compiler/rustc_target/src/abi/call/amdgpu.rs
diff --git a/src/librustc_target/abi/call/arm.rs b/compiler/rustc_target/src/abi/call/arm.rs
index 26fed3bae4e..26fed3bae4e 100644
--- a/src/librustc_target/abi/call/arm.rs
+++ b/compiler/rustc_target/src/abi/call/arm.rs
diff --git a/src/librustc_target/abi/call/avr.rs b/compiler/rustc_target/src/abi/call/avr.rs
index c1f7a1e3af5..c1f7a1e3af5 100644
--- a/src/librustc_target/abi/call/avr.rs
+++ b/compiler/rustc_target/src/abi/call/avr.rs
diff --git a/src/librustc_target/abi/call/hexagon.rs b/compiler/rustc_target/src/abi/call/hexagon.rs
index 8028443b8a6..8028443b8a6 100644
--- a/src/librustc_target/abi/call/hexagon.rs
+++ b/compiler/rustc_target/src/abi/call/hexagon.rs
diff --git a/src/librustc_target/abi/call/mips.rs b/compiler/rustc_target/src/abi/call/mips.rs
index 733a7328bd3..733a7328bd3 100644
--- a/src/librustc_target/abi/call/mips.rs
+++ b/compiler/rustc_target/src/abi/call/mips.rs
diff --git a/src/librustc_target/abi/call/mips64.rs b/compiler/rustc_target/src/abi/call/mips64.rs
index 917dd104d14..917dd104d14 100644
--- a/src/librustc_target/abi/call/mips64.rs
+++ b/compiler/rustc_target/src/abi/call/mips64.rs
diff --git a/src/librustc_target/abi/call/mod.rs b/compiler/rustc_target/src/abi/call/mod.rs
index 8f7e2bba5aa..8f7e2bba5aa 100644
--- a/src/librustc_target/abi/call/mod.rs
+++ b/compiler/rustc_target/src/abi/call/mod.rs
diff --git a/src/librustc_target/abi/call/msp430.rs b/compiler/rustc_target/src/abi/call/msp430.rs
index 3004bb9ff5d..3004bb9ff5d 100644
--- a/src/librustc_target/abi/call/msp430.rs
+++ b/compiler/rustc_target/src/abi/call/msp430.rs
diff --git a/src/librustc_target/abi/call/nvptx.rs b/compiler/rustc_target/src/abi/call/nvptx.rs
index 693337f0e52..693337f0e52 100644
--- a/src/librustc_target/abi/call/nvptx.rs
+++ b/compiler/rustc_target/src/abi/call/nvptx.rs
diff --git a/src/librustc_target/abi/call/nvptx64.rs b/compiler/rustc_target/src/abi/call/nvptx64.rs
index b9c9296dbac..b9c9296dbac 100644
--- a/src/librustc_target/abi/call/nvptx64.rs
+++ b/compiler/rustc_target/src/abi/call/nvptx64.rs
diff --git a/src/librustc_target/abi/call/powerpc.rs b/compiler/rustc_target/src/abi/call/powerpc.rs
index 27a5c6d2fc6..27a5c6d2fc6 100644
--- a/src/librustc_target/abi/call/powerpc.rs
+++ b/compiler/rustc_target/src/abi/call/powerpc.rs
diff --git a/src/librustc_target/abi/call/powerpc64.rs b/compiler/rustc_target/src/abi/call/powerpc64.rs
index b740707320f..b740707320f 100644
--- a/src/librustc_target/abi/call/powerpc64.rs
+++ b/compiler/rustc_target/src/abi/call/powerpc64.rs
diff --git a/src/librustc_target/abi/call/riscv.rs b/compiler/rustc_target/src/abi/call/riscv.rs
index 2e10bed3bd4..2e10bed3bd4 100644
--- a/src/librustc_target/abi/call/riscv.rs
+++ b/compiler/rustc_target/src/abi/call/riscv.rs
diff --git a/src/librustc_target/abi/call/s390x.rs b/compiler/rustc_target/src/abi/call/s390x.rs
index 005dcc62dfd..005dcc62dfd 100644
--- a/src/librustc_target/abi/call/s390x.rs
+++ b/compiler/rustc_target/src/abi/call/s390x.rs
diff --git a/src/librustc_target/abi/call/sparc.rs b/compiler/rustc_target/src/abi/call/sparc.rs
index 733a7328bd3..733a7328bd3 100644
--- a/src/librustc_target/abi/call/sparc.rs
+++ b/compiler/rustc_target/src/abi/call/sparc.rs
diff --git a/src/librustc_target/abi/call/sparc64.rs b/compiler/rustc_target/src/abi/call/sparc64.rs
index a647675e073..a647675e073 100644
--- a/src/librustc_target/abi/call/sparc64.rs
+++ b/compiler/rustc_target/src/abi/call/sparc64.rs
diff --git a/src/librustc_target/abi/call/wasm32.rs b/compiler/rustc_target/src/abi/call/wasm32.rs
index 510f671a501..510f671a501 100644
--- a/src/librustc_target/abi/call/wasm32.rs
+++ b/compiler/rustc_target/src/abi/call/wasm32.rs
diff --git a/src/librustc_target/abi/call/wasm32_bindgen_compat.rs b/compiler/rustc_target/src/abi/call/wasm32_bindgen_compat.rs
index 59571fd9d48..59571fd9d48 100644
--- a/src/librustc_target/abi/call/wasm32_bindgen_compat.rs
+++ b/compiler/rustc_target/src/abi/call/wasm32_bindgen_compat.rs
diff --git a/src/librustc_target/abi/call/x86.rs b/compiler/rustc_target/src/abi/call/x86.rs
index df3dd5d9208..df3dd5d9208 100644
--- a/src/librustc_target/abi/call/x86.rs
+++ b/compiler/rustc_target/src/abi/call/x86.rs
diff --git a/src/librustc_target/abi/call/x86_64.rs b/compiler/rustc_target/src/abi/call/x86_64.rs
index 5f154dc1bc9..5f154dc1bc9 100644
--- a/src/librustc_target/abi/call/x86_64.rs
+++ b/compiler/rustc_target/src/abi/call/x86_64.rs
diff --git a/src/librustc_target/abi/call/x86_win64.rs b/compiler/rustc_target/src/abi/call/x86_win64.rs
index 2aad641b1ec..2aad641b1ec 100644
--- a/src/librustc_target/abi/call/x86_win64.rs
+++ b/compiler/rustc_target/src/abi/call/x86_win64.rs
diff --git a/src/librustc_target/abi/mod.rs b/compiler/rustc_target/src/abi/mod.rs
index 4b565dd246f..4b565dd246f 100644
--- a/src/librustc_target/abi/mod.rs
+++ b/compiler/rustc_target/src/abi/mod.rs
diff --git a/src/librustc_target/asm/aarch64.rs b/compiler/rustc_target/src/asm/aarch64.rs
index e7c9edea765..e7c9edea765 100644
--- a/src/librustc_target/asm/aarch64.rs
+++ b/compiler/rustc_target/src/asm/aarch64.rs
diff --git a/src/librustc_target/asm/arm.rs b/compiler/rustc_target/src/asm/arm.rs
index 85a136b94aa..85a136b94aa 100644
--- a/src/librustc_target/asm/arm.rs
+++ b/compiler/rustc_target/src/asm/arm.rs
diff --git a/src/librustc_target/asm/hexagon.rs b/compiler/rustc_target/src/asm/hexagon.rs
index d41941d0b4c..d41941d0b4c 100644
--- a/src/librustc_target/asm/hexagon.rs
+++ b/compiler/rustc_target/src/asm/hexagon.rs
diff --git a/src/librustc_target/asm/mod.rs b/compiler/rustc_target/src/asm/mod.rs
index c22644bf813..c22644bf813 100644
--- a/src/librustc_target/asm/mod.rs
+++ b/compiler/rustc_target/src/asm/mod.rs
diff --git a/src/librustc_target/asm/nvptx.rs b/compiler/rustc_target/src/asm/nvptx.rs
index 43d16ae0f5d..43d16ae0f5d 100644
--- a/src/librustc_target/asm/nvptx.rs
+++ b/compiler/rustc_target/src/asm/nvptx.rs
diff --git a/src/librustc_target/asm/riscv.rs b/compiler/rustc_target/src/asm/riscv.rs
index ced7483b005..ced7483b005 100644
--- a/src/librustc_target/asm/riscv.rs
+++ b/compiler/rustc_target/src/asm/riscv.rs
diff --git a/src/librustc_target/asm/x86.rs b/compiler/rustc_target/src/asm/x86.rs
index 0f62c19e1a3..0f62c19e1a3 100644
--- a/src/librustc_target/asm/x86.rs
+++ b/compiler/rustc_target/src/asm/x86.rs
diff --git a/src/librustc_target/lib.rs b/compiler/rustc_target/src/lib.rs
index 5788e1e8385..5788e1e8385 100644
--- a/src/librustc_target/lib.rs
+++ b/compiler/rustc_target/src/lib.rs
diff --git a/src/librustc_target/spec/aarch64_apple_darwin.rs b/compiler/rustc_target/src/spec/aarch64_apple_darwin.rs
index 60daf10b36a..60daf10b36a 100644
--- a/src/librustc_target/spec/aarch64_apple_darwin.rs
+++ b/compiler/rustc_target/src/spec/aarch64_apple_darwin.rs
diff --git a/src/librustc_target/spec/aarch64_apple_ios.rs b/compiler/rustc_target/src/spec/aarch64_apple_ios.rs
index 21dcec8d5e3..21dcec8d5e3 100644
--- a/src/librustc_target/spec/aarch64_apple_ios.rs
+++ b/compiler/rustc_target/src/spec/aarch64_apple_ios.rs
diff --git a/src/librustc_target/spec/aarch64_apple_tvos.rs b/compiler/rustc_target/src/spec/aarch64_apple_tvos.rs
index 2b0cd6cabf8..2b0cd6cabf8 100644
--- a/src/librustc_target/spec/aarch64_apple_tvos.rs
+++ b/compiler/rustc_target/src/spec/aarch64_apple_tvos.rs
diff --git a/src/librustc_target/spec/aarch64_fuchsia.rs b/compiler/rustc_target/src/spec/aarch64_fuchsia.rs
index aabfe458ca3..aabfe458ca3 100644
--- a/src/librustc_target/spec/aarch64_fuchsia.rs
+++ b/compiler/rustc_target/src/spec/aarch64_fuchsia.rs
diff --git a/src/librustc_target/spec/aarch64_linux_android.rs b/compiler/rustc_target/src/spec/aarch64_linux_android.rs
index e4ecc7ac2dc..e4ecc7ac2dc 100644
--- a/src/librustc_target/spec/aarch64_linux_android.rs
+++ b/compiler/rustc_target/src/spec/aarch64_linux_android.rs
diff --git a/src/librustc_target/spec/aarch64_pc_windows_msvc.rs b/compiler/rustc_target/src/spec/aarch64_pc_windows_msvc.rs
index 8c03f1e8a7e..8c03f1e8a7e 100644
--- a/src/librustc_target/spec/aarch64_pc_windows_msvc.rs
+++ b/compiler/rustc_target/src/spec/aarch64_pc_windows_msvc.rs
diff --git a/src/librustc_target/spec/aarch64_unknown_cloudabi.rs b/compiler/rustc_target/src/spec/aarch64_unknown_cloudabi.rs
index 1278b89c7fd..1278b89c7fd 100644
--- a/src/librustc_target/spec/aarch64_unknown_cloudabi.rs
+++ b/compiler/rustc_target/src/spec/aarch64_unknown_cloudabi.rs
diff --git a/src/librustc_target/spec/aarch64_unknown_freebsd.rs b/compiler/rustc_target/src/spec/aarch64_unknown_freebsd.rs
index 5ae592c5139..5ae592c5139 100644
--- a/src/librustc_target/spec/aarch64_unknown_freebsd.rs
+++ b/compiler/rustc_target/src/spec/aarch64_unknown_freebsd.rs
diff --git a/src/librustc_target/spec/aarch64_unknown_hermit.rs b/compiler/rustc_target/src/spec/aarch64_unknown_hermit.rs
index e07b8f7a756..e07b8f7a756 100644
--- a/src/librustc_target/spec/aarch64_unknown_hermit.rs
+++ b/compiler/rustc_target/src/spec/aarch64_unknown_hermit.rs
diff --git a/src/librustc_target/spec/aarch64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/aarch64_unknown_linux_gnu.rs
index 036162248c7..036162248c7 100644
--- a/src/librustc_target/spec/aarch64_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/aarch64_unknown_linux_gnu.rs
diff --git a/src/librustc_target/spec/aarch64_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/aarch64_unknown_linux_musl.rs
index dc613f35d1d..dc613f35d1d 100644
--- a/src/librustc_target/spec/aarch64_unknown_linux_musl.rs
+++ b/compiler/rustc_target/src/spec/aarch64_unknown_linux_musl.rs
diff --git a/src/librustc_target/spec/aarch64_unknown_netbsd.rs b/compiler/rustc_target/src/spec/aarch64_unknown_netbsd.rs
index 8c2f6fcff73..8c2f6fcff73 100644
--- a/src/librustc_target/spec/aarch64_unknown_netbsd.rs
+++ b/compiler/rustc_target/src/spec/aarch64_unknown_netbsd.rs
diff --git a/src/librustc_target/spec/aarch64_unknown_none.rs b/compiler/rustc_target/src/spec/aarch64_unknown_none.rs
index e012dce73fe..e012dce73fe 100644
--- a/src/librustc_target/spec/aarch64_unknown_none.rs
+++ b/compiler/rustc_target/src/spec/aarch64_unknown_none.rs
diff --git a/src/librustc_target/spec/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/aarch64_unknown_none_softfloat.rs
index e2aa6e3b8f5..e2aa6e3b8f5 100644
--- a/src/librustc_target/spec/aarch64_unknown_none_softfloat.rs
+++ b/compiler/rustc_target/src/spec/aarch64_unknown_none_softfloat.rs
diff --git a/src/librustc_target/spec/aarch64_unknown_openbsd.rs b/compiler/rustc_target/src/spec/aarch64_unknown_openbsd.rs
index fd726c70f49..fd726c70f49 100644
--- a/src/librustc_target/spec/aarch64_unknown_openbsd.rs
+++ b/compiler/rustc_target/src/spec/aarch64_unknown_openbsd.rs
diff --git a/src/librustc_target/spec/aarch64_unknown_redox.rs b/compiler/rustc_target/src/spec/aarch64_unknown_redox.rs
index f347a2dba53..f347a2dba53 100644
--- a/src/librustc_target/spec/aarch64_unknown_redox.rs
+++ b/compiler/rustc_target/src/spec/aarch64_unknown_redox.rs
diff --git a/src/librustc_target/spec/aarch64_uwp_windows_msvc.rs b/compiler/rustc_target/src/spec/aarch64_uwp_windows_msvc.rs
index 6a8d148259a..6a8d148259a 100644
--- a/src/librustc_target/spec/aarch64_uwp_windows_msvc.rs
+++ b/compiler/rustc_target/src/spec/aarch64_uwp_windows_msvc.rs
diff --git a/src/librustc_target/spec/aarch64_wrs_vxworks.rs b/compiler/rustc_target/src/spec/aarch64_wrs_vxworks.rs
index 05f5d7d3a8b..05f5d7d3a8b 100644
--- a/src/librustc_target/spec/aarch64_wrs_vxworks.rs
+++ b/compiler/rustc_target/src/spec/aarch64_wrs_vxworks.rs
diff --git a/src/librustc_target/spec/abi.rs b/compiler/rustc_target/src/spec/abi.rs
index 1e45739ca22..1e45739ca22 100644
--- a/src/librustc_target/spec/abi.rs
+++ b/compiler/rustc_target/src/spec/abi.rs
diff --git a/src/librustc_target/spec/abi/tests.rs b/compiler/rustc_target/src/spec/abi/tests.rs
index 8bea5e5efe3..8bea5e5efe3 100644
--- a/src/librustc_target/spec/abi/tests.rs
+++ b/compiler/rustc_target/src/spec/abi/tests.rs
diff --git a/src/librustc_target/spec/android_base.rs b/compiler/rustc_target/src/spec/android_base.rs
index 0ea99af83a1..0ea99af83a1 100644
--- a/src/librustc_target/spec/android_base.rs
+++ b/compiler/rustc_target/src/spec/android_base.rs
diff --git a/src/librustc_target/spec/apple_base.rs b/compiler/rustc_target/src/spec/apple_base.rs
index e7b565ae9ca..e7b565ae9ca 100644
--- a/src/librustc_target/spec/apple_base.rs
+++ b/compiler/rustc_target/src/spec/apple_base.rs
diff --git a/src/librustc_target/spec/apple_sdk_base.rs b/compiler/rustc_target/src/spec/apple_sdk_base.rs
index 0d0a0da9d1c..0d0a0da9d1c 100644
--- a/src/librustc_target/spec/apple_sdk_base.rs
+++ b/compiler/rustc_target/src/spec/apple_sdk_base.rs
diff --git a/src/librustc_target/spec/arm_base.rs b/compiler/rustc_target/src/spec/arm_base.rs
index b74d80dc6bb..b74d80dc6bb 100644
--- a/src/librustc_target/spec/arm_base.rs
+++ b/compiler/rustc_target/src/spec/arm_base.rs
diff --git a/src/librustc_target/spec/arm_linux_androideabi.rs b/compiler/rustc_target/src/spec/arm_linux_androideabi.rs
index 7109d043f51..7109d043f51 100644
--- a/src/librustc_target/spec/arm_linux_androideabi.rs
+++ b/compiler/rustc_target/src/spec/arm_linux_androideabi.rs
diff --git a/src/librustc_target/spec/arm_unknown_linux_gnueabi.rs b/compiler/rustc_target/src/spec/arm_unknown_linux_gnueabi.rs
index 2e3bad83e25..2e3bad83e25 100644
--- a/src/librustc_target/spec/arm_unknown_linux_gnueabi.rs
+++ b/compiler/rustc_target/src/spec/arm_unknown_linux_gnueabi.rs
diff --git a/src/librustc_target/spec/arm_unknown_linux_gnueabihf.rs b/compiler/rustc_target/src/spec/arm_unknown_linux_gnueabihf.rs
index f8e357cce66..f8e357cce66 100644
--- a/src/librustc_target/spec/arm_unknown_linux_gnueabihf.rs
+++ b/compiler/rustc_target/src/spec/arm_unknown_linux_gnueabihf.rs
diff --git a/src/librustc_target/spec/arm_unknown_linux_musleabi.rs b/compiler/rustc_target/src/spec/arm_unknown_linux_musleabi.rs
index 75753af9f30..75753af9f30 100644
--- a/src/librustc_target/spec/arm_unknown_linux_musleabi.rs
+++ b/compiler/rustc_target/src/spec/arm_unknown_linux_musleabi.rs
diff --git a/src/librustc_target/spec/arm_unknown_linux_musleabihf.rs b/compiler/rustc_target/src/spec/arm_unknown_linux_musleabihf.rs
index c74c88e3612..c74c88e3612 100644
--- a/src/librustc_target/spec/arm_unknown_linux_musleabihf.rs
+++ b/compiler/rustc_target/src/spec/arm_unknown_linux_musleabihf.rs
diff --git a/src/librustc_target/spec/armebv7r_none_eabi.rs b/compiler/rustc_target/src/spec/armebv7r_none_eabi.rs
index e0d1f2653ce..e0d1f2653ce 100644
--- a/src/librustc_target/spec/armebv7r_none_eabi.rs
+++ b/compiler/rustc_target/src/spec/armebv7r_none_eabi.rs
diff --git a/src/librustc_target/spec/armebv7r_none_eabihf.rs b/compiler/rustc_target/src/spec/armebv7r_none_eabihf.rs
index e2d37d45bf1..e2d37d45bf1 100644
--- a/src/librustc_target/spec/armebv7r_none_eabihf.rs
+++ b/compiler/rustc_target/src/spec/armebv7r_none_eabihf.rs
diff --git a/src/librustc_target/spec/armv4t_unknown_linux_gnueabi.rs b/compiler/rustc_target/src/spec/armv4t_unknown_linux_gnueabi.rs
index 2580e8b0f85..2580e8b0f85 100644
--- a/src/librustc_target/spec/armv4t_unknown_linux_gnueabi.rs
+++ b/compiler/rustc_target/src/spec/armv4t_unknown_linux_gnueabi.rs
diff --git a/src/librustc_target/spec/armv5te_unknown_linux_gnueabi.rs b/compiler/rustc_target/src/spec/armv5te_unknown_linux_gnueabi.rs
index f28421dc775..f28421dc775 100644
--- a/src/librustc_target/spec/armv5te_unknown_linux_gnueabi.rs
+++ b/compiler/rustc_target/src/spec/armv5te_unknown_linux_gnueabi.rs
diff --git a/src/librustc_target/spec/armv5te_unknown_linux_musleabi.rs b/compiler/rustc_target/src/spec/armv5te_unknown_linux_musleabi.rs
index fe1fa88883d..fe1fa88883d 100644
--- a/src/librustc_target/spec/armv5te_unknown_linux_musleabi.rs
+++ b/compiler/rustc_target/src/spec/armv5te_unknown_linux_musleabi.rs
diff --git a/src/librustc_target/spec/armv6_unknown_freebsd.rs b/compiler/rustc_target/src/spec/armv6_unknown_freebsd.rs
index 1e06f837997..1e06f837997 100644
--- a/src/librustc_target/spec/armv6_unknown_freebsd.rs
+++ b/compiler/rustc_target/src/spec/armv6_unknown_freebsd.rs
diff --git a/src/librustc_target/spec/armv6_unknown_netbsd_eabihf.rs b/compiler/rustc_target/src/spec/armv6_unknown_netbsd_eabihf.rs
index ef40085888c..ef40085888c 100644
--- a/src/librustc_target/spec/armv6_unknown_netbsd_eabihf.rs
+++ b/compiler/rustc_target/src/spec/armv6_unknown_netbsd_eabihf.rs
diff --git a/src/librustc_target/spec/armv7_apple_ios.rs b/compiler/rustc_target/src/spec/armv7_apple_ios.rs
index 393843526a8..393843526a8 100644
--- a/src/librustc_target/spec/armv7_apple_ios.rs
+++ b/compiler/rustc_target/src/spec/armv7_apple_ios.rs
diff --git a/src/librustc_target/spec/armv7_linux_androideabi.rs b/compiler/rustc_target/src/spec/armv7_linux_androideabi.rs
index 38c6c31bd10..38c6c31bd10 100644
--- a/src/librustc_target/spec/armv7_linux_androideabi.rs
+++ b/compiler/rustc_target/src/spec/armv7_linux_androideabi.rs
diff --git a/src/librustc_target/spec/armv7_unknown_cloudabi_eabihf.rs b/compiler/rustc_target/src/spec/armv7_unknown_cloudabi_eabihf.rs
index e3f4fe0b2ef..e3f4fe0b2ef 100644
--- a/src/librustc_target/spec/armv7_unknown_cloudabi_eabihf.rs
+++ b/compiler/rustc_target/src/spec/armv7_unknown_cloudabi_eabihf.rs
diff --git a/src/librustc_target/spec/armv7_unknown_freebsd.rs b/compiler/rustc_target/src/spec/armv7_unknown_freebsd.rs
index 80a9e6d7e3c..80a9e6d7e3c 100644
--- a/src/librustc_target/spec/armv7_unknown_freebsd.rs
+++ b/compiler/rustc_target/src/spec/armv7_unknown_freebsd.rs
diff --git a/src/librustc_target/spec/armv7_unknown_linux_gnueabi.rs b/compiler/rustc_target/src/spec/armv7_unknown_linux_gnueabi.rs
index 0f175e9aef5..0f175e9aef5 100644
--- a/src/librustc_target/spec/armv7_unknown_linux_gnueabi.rs
+++ b/compiler/rustc_target/src/spec/armv7_unknown_linux_gnueabi.rs
diff --git a/src/librustc_target/spec/armv7_unknown_linux_gnueabihf.rs b/compiler/rustc_target/src/spec/armv7_unknown_linux_gnueabihf.rs
index 27923457cd1..27923457cd1 100644
--- a/src/librustc_target/spec/armv7_unknown_linux_gnueabihf.rs
+++ b/compiler/rustc_target/src/spec/armv7_unknown_linux_gnueabihf.rs
diff --git a/src/librustc_target/spec/armv7_unknown_linux_musleabi.rs b/compiler/rustc_target/src/spec/armv7_unknown_linux_musleabi.rs
index 3d1bf05237f..3d1bf05237f 100644
--- a/src/librustc_target/spec/armv7_unknown_linux_musleabi.rs
+++ b/compiler/rustc_target/src/spec/armv7_unknown_linux_musleabi.rs
diff --git a/src/librustc_target/spec/armv7_unknown_linux_musleabihf.rs b/compiler/rustc_target/src/spec/armv7_unknown_linux_musleabihf.rs
index 03d7d88b0d6..03d7d88b0d6 100644
--- a/src/librustc_target/spec/armv7_unknown_linux_musleabihf.rs
+++ b/compiler/rustc_target/src/spec/armv7_unknown_linux_musleabihf.rs
diff --git a/src/librustc_target/spec/armv7_unknown_netbsd_eabihf.rs b/compiler/rustc_target/src/spec/armv7_unknown_netbsd_eabihf.rs
index 18fc9ed2ec6..18fc9ed2ec6 100644
--- a/src/librustc_target/spec/armv7_unknown_netbsd_eabihf.rs
+++ b/compiler/rustc_target/src/spec/armv7_unknown_netbsd_eabihf.rs
diff --git a/src/librustc_target/spec/armv7_wrs_vxworks_eabihf.rs b/compiler/rustc_target/src/spec/armv7_wrs_vxworks_eabihf.rs
index 04d8702471a..04d8702471a 100644
--- a/src/librustc_target/spec/armv7_wrs_vxworks_eabihf.rs
+++ b/compiler/rustc_target/src/spec/armv7_wrs_vxworks_eabihf.rs
diff --git a/src/librustc_target/spec/armv7a_none_eabi.rs b/compiler/rustc_target/src/spec/armv7a_none_eabi.rs
index 1db279defff..1db279defff 100644
--- a/src/librustc_target/spec/armv7a_none_eabi.rs
+++ b/compiler/rustc_target/src/spec/armv7a_none_eabi.rs
diff --git a/src/librustc_target/spec/armv7a_none_eabihf.rs b/compiler/rustc_target/src/spec/armv7a_none_eabihf.rs
index 22c2b306b43..22c2b306b43 100644
--- a/src/librustc_target/spec/armv7a_none_eabihf.rs
+++ b/compiler/rustc_target/src/spec/armv7a_none_eabihf.rs
diff --git a/src/librustc_target/spec/armv7r_none_eabi.rs b/compiler/rustc_target/src/spec/armv7r_none_eabi.rs
index fed83997190..fed83997190 100644
--- a/src/librustc_target/spec/armv7r_none_eabi.rs
+++ b/compiler/rustc_target/src/spec/armv7r_none_eabi.rs
diff --git a/src/librustc_target/spec/armv7r_none_eabihf.rs b/compiler/rustc_target/src/spec/armv7r_none_eabihf.rs
index 769ac13e515..769ac13e515 100644
--- a/src/librustc_target/spec/armv7r_none_eabihf.rs
+++ b/compiler/rustc_target/src/spec/armv7r_none_eabihf.rs
diff --git a/src/librustc_target/spec/armv7s_apple_ios.rs b/compiler/rustc_target/src/spec/armv7s_apple_ios.rs
index 998a7b2e164..998a7b2e164 100644
--- a/src/librustc_target/spec/armv7s_apple_ios.rs
+++ b/compiler/rustc_target/src/spec/armv7s_apple_ios.rs
diff --git a/src/librustc_target/spec/asmjs_unknown_emscripten.rs b/compiler/rustc_target/src/spec/asmjs_unknown_emscripten.rs
index d3dbc39c99d..d3dbc39c99d 100644
--- a/src/librustc_target/spec/asmjs_unknown_emscripten.rs
+++ b/compiler/rustc_target/src/spec/asmjs_unknown_emscripten.rs
diff --git a/src/librustc_target/spec/avr_gnu_base.rs b/compiler/rustc_target/src/spec/avr_gnu_base.rs
index ff559c2bfd6..ff559c2bfd6 100644
--- a/src/librustc_target/spec/avr_gnu_base.rs
+++ b/compiler/rustc_target/src/spec/avr_gnu_base.rs
diff --git a/src/librustc_target/spec/avr_unknown_gnu_atmega328.rs b/compiler/rustc_target/src/spec/avr_unknown_gnu_atmega328.rs
index 5d22598b57b..5d22598b57b 100644
--- a/src/librustc_target/spec/avr_unknown_gnu_atmega328.rs
+++ b/compiler/rustc_target/src/spec/avr_unknown_gnu_atmega328.rs
diff --git a/src/librustc_target/spec/cloudabi_base.rs b/compiler/rustc_target/src/spec/cloudabi_base.rs
index 39039435f58..39039435f58 100644
--- a/src/librustc_target/spec/cloudabi_base.rs
+++ b/compiler/rustc_target/src/spec/cloudabi_base.rs
diff --git a/src/librustc_target/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs
index 8991691a9a3..8991691a9a3 100644
--- a/src/librustc_target/spec/crt_objects.rs
+++ b/compiler/rustc_target/src/spec/crt_objects.rs
diff --git a/src/librustc_target/spec/dragonfly_base.rs b/compiler/rustc_target/src/spec/dragonfly_base.rs
index c7062e1ca51..c7062e1ca51 100644
--- a/src/librustc_target/spec/dragonfly_base.rs
+++ b/compiler/rustc_target/src/spec/dragonfly_base.rs
diff --git a/src/librustc_target/spec/freebsd_base.rs b/compiler/rustc_target/src/spec/freebsd_base.rs
index d2a087ab62f..d2a087ab62f 100644
--- a/src/librustc_target/spec/freebsd_base.rs
+++ b/compiler/rustc_target/src/spec/freebsd_base.rs
diff --git a/src/librustc_target/spec/fuchsia_base.rs b/compiler/rustc_target/src/spec/fuchsia_base.rs
index 6f432dc1171..6f432dc1171 100644
--- a/src/librustc_target/spec/fuchsia_base.rs
+++ b/compiler/rustc_target/src/spec/fuchsia_base.rs
diff --git a/src/librustc_target/spec/haiku_base.rs b/compiler/rustc_target/src/spec/haiku_base.rs
index 3d7ae6c302d..3d7ae6c302d 100644
--- a/src/librustc_target/spec/haiku_base.rs
+++ b/compiler/rustc_target/src/spec/haiku_base.rs
diff --git a/src/librustc_target/spec/hermit_base.rs b/compiler/rustc_target/src/spec/hermit_base.rs
index e063c94cf2c..e063c94cf2c 100644
--- a/src/librustc_target/spec/hermit_base.rs
+++ b/compiler/rustc_target/src/spec/hermit_base.rs
diff --git a/src/librustc_target/spec/hermit_kernel_base.rs b/compiler/rustc_target/src/spec/hermit_kernel_base.rs
index 01b9f75637f..01b9f75637f 100644
--- a/src/librustc_target/spec/hermit_kernel_base.rs
+++ b/compiler/rustc_target/src/spec/hermit_kernel_base.rs
diff --git a/src/librustc_target/spec/hexagon_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/hexagon_unknown_linux_musl.rs
index 0976acb4fb0..0976acb4fb0 100644
--- a/src/librustc_target/spec/hexagon_unknown_linux_musl.rs
+++ b/compiler/rustc_target/src/spec/hexagon_unknown_linux_musl.rs
diff --git a/src/librustc_target/spec/i386_apple_ios.rs b/compiler/rustc_target/src/spec/i386_apple_ios.rs
index a121d49769d..a121d49769d 100644
--- a/src/librustc_target/spec/i386_apple_ios.rs
+++ b/compiler/rustc_target/src/spec/i386_apple_ios.rs
diff --git a/src/librustc_target/spec/i586_pc_windows_msvc.rs b/compiler/rustc_target/src/spec/i586_pc_windows_msvc.rs
index ba712aced84..ba712aced84 100644
--- a/src/librustc_target/spec/i586_pc_windows_msvc.rs
+++ b/compiler/rustc_target/src/spec/i586_pc_windows_msvc.rs
diff --git a/src/librustc_target/spec/i586_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/i586_unknown_linux_gnu.rs
index 49f4f2cb6b9..49f4f2cb6b9 100644
--- a/src/librustc_target/spec/i586_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/i586_unknown_linux_gnu.rs
diff --git a/src/librustc_target/spec/i586_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/i586_unknown_linux_musl.rs
index 0f2ccebd6da..0f2ccebd6da 100644
--- a/src/librustc_target/spec/i586_unknown_linux_musl.rs
+++ b/compiler/rustc_target/src/spec/i586_unknown_linux_musl.rs
diff --git a/src/librustc_target/spec/i686_apple_darwin.rs b/compiler/rustc_target/src/spec/i686_apple_darwin.rs
index b7a34f9740a..b7a34f9740a 100644
--- a/src/librustc_target/spec/i686_apple_darwin.rs
+++ b/compiler/rustc_target/src/spec/i686_apple_darwin.rs
diff --git a/src/librustc_target/spec/i686_linux_android.rs b/compiler/rustc_target/src/spec/i686_linux_android.rs
index 79242f24026..79242f24026 100644
--- a/src/librustc_target/spec/i686_linux_android.rs
+++ b/compiler/rustc_target/src/spec/i686_linux_android.rs
diff --git a/src/librustc_target/spec/i686_pc_windows_gnu.rs b/compiler/rustc_target/src/spec/i686_pc_windows_gnu.rs
index 33c9008bb14..33c9008bb14 100644
--- a/src/librustc_target/spec/i686_pc_windows_gnu.rs
+++ b/compiler/rustc_target/src/spec/i686_pc_windows_gnu.rs
diff --git a/src/librustc_target/spec/i686_pc_windows_msvc.rs b/compiler/rustc_target/src/spec/i686_pc_windows_msvc.rs
index 9d0922b8ce5..9d0922b8ce5 100644
--- a/src/librustc_target/spec/i686_pc_windows_msvc.rs
+++ b/compiler/rustc_target/src/spec/i686_pc_windows_msvc.rs
diff --git a/src/librustc_target/spec/i686_unknown_cloudabi.rs b/compiler/rustc_target/src/spec/i686_unknown_cloudabi.rs
index 729b1f68e00..729b1f68e00 100644
--- a/src/librustc_target/spec/i686_unknown_cloudabi.rs
+++ b/compiler/rustc_target/src/spec/i686_unknown_cloudabi.rs
diff --git a/src/librustc_target/spec/i686_unknown_freebsd.rs b/compiler/rustc_target/src/spec/i686_unknown_freebsd.rs
index 60f2188514e..60f2188514e 100644
--- a/src/librustc_target/spec/i686_unknown_freebsd.rs
+++ b/compiler/rustc_target/src/spec/i686_unknown_freebsd.rs
diff --git a/src/librustc_target/spec/i686_unknown_haiku.rs b/compiler/rustc_target/src/spec/i686_unknown_haiku.rs
index 4dc27af30da..4dc27af30da 100644
--- a/src/librustc_target/spec/i686_unknown_haiku.rs
+++ b/compiler/rustc_target/src/spec/i686_unknown_haiku.rs
diff --git a/src/librustc_target/spec/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
index 0d578f22f98..0d578f22f98 100644
--- a/src/librustc_target/spec/i686_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
diff --git a/src/librustc_target/spec/i686_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/i686_unknown_linux_musl.rs
index 699a0ab45e8..699a0ab45e8 100644
--- a/src/librustc_target/spec/i686_unknown_linux_musl.rs
+++ b/compiler/rustc_target/src/spec/i686_unknown_linux_musl.rs
diff --git a/src/librustc_target/spec/i686_unknown_netbsd.rs b/compiler/rustc_target/src/spec/i686_unknown_netbsd.rs
index 88b1ae7d53c..88b1ae7d53c 100644
--- a/src/librustc_target/spec/i686_unknown_netbsd.rs
+++ b/compiler/rustc_target/src/spec/i686_unknown_netbsd.rs
diff --git a/src/librustc_target/spec/i686_unknown_openbsd.rs b/compiler/rustc_target/src/spec/i686_unknown_openbsd.rs
index 829cd1ac1a3..829cd1ac1a3 100644
--- a/src/librustc_target/spec/i686_unknown_openbsd.rs
+++ b/compiler/rustc_target/src/spec/i686_unknown_openbsd.rs
diff --git a/src/librustc_target/spec/i686_unknown_uefi.rs b/compiler/rustc_target/src/spec/i686_unknown_uefi.rs
index 221d5f0785c..221d5f0785c 100644
--- a/src/librustc_target/spec/i686_unknown_uefi.rs
+++ b/compiler/rustc_target/src/spec/i686_unknown_uefi.rs
diff --git a/src/librustc_target/spec/i686_uwp_windows_gnu.rs b/compiler/rustc_target/src/spec/i686_uwp_windows_gnu.rs
index 1c6d2e061bc..1c6d2e061bc 100644
--- a/src/librustc_target/spec/i686_uwp_windows_gnu.rs
+++ b/compiler/rustc_target/src/spec/i686_uwp_windows_gnu.rs
diff --git a/src/librustc_target/spec/i686_uwp_windows_msvc.rs b/compiler/rustc_target/src/spec/i686_uwp_windows_msvc.rs
index ed2dba53589..ed2dba53589 100644
--- a/src/librustc_target/spec/i686_uwp_windows_msvc.rs
+++ b/compiler/rustc_target/src/spec/i686_uwp_windows_msvc.rs
diff --git a/src/librustc_target/spec/i686_wrs_vxworks.rs b/compiler/rustc_target/src/spec/i686_wrs_vxworks.rs
index f5f66cabb2c..f5f66cabb2c 100644
--- a/src/librustc_target/spec/i686_wrs_vxworks.rs
+++ b/compiler/rustc_target/src/spec/i686_wrs_vxworks.rs
diff --git a/src/librustc_target/spec/illumos_base.rs b/compiler/rustc_target/src/spec/illumos_base.rs
index 214142b88fc..214142b88fc 100644
--- a/src/librustc_target/spec/illumos_base.rs
+++ b/compiler/rustc_target/src/spec/illumos_base.rs
diff --git a/src/librustc_target/spec/l4re_base.rs b/compiler/rustc_target/src/spec/l4re_base.rs
index 5caad10161d..5caad10161d 100644
--- a/src/librustc_target/spec/l4re_base.rs
+++ b/compiler/rustc_target/src/spec/l4re_base.rs
diff --git a/src/librustc_target/spec/linux_base.rs b/compiler/rustc_target/src/spec/linux_base.rs
index 52892fc3592..52892fc3592 100644
--- a/src/librustc_target/spec/linux_base.rs
+++ b/compiler/rustc_target/src/spec/linux_base.rs
diff --git a/src/librustc_target/spec/linux_kernel_base.rs b/compiler/rustc_target/src/spec/linux_kernel_base.rs
index 6d929d12447..6d929d12447 100644
--- a/src/librustc_target/spec/linux_kernel_base.rs
+++ b/compiler/rustc_target/src/spec/linux_kernel_base.rs
diff --git a/src/librustc_target/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs
index b90e91d2901..b90e91d2901 100644
--- a/src/librustc_target/spec/linux_musl_base.rs
+++ b/compiler/rustc_target/src/spec/linux_musl_base.rs
diff --git a/src/librustc_target/spec/mips64_unknown_linux_gnuabi64.rs b/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs
index b2ea8a6f388..b2ea8a6f388 100644
--- a/src/librustc_target/spec/mips64_unknown_linux_gnuabi64.rs
+++ b/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs
diff --git a/src/librustc_target/spec/mips64_unknown_linux_muslabi64.rs b/compiler/rustc_target/src/spec/mips64_unknown_linux_muslabi64.rs
index 17584de1144..17584de1144 100644
--- a/src/librustc_target/spec/mips64_unknown_linux_muslabi64.rs
+++ b/compiler/rustc_target/src/spec/mips64_unknown_linux_muslabi64.rs
diff --git a/src/librustc_target/spec/mips64el_unknown_linux_gnuabi64.rs b/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs
index 48aea4a39b0..48aea4a39b0 100644
--- a/src/librustc_target/spec/mips64el_unknown_linux_gnuabi64.rs
+++ b/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs
diff --git a/src/librustc_target/spec/mips64el_unknown_linux_muslabi64.rs b/compiler/rustc_target/src/spec/mips64el_unknown_linux_muslabi64.rs
index c7a849a1641..c7a849a1641 100644
--- a/src/librustc_target/spec/mips64el_unknown_linux_muslabi64.rs
+++ b/compiler/rustc_target/src/spec/mips64el_unknown_linux_muslabi64.rs
diff --git a/src/librustc_target/spec/mips_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/mips_unknown_linux_gnu.rs
index e360abdb38d..e360abdb38d 100644
--- a/src/librustc_target/spec/mips_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/mips_unknown_linux_gnu.rs
diff --git a/src/librustc_target/spec/mips_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/mips_unknown_linux_musl.rs
index c8d97e600d4..c8d97e600d4 100644
--- a/src/librustc_target/spec/mips_unknown_linux_musl.rs
+++ b/compiler/rustc_target/src/spec/mips_unknown_linux_musl.rs
diff --git a/src/librustc_target/spec/mips_unknown_linux_uclibc.rs b/compiler/rustc_target/src/spec/mips_unknown_linux_uclibc.rs
index 8116b8c9cc8..8116b8c9cc8 100644
--- a/src/librustc_target/spec/mips_unknown_linux_uclibc.rs
+++ b/compiler/rustc_target/src/spec/mips_unknown_linux_uclibc.rs
diff --git a/src/librustc_target/spec/mipsel_sony_psp.rs b/compiler/rustc_target/src/spec/mipsel_sony_psp.rs
index b3bda97c8a5..b3bda97c8a5 100644
--- a/src/librustc_target/spec/mipsel_sony_psp.rs
+++ b/compiler/rustc_target/src/spec/mipsel_sony_psp.rs
diff --git a/src/librustc_target/spec/mipsel_sony_psp_linker_script.ld b/compiler/rustc_target/src/spec/mipsel_sony_psp_linker_script.ld
index 1bd436d6f94..1bd436d6f94 100644
--- a/src/librustc_target/spec/mipsel_sony_psp_linker_script.ld
+++ b/compiler/rustc_target/src/spec/mipsel_sony_psp_linker_script.ld
diff --git a/src/librustc_target/spec/mipsel_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/mipsel_unknown_linux_gnu.rs
index 7e9d8cd942a..7e9d8cd942a 100644
--- a/src/librustc_target/spec/mipsel_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/mipsel_unknown_linux_gnu.rs
diff --git a/src/librustc_target/spec/mipsel_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/mipsel_unknown_linux_musl.rs
index f70cc13224f..f70cc13224f 100644
--- a/src/librustc_target/spec/mipsel_unknown_linux_musl.rs
+++ b/compiler/rustc_target/src/spec/mipsel_unknown_linux_musl.rs
diff --git a/src/librustc_target/spec/mipsel_unknown_linux_uclibc.rs b/compiler/rustc_target/src/spec/mipsel_unknown_linux_uclibc.rs
index a8152011efa..a8152011efa 100644
--- a/src/librustc_target/spec/mipsel_unknown_linux_uclibc.rs
+++ b/compiler/rustc_target/src/spec/mipsel_unknown_linux_uclibc.rs
diff --git a/src/librustc_target/spec/mipsisa32r6_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/mipsisa32r6_unknown_linux_gnu.rs
index 36b83c63fca..36b83c63fca 100644
--- a/src/librustc_target/spec/mipsisa32r6_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/mipsisa32r6_unknown_linux_gnu.rs
diff --git a/src/librustc_target/spec/mipsisa32r6el_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/mipsisa32r6el_unknown_linux_gnu.rs
index 717ae3f1d20..717ae3f1d20 100644
--- a/src/librustc_target/spec/mipsisa32r6el_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/mipsisa32r6el_unknown_linux_gnu.rs
diff --git a/src/librustc_target/spec/mipsisa64r6_unknown_linux_gnuabi64.rs b/compiler/rustc_target/src/spec/mipsisa64r6_unknown_linux_gnuabi64.rs
index 3f7d233e55f..3f7d233e55f 100644
--- a/src/librustc_target/spec/mipsisa64r6_unknown_linux_gnuabi64.rs
+++ b/compiler/rustc_target/src/spec/mipsisa64r6_unknown_linux_gnuabi64.rs
diff --git a/src/librustc_target/spec/mipsisa64r6el_unknown_linux_gnuabi64.rs b/compiler/rustc_target/src/spec/mipsisa64r6el_unknown_linux_gnuabi64.rs
index 4f41b8323a9..4f41b8323a9 100644
--- a/src/librustc_target/spec/mipsisa64r6el_unknown_linux_gnuabi64.rs
+++ b/compiler/rustc_target/src/spec/mipsisa64r6el_unknown_linux_gnuabi64.rs
diff --git a/src/librustc_target/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
index d6e8b304380..d6e8b304380 100644
--- a/src/librustc_target/spec/mod.rs
+++ b/compiler/rustc_target/src/spec/mod.rs
diff --git a/src/librustc_target/spec/msp430_none_elf.rs b/compiler/rustc_target/src/spec/msp430_none_elf.rs
index f75697996ac..f75697996ac 100644
--- a/src/librustc_target/spec/msp430_none_elf.rs
+++ b/compiler/rustc_target/src/spec/msp430_none_elf.rs
diff --git a/src/librustc_target/spec/msvc_base.rs b/compiler/rustc_target/src/spec/msvc_base.rs
index f57ef87cf12..f57ef87cf12 100644
--- a/src/librustc_target/spec/msvc_base.rs
+++ b/compiler/rustc_target/src/spec/msvc_base.rs
diff --git a/src/librustc_target/spec/netbsd_base.rs b/compiler/rustc_target/src/spec/netbsd_base.rs
index 988346af2d7..988346af2d7 100644
--- a/src/librustc_target/spec/netbsd_base.rs
+++ b/compiler/rustc_target/src/spec/netbsd_base.rs
diff --git a/src/librustc_target/spec/nvptx64_nvidia_cuda.rs b/compiler/rustc_target/src/spec/nvptx64_nvidia_cuda.rs
index 0c8f2a34301..0c8f2a34301 100644
--- a/src/librustc_target/spec/nvptx64_nvidia_cuda.rs
+++ b/compiler/rustc_target/src/spec/nvptx64_nvidia_cuda.rs
diff --git a/src/librustc_target/spec/openbsd_base.rs b/compiler/rustc_target/src/spec/openbsd_base.rs
index cadd14df693..cadd14df693 100644
--- a/src/librustc_target/spec/openbsd_base.rs
+++ b/compiler/rustc_target/src/spec/openbsd_base.rs
diff --git a/src/librustc_target/spec/powerpc64_unknown_freebsd.rs b/compiler/rustc_target/src/spec/powerpc64_unknown_freebsd.rs
index 60c15d6b7d2..60c15d6b7d2 100644
--- a/src/librustc_target/spec/powerpc64_unknown_freebsd.rs
+++ b/compiler/rustc_target/src/spec/powerpc64_unknown_freebsd.rs
diff --git a/src/librustc_target/spec/powerpc64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs
index 5306d905c5d..5306d905c5d 100644
--- a/src/librustc_target/spec/powerpc64_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/powerpc64_unknown_linux_gnu.rs
diff --git a/src/librustc_target/spec/powerpc64_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc64_unknown_linux_musl.rs
index c3b956effae..c3b956effae 100644
--- a/src/librustc_target/spec/powerpc64_unknown_linux_musl.rs
+++ b/compiler/rustc_target/src/spec/powerpc64_unknown_linux_musl.rs
diff --git a/src/librustc_target/spec/powerpc64_wrs_vxworks.rs b/compiler/rustc_target/src/spec/powerpc64_wrs_vxworks.rs
index e00a927c3a4..e00a927c3a4 100644
--- a/src/librustc_target/spec/powerpc64_wrs_vxworks.rs
+++ b/compiler/rustc_target/src/spec/powerpc64_wrs_vxworks.rs
diff --git a/src/librustc_target/spec/powerpc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs
index 90737994612..90737994612 100644
--- a/src/librustc_target/spec/powerpc64le_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs
diff --git a/src/librustc_target/spec/powerpc64le_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_musl.rs
index 1a1fccfab02..1a1fccfab02 100644
--- a/src/librustc_target/spec/powerpc64le_unknown_linux_musl.rs
+++ b/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_musl.rs
diff --git a/src/librustc_target/spec/powerpc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/powerpc_unknown_linux_gnu.rs
index 2d4c5986637..2d4c5986637 100644
--- a/src/librustc_target/spec/powerpc_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/powerpc_unknown_linux_gnu.rs
diff --git a/src/librustc_target/spec/powerpc_unknown_linux_gnuspe.rs b/compiler/rustc_target/src/spec/powerpc_unknown_linux_gnuspe.rs
index fabc4313bee..fabc4313bee 100644
--- a/src/librustc_target/spec/powerpc_unknown_linux_gnuspe.rs
+++ b/compiler/rustc_target/src/spec/powerpc_unknown_linux_gnuspe.rs
diff --git a/src/librustc_target/spec/powerpc_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc_unknown_linux_musl.rs
index 240cbcbfe6e..240cbcbfe6e 100644
--- a/src/librustc_target/spec/powerpc_unknown_linux_musl.rs
+++ b/compiler/rustc_target/src/spec/powerpc_unknown_linux_musl.rs
diff --git a/src/librustc_target/spec/powerpc_unknown_netbsd.rs b/compiler/rustc_target/src/spec/powerpc_unknown_netbsd.rs
index 6ca7053ced5..6ca7053ced5 100644
--- a/src/librustc_target/spec/powerpc_unknown_netbsd.rs
+++ b/compiler/rustc_target/src/spec/powerpc_unknown_netbsd.rs
diff --git a/src/librustc_target/spec/powerpc_wrs_vxworks.rs b/compiler/rustc_target/src/spec/powerpc_wrs_vxworks.rs
index 2211dc29a5d..2211dc29a5d 100644
--- a/src/librustc_target/spec/powerpc_wrs_vxworks.rs
+++ b/compiler/rustc_target/src/spec/powerpc_wrs_vxworks.rs
diff --git a/src/librustc_target/spec/powerpc_wrs_vxworks_spe.rs b/compiler/rustc_target/src/spec/powerpc_wrs_vxworks_spe.rs
index b10182c09ad..b10182c09ad 100644
--- a/src/librustc_target/spec/powerpc_wrs_vxworks_spe.rs
+++ b/compiler/rustc_target/src/spec/powerpc_wrs_vxworks_spe.rs
diff --git a/src/librustc_target/spec/redox_base.rs b/compiler/rustc_target/src/spec/redox_base.rs
index 18cafe654d1..18cafe654d1 100644
--- a/src/librustc_target/spec/redox_base.rs
+++ b/compiler/rustc_target/src/spec/redox_base.rs
diff --git a/src/librustc_target/spec/riscv32i_unknown_none_elf.rs b/compiler/rustc_target/src/spec/riscv32i_unknown_none_elf.rs
index 5b5e342000b..5b5e342000b 100644
--- a/src/librustc_target/spec/riscv32i_unknown_none_elf.rs
+++ b/compiler/rustc_target/src/spec/riscv32i_unknown_none_elf.rs
diff --git a/src/librustc_target/spec/riscv32imac_unknown_none_elf.rs b/compiler/rustc_target/src/spec/riscv32imac_unknown_none_elf.rs
index 4cef5c42d8d..4cef5c42d8d 100644
--- a/src/librustc_target/spec/riscv32imac_unknown_none_elf.rs
+++ b/compiler/rustc_target/src/spec/riscv32imac_unknown_none_elf.rs
diff --git a/src/librustc_target/spec/riscv32imc_unknown_none_elf.rs b/compiler/rustc_target/src/spec/riscv32imc_unknown_none_elf.rs
index 8ad563e441d..8ad563e441d 100644
--- a/src/librustc_target/spec/riscv32imc_unknown_none_elf.rs
+++ b/compiler/rustc_target/src/spec/riscv32imc_unknown_none_elf.rs
diff --git a/src/librustc_target/spec/riscv64gc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs
index f7a93c916d1..f7a93c916d1 100644
--- a/src/librustc_target/spec/riscv64gc_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs
diff --git a/src/librustc_target/spec/riscv64gc_unknown_none_elf.rs b/compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs
index 3aeb3f3ca72..3aeb3f3ca72 100644
--- a/src/librustc_target/spec/riscv64gc_unknown_none_elf.rs
+++ b/compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs
diff --git a/src/librustc_target/spec/riscv64imac_unknown_none_elf.rs b/compiler/rustc_target/src/spec/riscv64imac_unknown_none_elf.rs
index d8144964dc9..d8144964dc9 100644
--- a/src/librustc_target/spec/riscv64imac_unknown_none_elf.rs
+++ b/compiler/rustc_target/src/spec/riscv64imac_unknown_none_elf.rs
diff --git a/src/librustc_target/spec/riscv_base.rs b/compiler/rustc_target/src/spec/riscv_base.rs
index 64cf890037e..64cf890037e 100644
--- a/src/librustc_target/spec/riscv_base.rs
+++ b/compiler/rustc_target/src/spec/riscv_base.rs
diff --git a/src/librustc_target/spec/s390x_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs
index f259787e1d5..f259787e1d5 100644
--- a/src/librustc_target/spec/s390x_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs
diff --git a/src/librustc_target/spec/solaris_base.rs b/compiler/rustc_target/src/spec/solaris_base.rs
index 3d7f0034b8b..3d7f0034b8b 100644
--- a/src/librustc_target/spec/solaris_base.rs
+++ b/compiler/rustc_target/src/spec/solaris_base.rs
diff --git a/src/librustc_target/spec/sparc64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/sparc64_unknown_linux_gnu.rs
index c842b22d4e1..c842b22d4e1 100644
--- a/src/librustc_target/spec/sparc64_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/sparc64_unknown_linux_gnu.rs
diff --git a/src/librustc_target/spec/sparc64_unknown_netbsd.rs b/compiler/rustc_target/src/spec/sparc64_unknown_netbsd.rs
index aad85e852f0..aad85e852f0 100644
--- a/src/librustc_target/spec/sparc64_unknown_netbsd.rs
+++ b/compiler/rustc_target/src/spec/sparc64_unknown_netbsd.rs
diff --git a/src/librustc_target/spec/sparc64_unknown_openbsd.rs b/compiler/rustc_target/src/spec/sparc64_unknown_openbsd.rs
index 229e0621e0d..229e0621e0d 100644
--- a/src/librustc_target/spec/sparc64_unknown_openbsd.rs
+++ b/compiler/rustc_target/src/spec/sparc64_unknown_openbsd.rs
diff --git a/src/librustc_target/spec/sparc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/sparc_unknown_linux_gnu.rs
index 162cd311a38..162cd311a38 100644
--- a/src/librustc_target/spec/sparc_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/sparc_unknown_linux_gnu.rs
diff --git a/src/librustc_target/spec/sparcv9_sun_solaris.rs b/compiler/rustc_target/src/spec/sparcv9_sun_solaris.rs
index acc03fd0d79..acc03fd0d79 100644
--- a/src/librustc_target/spec/sparcv9_sun_solaris.rs
+++ b/compiler/rustc_target/src/spec/sparcv9_sun_solaris.rs
diff --git a/src/librustc_target/spec/tests/tests_impl.rs b/compiler/rustc_target/src/spec/tests/tests_impl.rs
index b2c2b8254d8..b2c2b8254d8 100644
--- a/src/librustc_target/spec/tests/tests_impl.rs
+++ b/compiler/rustc_target/src/spec/tests/tests_impl.rs
diff --git a/src/librustc_target/spec/thumb_base.rs b/compiler/rustc_target/src/spec/thumb_base.rs
index 2f7d15d5856..2f7d15d5856 100644
--- a/src/librustc_target/spec/thumb_base.rs
+++ b/compiler/rustc_target/src/spec/thumb_base.rs
diff --git a/src/librustc_target/spec/thumbv4t_none_eabi.rs b/compiler/rustc_target/src/spec/thumbv4t_none_eabi.rs
index a8c78f057fc..a8c78f057fc 100644
--- a/src/librustc_target/spec/thumbv4t_none_eabi.rs
+++ b/compiler/rustc_target/src/spec/thumbv4t_none_eabi.rs
diff --git a/src/librustc_target/spec/thumbv6m_none_eabi.rs b/compiler/rustc_target/src/spec/thumbv6m_none_eabi.rs
index 953d60fcc22..953d60fcc22 100644
--- a/src/librustc_target/spec/thumbv6m_none_eabi.rs
+++ b/compiler/rustc_target/src/spec/thumbv6m_none_eabi.rs
diff --git a/src/librustc_target/spec/thumbv7a_pc_windows_msvc.rs b/compiler/rustc_target/src/spec/thumbv7a_pc_windows_msvc.rs
index 37828026fe1..37828026fe1 100644
--- a/src/librustc_target/spec/thumbv7a_pc_windows_msvc.rs
+++ b/compiler/rustc_target/src/spec/thumbv7a_pc_windows_msvc.rs
diff --git a/src/librustc_target/spec/thumbv7a_uwp_windows_msvc.rs b/compiler/rustc_target/src/spec/thumbv7a_uwp_windows_msvc.rs
index 29a4a9875e5..29a4a9875e5 100644
--- a/src/librustc_target/spec/thumbv7a_uwp_windows_msvc.rs
+++ b/compiler/rustc_target/src/spec/thumbv7a_uwp_windows_msvc.rs
diff --git a/src/librustc_target/spec/thumbv7em_none_eabi.rs b/compiler/rustc_target/src/spec/thumbv7em_none_eabi.rs
index 9e085381953..9e085381953 100644
--- a/src/librustc_target/spec/thumbv7em_none_eabi.rs
+++ b/compiler/rustc_target/src/spec/thumbv7em_none_eabi.rs
diff --git a/src/librustc_target/spec/thumbv7em_none_eabihf.rs b/compiler/rustc_target/src/spec/thumbv7em_none_eabihf.rs
index 95b9b9d5b56..95b9b9d5b56 100644
--- a/src/librustc_target/spec/thumbv7em_none_eabihf.rs
+++ b/compiler/rustc_target/src/spec/thumbv7em_none_eabihf.rs
diff --git a/src/librustc_target/spec/thumbv7m_none_eabi.rs b/compiler/rustc_target/src/spec/thumbv7m_none_eabi.rs
index 528359ffad3..528359ffad3 100644
--- a/src/librustc_target/spec/thumbv7m_none_eabi.rs
+++ b/compiler/rustc_target/src/spec/thumbv7m_none_eabi.rs
diff --git a/src/librustc_target/spec/thumbv7neon_linux_androideabi.rs b/compiler/rustc_target/src/spec/thumbv7neon_linux_androideabi.rs
index c52f077f6f1..c52f077f6f1 100644
--- a/src/librustc_target/spec/thumbv7neon_linux_androideabi.rs
+++ b/compiler/rustc_target/src/spec/thumbv7neon_linux_androideabi.rs
diff --git a/src/librustc_target/spec/thumbv7neon_unknown_linux_gnueabihf.rs b/compiler/rustc_target/src/spec/thumbv7neon_unknown_linux_gnueabihf.rs
index 78936948e64..78936948e64 100644
--- a/src/librustc_target/spec/thumbv7neon_unknown_linux_gnueabihf.rs
+++ b/compiler/rustc_target/src/spec/thumbv7neon_unknown_linux_gnueabihf.rs
diff --git a/src/librustc_target/spec/thumbv7neon_unknown_linux_musleabihf.rs b/compiler/rustc_target/src/spec/thumbv7neon_unknown_linux_musleabihf.rs
index f759c3eeb01..f759c3eeb01 100644
--- a/src/librustc_target/spec/thumbv7neon_unknown_linux_musleabihf.rs
+++ b/compiler/rustc_target/src/spec/thumbv7neon_unknown_linux_musleabihf.rs
diff --git a/src/librustc_target/spec/thumbv8m_base_none_eabi.rs b/compiler/rustc_target/src/spec/thumbv8m_base_none_eabi.rs
index 3f67c67b7bc..3f67c67b7bc 100644
--- a/src/librustc_target/spec/thumbv8m_base_none_eabi.rs
+++ b/compiler/rustc_target/src/spec/thumbv8m_base_none_eabi.rs
diff --git a/src/librustc_target/spec/thumbv8m_main_none_eabi.rs b/compiler/rustc_target/src/spec/thumbv8m_main_none_eabi.rs
index 2f8103f0c70..2f8103f0c70 100644
--- a/src/librustc_target/spec/thumbv8m_main_none_eabi.rs
+++ b/compiler/rustc_target/src/spec/thumbv8m_main_none_eabi.rs
diff --git a/src/librustc_target/spec/thumbv8m_main_none_eabihf.rs b/compiler/rustc_target/src/spec/thumbv8m_main_none_eabihf.rs
index 53a340230d6..53a340230d6 100644
--- a/src/librustc_target/spec/thumbv8m_main_none_eabihf.rs
+++ b/compiler/rustc_target/src/spec/thumbv8m_main_none_eabihf.rs
diff --git a/src/librustc_target/spec/uefi_msvc_base.rs b/compiler/rustc_target/src/spec/uefi_msvc_base.rs
index 3f7c78c8e7d..3f7c78c8e7d 100644
--- a/src/librustc_target/spec/uefi_msvc_base.rs
+++ b/compiler/rustc_target/src/spec/uefi_msvc_base.rs
diff --git a/src/librustc_target/spec/vxworks_base.rs b/compiler/rustc_target/src/spec/vxworks_base.rs
index 777bb58d7db..777bb58d7db 100644
--- a/src/librustc_target/spec/vxworks_base.rs
+++ b/compiler/rustc_target/src/spec/vxworks_base.rs
diff --git a/src/librustc_target/spec/wasm32_base.rs b/compiler/rustc_target/src/spec/wasm32_base.rs
index 62fc8f06183..62fc8f06183 100644
--- a/src/librustc_target/spec/wasm32_base.rs
+++ b/compiler/rustc_target/src/spec/wasm32_base.rs
diff --git a/src/librustc_target/spec/wasm32_unknown_emscripten.rs b/compiler/rustc_target/src/spec/wasm32_unknown_emscripten.rs
index 1916639170e..1916639170e 100644
--- a/src/librustc_target/spec/wasm32_unknown_emscripten.rs
+++ b/compiler/rustc_target/src/spec/wasm32_unknown_emscripten.rs
diff --git a/src/librustc_target/spec/wasm32_unknown_unknown.rs b/compiler/rustc_target/src/spec/wasm32_unknown_unknown.rs
index ded95a34d55..ded95a34d55 100644
--- a/src/librustc_target/spec/wasm32_unknown_unknown.rs
+++ b/compiler/rustc_target/src/spec/wasm32_unknown_unknown.rs
diff --git a/src/librustc_target/spec/wasm32_wasi.rs b/compiler/rustc_target/src/spec/wasm32_wasi.rs
index 0bba7bdd473..0bba7bdd473 100644
--- a/src/librustc_target/spec/wasm32_wasi.rs
+++ b/compiler/rustc_target/src/spec/wasm32_wasi.rs
diff --git a/src/librustc_target/spec/windows_gnu_base.rs b/compiler/rustc_target/src/spec/windows_gnu_base.rs
index a864918655f..a864918655f 100644
--- a/src/librustc_target/spec/windows_gnu_base.rs
+++ b/compiler/rustc_target/src/spec/windows_gnu_base.rs
diff --git a/src/librustc_target/spec/windows_msvc_base.rs b/compiler/rustc_target/src/spec/windows_msvc_base.rs
index 77171f8672e..77171f8672e 100644
--- a/src/librustc_target/spec/windows_msvc_base.rs
+++ b/compiler/rustc_target/src/spec/windows_msvc_base.rs
diff --git a/src/librustc_target/spec/windows_uwp_gnu_base.rs b/compiler/rustc_target/src/spec/windows_uwp_gnu_base.rs
index fd55a0fc6a1..fd55a0fc6a1 100644
--- a/src/librustc_target/spec/windows_uwp_gnu_base.rs
+++ b/compiler/rustc_target/src/spec/windows_uwp_gnu_base.rs
diff --git a/src/librustc_target/spec/windows_uwp_msvc_base.rs b/compiler/rustc_target/src/spec/windows_uwp_msvc_base.rs
index 04ffa1a0add..04ffa1a0add 100644
--- a/src/librustc_target/spec/windows_uwp_msvc_base.rs
+++ b/compiler/rustc_target/src/spec/windows_uwp_msvc_base.rs
diff --git a/src/librustc_target/spec/x86_64_apple_darwin.rs b/compiler/rustc_target/src/spec/x86_64_apple_darwin.rs
index 909aebec70b..909aebec70b 100644
--- a/src/librustc_target/spec/x86_64_apple_darwin.rs
+++ b/compiler/rustc_target/src/spec/x86_64_apple_darwin.rs
diff --git a/src/librustc_target/spec/x86_64_apple_ios.rs b/compiler/rustc_target/src/spec/x86_64_apple_ios.rs
index cfcf856836b..cfcf856836b 100644
--- a/src/librustc_target/spec/x86_64_apple_ios.rs
+++ b/compiler/rustc_target/src/spec/x86_64_apple_ios.rs
diff --git a/src/librustc_target/spec/x86_64_apple_ios_macabi.rs b/compiler/rustc_target/src/spec/x86_64_apple_ios_macabi.rs
index c42d0911725..c42d0911725 100644
--- a/src/librustc_target/spec/x86_64_apple_ios_macabi.rs
+++ b/compiler/rustc_target/src/spec/x86_64_apple_ios_macabi.rs
diff --git a/src/librustc_target/spec/x86_64_apple_tvos.rs b/compiler/rustc_target/src/spec/x86_64_apple_tvos.rs
index a56062c0b2b..a56062c0b2b 100644
--- a/src/librustc_target/spec/x86_64_apple_tvos.rs
+++ b/compiler/rustc_target/src/spec/x86_64_apple_tvos.rs
diff --git a/src/librustc_target/spec/x86_64_fortanix_unknown_sgx.rs b/compiler/rustc_target/src/spec/x86_64_fortanix_unknown_sgx.rs
index 3b5233a3e67..3b5233a3e67 100644
--- a/src/librustc_target/spec/x86_64_fortanix_unknown_sgx.rs
+++ b/compiler/rustc_target/src/spec/x86_64_fortanix_unknown_sgx.rs
diff --git a/src/librustc_target/spec/x86_64_fuchsia.rs b/compiler/rustc_target/src/spec/x86_64_fuchsia.rs
index 37b6d57366c..37b6d57366c 100644
--- a/src/librustc_target/spec/x86_64_fuchsia.rs
+++ b/compiler/rustc_target/src/spec/x86_64_fuchsia.rs
diff --git a/src/librustc_target/spec/x86_64_linux_android.rs b/compiler/rustc_target/src/spec/x86_64_linux_android.rs
index 74097f5bf6f..74097f5bf6f 100644
--- a/src/librustc_target/spec/x86_64_linux_android.rs
+++ b/compiler/rustc_target/src/spec/x86_64_linux_android.rs
diff --git a/src/librustc_target/spec/x86_64_linux_kernel.rs b/compiler/rustc_target/src/spec/x86_64_linux_kernel.rs
index 65bb97d84aa..65bb97d84aa 100644
--- a/src/librustc_target/spec/x86_64_linux_kernel.rs
+++ b/compiler/rustc_target/src/spec/x86_64_linux_kernel.rs
diff --git a/src/librustc_target/spec/x86_64_pc_windows_gnu.rs b/compiler/rustc_target/src/spec/x86_64_pc_windows_gnu.rs
index 99af483f1d4..99af483f1d4 100644
--- a/src/librustc_target/spec/x86_64_pc_windows_gnu.rs
+++ b/compiler/rustc_target/src/spec/x86_64_pc_windows_gnu.rs
diff --git a/src/librustc_target/spec/x86_64_pc_windows_msvc.rs b/compiler/rustc_target/src/spec/x86_64_pc_windows_msvc.rs
index 75ff6b97a2e..75ff6b97a2e 100644
--- a/src/librustc_target/spec/x86_64_pc_windows_msvc.rs
+++ b/compiler/rustc_target/src/spec/x86_64_pc_windows_msvc.rs
diff --git a/src/librustc_target/spec/x86_64_rumprun_netbsd.rs b/compiler/rustc_target/src/spec/x86_64_rumprun_netbsd.rs
index fbade02c556..fbade02c556 100644
--- a/src/librustc_target/spec/x86_64_rumprun_netbsd.rs
+++ b/compiler/rustc_target/src/spec/x86_64_rumprun_netbsd.rs
diff --git a/src/librustc_target/spec/x86_64_sun_solaris.rs b/compiler/rustc_target/src/spec/x86_64_sun_solaris.rs
index 53f4df96518..53f4df96518 100644
--- a/src/librustc_target/spec/x86_64_sun_solaris.rs
+++ b/compiler/rustc_target/src/spec/x86_64_sun_solaris.rs
diff --git a/src/librustc_target/spec/x86_64_unknown_cloudabi.rs b/compiler/rustc_target/src/spec/x86_64_unknown_cloudabi.rs
index dbc5f965020..dbc5f965020 100644
--- a/src/librustc_target/spec/x86_64_unknown_cloudabi.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_cloudabi.rs
diff --git a/src/librustc_target/spec/x86_64_unknown_dragonfly.rs b/compiler/rustc_target/src/spec/x86_64_unknown_dragonfly.rs
index fd1871b1a57..fd1871b1a57 100644
--- a/src/librustc_target/spec/x86_64_unknown_dragonfly.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_dragonfly.rs
diff --git a/src/librustc_target/spec/x86_64_unknown_freebsd.rs b/compiler/rustc_target/src/spec/x86_64_unknown_freebsd.rs
index a124f582bf3..a124f582bf3 100644
--- a/src/librustc_target/spec/x86_64_unknown_freebsd.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_freebsd.rs
diff --git a/src/librustc_target/spec/x86_64_unknown_haiku.rs b/compiler/rustc_target/src/spec/x86_64_unknown_haiku.rs
index 51237697714..51237697714 100644
--- a/src/librustc_target/spec/x86_64_unknown_haiku.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_haiku.rs
diff --git a/src/librustc_target/spec/x86_64_unknown_hermit.rs b/compiler/rustc_target/src/spec/x86_64_unknown_hermit.rs
index 4a526f90ed5..4a526f90ed5 100644
--- a/src/librustc_target/spec/x86_64_unknown_hermit.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_hermit.rs
diff --git a/src/librustc_target/spec/x86_64_unknown_hermit_kernel.rs b/compiler/rustc_target/src/spec/x86_64_unknown_hermit_kernel.rs
index c25cd0809ee..c25cd0809ee 100644
--- a/src/librustc_target/spec/x86_64_unknown_hermit_kernel.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_hermit_kernel.rs
diff --git a/src/librustc_target/spec/x86_64_unknown_illumos.rs b/compiler/rustc_target/src/spec/x86_64_unknown_illumos.rs
index 2567ca47ef9..2567ca47ef9 100644
--- a/src/librustc_target/spec/x86_64_unknown_illumos.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_illumos.rs
diff --git a/src/librustc_target/spec/x86_64_unknown_l4re_uclibc.rs b/compiler/rustc_target/src/spec/x86_64_unknown_l4re_uclibc.rs
index cab19f149a7..cab19f149a7 100644
--- a/src/librustc_target/spec/x86_64_unknown_l4re_uclibc.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_l4re_uclibc.rs
diff --git a/src/librustc_target/spec/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
index 29cbb777db5..29cbb777db5 100644
--- a/src/librustc_target/spec/x86_64_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
diff --git a/src/librustc_target/spec/x86_64_unknown_linux_gnux32.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnux32.rs
index 0a37399e2fa..0a37399e2fa 100644
--- a/src/librustc_target/spec/x86_64_unknown_linux_gnux32.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnux32.rs
diff --git a/src/librustc_target/spec/x86_64_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_musl.rs
index 3a22290da68..3a22290da68 100644
--- a/src/librustc_target/spec/x86_64_unknown_linux_musl.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_musl.rs
diff --git a/src/librustc_target/spec/x86_64_unknown_netbsd.rs b/compiler/rustc_target/src/spec/x86_64_unknown_netbsd.rs
index adf09c89c42..adf09c89c42 100644
--- a/src/librustc_target/spec/x86_64_unknown_netbsd.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_netbsd.rs
diff --git a/src/librustc_target/spec/x86_64_unknown_openbsd.rs b/compiler/rustc_target/src/spec/x86_64_unknown_openbsd.rs
index dbd163db36b..dbd163db36b 100644
--- a/src/librustc_target/spec/x86_64_unknown_openbsd.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_openbsd.rs
diff --git a/src/librustc_target/spec/x86_64_unknown_redox.rs b/compiler/rustc_target/src/spec/x86_64_unknown_redox.rs
index 3d40bafbe1f..3d40bafbe1f 100644
--- a/src/librustc_target/spec/x86_64_unknown_redox.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_redox.rs
diff --git a/src/librustc_target/spec/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/x86_64_unknown_uefi.rs
index 849227a574a..849227a574a 100644
--- a/src/librustc_target/spec/x86_64_unknown_uefi.rs
+++ b/compiler/rustc_target/src/spec/x86_64_unknown_uefi.rs
diff --git a/src/librustc_target/spec/x86_64_uwp_windows_gnu.rs b/compiler/rustc_target/src/spec/x86_64_uwp_windows_gnu.rs
index 3bd18f23f6f..3bd18f23f6f 100644
--- a/src/librustc_target/spec/x86_64_uwp_windows_gnu.rs
+++ b/compiler/rustc_target/src/spec/x86_64_uwp_windows_gnu.rs
diff --git a/src/librustc_target/spec/x86_64_uwp_windows_msvc.rs b/compiler/rustc_target/src/spec/x86_64_uwp_windows_msvc.rs
index 258df010aae..258df010aae 100644
--- a/src/librustc_target/spec/x86_64_uwp_windows_msvc.rs
+++ b/compiler/rustc_target/src/spec/x86_64_uwp_windows_msvc.rs
diff --git a/src/librustc_target/spec/x86_64_wrs_vxworks.rs b/compiler/rustc_target/src/spec/x86_64_wrs_vxworks.rs
index f1e27f4d8be..f1e27f4d8be 100644
--- a/src/librustc_target/spec/x86_64_wrs_vxworks.rs
+++ b/compiler/rustc_target/src/spec/x86_64_wrs_vxworks.rs
diff --git a/compiler/rustc_trait_selection/Cargo.toml b/compiler/rustc_trait_selection/Cargo.toml
new file mode 100644
index 00000000000..a72c172918b
--- /dev/null
+++ b/compiler/rustc_trait_selection/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_trait_selection"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+doctest = false
+
+[dependencies]
+rustc_parse_format = { path = "../rustc_parse_format" }
+tracing = "0.1"
+rustc_attr = { path = "../rustc_attr" }
+rustc_middle = { path = "../rustc_middle" }
+rustc_ast = { path = "../rustc_ast" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_index = { path = "../rustc_index" }
+rustc_infer = { path = "../rustc_infer" }
+rustc_macros = { path = "../rustc_macros" }
+rustc_session = { path = "../rustc_session" }
+rustc_span = { path = "../rustc_span" }
+rustc_target = { path = "../rustc_target" }
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_trait_selection/autoderef.rs b/compiler/rustc_trait_selection/src/autoderef.rs
index 02eefe56223..02eefe56223 100644
--- a/src/librustc_trait_selection/autoderef.rs
+++ b/compiler/rustc_trait_selection/src/autoderef.rs
diff --git a/src/librustc_trait_selection/infer.rs b/compiler/rustc_trait_selection/src/infer.rs
index 4ec1b29bca4..4ec1b29bca4 100644
--- a/src/librustc_trait_selection/infer.rs
+++ b/compiler/rustc_trait_selection/src/infer.rs
diff --git a/src/librustc_trait_selection/lib.rs b/compiler/rustc_trait_selection/src/lib.rs
index b5882df4729..b5882df4729 100644
--- a/src/librustc_trait_selection/lib.rs
+++ b/compiler/rustc_trait_selection/src/lib.rs
diff --git a/src/librustc_trait_selection/opaque_types.rs b/compiler/rustc_trait_selection/src/opaque_types.rs
index 379c976df69..379c976df69 100644
--- a/src/librustc_trait_selection/opaque_types.rs
+++ b/compiler/rustc_trait_selection/src/opaque_types.rs
diff --git a/src/librustc_trait_selection/traits/auto_trait.rs b/compiler/rustc_trait_selection/src/traits/auto_trait.rs
index fa3d0241998..fa3d0241998 100644
--- a/src/librustc_trait_selection/traits/auto_trait.rs
+++ b/compiler/rustc_trait_selection/src/traits/auto_trait.rs
diff --git a/src/librustc_trait_selection/traits/chalk_fulfill.rs b/compiler/rustc_trait_selection/src/traits/chalk_fulfill.rs
index 0097097707f..0097097707f 100644
--- a/src/librustc_trait_selection/traits/chalk_fulfill.rs
+++ b/compiler/rustc_trait_selection/src/traits/chalk_fulfill.rs
diff --git a/src/librustc_trait_selection/traits/codegen/mod.rs b/compiler/rustc_trait_selection/src/traits/codegen/mod.rs
index dd7ea55cc10..dd7ea55cc10 100644
--- a/src/librustc_trait_selection/traits/codegen/mod.rs
+++ b/compiler/rustc_trait_selection/src/traits/codegen/mod.rs
diff --git a/src/librustc_trait_selection/traits/coherence.rs b/compiler/rustc_trait_selection/src/traits/coherence.rs
index b06cf4411d0..b06cf4411d0 100644
--- a/src/librustc_trait_selection/traits/coherence.rs
+++ b/compiler/rustc_trait_selection/src/traits/coherence.rs
diff --git a/src/librustc_trait_selection/traits/engine.rs b/compiler/rustc_trait_selection/src/traits/engine.rs
index 4d477886979..4d477886979 100644
--- a/src/librustc_trait_selection/traits/engine.rs
+++ b/compiler/rustc_trait_selection/src/traits/engine.rs
diff --git a/src/librustc_trait_selection/traits/error_reporting/mod.rs b/compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
index 28542d4b12e..28542d4b12e 100644
--- a/src/librustc_trait_selection/traits/error_reporting/mod.rs
+++ b/compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
diff --git a/src/librustc_trait_selection/traits/error_reporting/on_unimplemented.rs b/compiler/rustc_trait_selection/src/traits/error_reporting/on_unimplemented.rs
index d2b9f84af33..d2b9f84af33 100644
--- a/src/librustc_trait_selection/traits/error_reporting/on_unimplemented.rs
+++ b/compiler/rustc_trait_selection/src/traits/error_reporting/on_unimplemented.rs
diff --git a/src/librustc_trait_selection/traits/error_reporting/suggestions.rs b/compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
index 138293c9533..138293c9533 100644
--- a/src/librustc_trait_selection/traits/error_reporting/suggestions.rs
+++ b/compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
diff --git a/src/librustc_trait_selection/traits/fulfill.rs b/compiler/rustc_trait_selection/src/traits/fulfill.rs
index a5c6dc042ab..a5c6dc042ab 100644
--- a/src/librustc_trait_selection/traits/fulfill.rs
+++ b/compiler/rustc_trait_selection/src/traits/fulfill.rs
diff --git a/src/librustc_trait_selection/traits/misc.rs b/compiler/rustc_trait_selection/src/traits/misc.rs
index 61567aeb57c..61567aeb57c 100644
--- a/src/librustc_trait_selection/traits/misc.rs
+++ b/compiler/rustc_trait_selection/src/traits/misc.rs
diff --git a/src/librustc_trait_selection/traits/mod.rs b/compiler/rustc_trait_selection/src/traits/mod.rs
index fe406e88c52..fe406e88c52 100644
--- a/src/librustc_trait_selection/traits/mod.rs
+++ b/compiler/rustc_trait_selection/src/traits/mod.rs
diff --git a/src/librustc_trait_selection/traits/object_safety.rs b/compiler/rustc_trait_selection/src/traits/object_safety.rs
index c003e4f8068..c003e4f8068 100644
--- a/src/librustc_trait_selection/traits/object_safety.rs
+++ b/compiler/rustc_trait_selection/src/traits/object_safety.rs
diff --git a/src/librustc_trait_selection/traits/on_unimplemented.rs b/compiler/rustc_trait_selection/src/traits/on_unimplemented.rs
index 75822eadb2a..75822eadb2a 100644
--- a/src/librustc_trait_selection/traits/on_unimplemented.rs
+++ b/compiler/rustc_trait_selection/src/traits/on_unimplemented.rs
diff --git a/src/librustc_trait_selection/traits/project.rs b/compiler/rustc_trait_selection/src/traits/project.rs
index c788e4f5c90..c788e4f5c90 100644
--- a/src/librustc_trait_selection/traits/project.rs
+++ b/compiler/rustc_trait_selection/src/traits/project.rs
diff --git a/src/librustc_trait_selection/traits/query/dropck_outlives.rs b/compiler/rustc_trait_selection/src/traits/query/dropck_outlives.rs
index d07c95270e0..d07c95270e0 100644
--- a/src/librustc_trait_selection/traits/query/dropck_outlives.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/dropck_outlives.rs
diff --git a/src/librustc_trait_selection/traits/query/evaluate_obligation.rs b/compiler/rustc_trait_selection/src/traits/query/evaluate_obligation.rs
index 0569f6217da..0569f6217da 100644
--- a/src/librustc_trait_selection/traits/query/evaluate_obligation.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/evaluate_obligation.rs
diff --git a/src/librustc_trait_selection/traits/query/method_autoderef.rs b/compiler/rustc_trait_selection/src/traits/query/method_autoderef.rs
index 3c0ebec9335..3c0ebec9335 100644
--- a/src/librustc_trait_selection/traits/query/method_autoderef.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/method_autoderef.rs
diff --git a/src/librustc_trait_selection/traits/query/mod.rs b/compiler/rustc_trait_selection/src/traits/query/mod.rs
index 01f4f09e238..01f4f09e238 100644
--- a/src/librustc_trait_selection/traits/query/mod.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/mod.rs
diff --git a/src/librustc_trait_selection/traits/query/normalize.rs b/compiler/rustc_trait_selection/src/traits/query/normalize.rs
index 93652329305..93652329305 100644
--- a/src/librustc_trait_selection/traits/query/normalize.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/normalize.rs
diff --git a/src/librustc_trait_selection/traits/query/outlives_bounds.rs b/compiler/rustc_trait_selection/src/traits/query/outlives_bounds.rs
index a42409515db..a42409515db 100644
--- a/src/librustc_trait_selection/traits/query/outlives_bounds.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/outlives_bounds.rs
diff --git a/src/librustc_trait_selection/traits/query/type_op/ascribe_user_type.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/ascribe_user_type.rs
index 86b015767f0..86b015767f0 100644
--- a/src/librustc_trait_selection/traits/query/type_op/ascribe_user_type.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/type_op/ascribe_user_type.rs
diff --git a/src/librustc_trait_selection/traits/query/type_op/custom.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/custom.rs
index 915e8ae4a7a..915e8ae4a7a 100644
--- a/src/librustc_trait_selection/traits/query/type_op/custom.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/type_op/custom.rs
diff --git a/src/librustc_trait_selection/traits/query/type_op/eq.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/eq.rs
index 490114aacd1..490114aacd1 100644
--- a/src/librustc_trait_selection/traits/query/type_op/eq.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/type_op/eq.rs
diff --git a/src/librustc_trait_selection/traits/query/type_op/implied_outlives_bounds.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/implied_outlives_bounds.rs
index cf7f0a553c7..cf7f0a553c7 100644
--- a/src/librustc_trait_selection/traits/query/type_op/implied_outlives_bounds.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/type_op/implied_outlives_bounds.rs
diff --git a/src/librustc_trait_selection/traits/query/type_op/mod.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/mod.rs
index ed6c6d0cc0a..ed6c6d0cc0a 100644
--- a/src/librustc_trait_selection/traits/query/type_op/mod.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/type_op/mod.rs
diff --git a/src/librustc_trait_selection/traits/query/type_op/normalize.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/normalize.rs
index 729b66ac21c..729b66ac21c 100644
--- a/src/librustc_trait_selection/traits/query/type_op/normalize.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/type_op/normalize.rs
diff --git a/src/librustc_trait_selection/traits/query/type_op/outlives.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/outlives.rs
index 5a27e57860e..5a27e57860e 100644
--- a/src/librustc_trait_selection/traits/query/type_op/outlives.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/type_op/outlives.rs
diff --git a/src/librustc_trait_selection/traits/query/type_op/prove_predicate.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/prove_predicate.rs
index 93ddcb68554..93ddcb68554 100644
--- a/src/librustc_trait_selection/traits/query/type_op/prove_predicate.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/type_op/prove_predicate.rs
diff --git a/src/librustc_trait_selection/traits/query/type_op/subtype.rs b/compiler/rustc_trait_selection/src/traits/query/type_op/subtype.rs
index 57290b66914..57290b66914 100644
--- a/src/librustc_trait_selection/traits/query/type_op/subtype.rs
+++ b/compiler/rustc_trait_selection/src/traits/query/type_op/subtype.rs
diff --git a/src/librustc_trait_selection/traits/select/candidate_assembly.rs b/compiler/rustc_trait_selection/src/traits/select/candidate_assembly.rs
index 1d5441b8eff..1d5441b8eff 100644
--- a/src/librustc_trait_selection/traits/select/candidate_assembly.rs
+++ b/compiler/rustc_trait_selection/src/traits/select/candidate_assembly.rs
diff --git a/src/librustc_trait_selection/traits/select/confirmation.rs b/compiler/rustc_trait_selection/src/traits/select/confirmation.rs
index 3d6eb845136..3d6eb845136 100644
--- a/src/librustc_trait_selection/traits/select/confirmation.rs
+++ b/compiler/rustc_trait_selection/src/traits/select/confirmation.rs
diff --git a/src/librustc_trait_selection/traits/select/mod.rs b/compiler/rustc_trait_selection/src/traits/select/mod.rs
index 82f476b463d..82f476b463d 100644
--- a/src/librustc_trait_selection/traits/select/mod.rs
+++ b/compiler/rustc_trait_selection/src/traits/select/mod.rs
diff --git a/src/librustc_trait_selection/traits/specialize/mod.rs b/compiler/rustc_trait_selection/src/traits/specialize/mod.rs
index 4d81a3baa0e..4d81a3baa0e 100644
--- a/src/librustc_trait_selection/traits/specialize/mod.rs
+++ b/compiler/rustc_trait_selection/src/traits/specialize/mod.rs
diff --git a/src/librustc_trait_selection/traits/specialize/specialization_graph.rs b/compiler/rustc_trait_selection/src/traits/specialize/specialization_graph.rs
index 56b8354d68c..56b8354d68c 100644
--- a/src/librustc_trait_selection/traits/specialize/specialization_graph.rs
+++ b/compiler/rustc_trait_selection/src/traits/specialize/specialization_graph.rs
diff --git a/src/librustc_trait_selection/traits/structural_match.rs b/compiler/rustc_trait_selection/src/traits/structural_match.rs
index 78186a5e8a5..78186a5e8a5 100644
--- a/src/librustc_trait_selection/traits/structural_match.rs
+++ b/compiler/rustc_trait_selection/src/traits/structural_match.rs
diff --git a/src/librustc_trait_selection/traits/util.rs b/compiler/rustc_trait_selection/src/traits/util.rs
index f626bb0b7e3..f626bb0b7e3 100644
--- a/src/librustc_trait_selection/traits/util.rs
+++ b/compiler/rustc_trait_selection/src/traits/util.rs
diff --git a/src/librustc_trait_selection/traits/wf.rs b/compiler/rustc_trait_selection/src/traits/wf.rs
index 0ac3c6ffe62..0ac3c6ffe62 100644
--- a/src/librustc_trait_selection/traits/wf.rs
+++ b/compiler/rustc_trait_selection/src/traits/wf.rs
diff --git a/compiler/rustc_traits/Cargo.toml b/compiler/rustc_traits/Cargo.toml
new file mode 100644
index 00000000000..2d63fc51220
--- /dev/null
+++ b/compiler/rustc_traits/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_traits"
+version = "0.0.0"
+edition = "2018"
+
+[dependencies]
+tracing = "0.1"
+rustc_middle = { path = "../rustc_middle" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_index = { path = "../rustc_index" }
+rustc_ast = { path = "../rustc_ast" }
+rustc_span = { path = "../rustc_span" }
+chalk-ir = "0.14.0"
+chalk-solve = "0.14.0"
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+rustc_infer = { path = "../rustc_infer" }
+rustc_trait_selection = { path = "../rustc_trait_selection" }
diff --git a/src/librustc_traits/chalk/db.rs b/compiler/rustc_traits/src/chalk/db.rs
index 4c8be8eb610..4c8be8eb610 100644
--- a/src/librustc_traits/chalk/db.rs
+++ b/compiler/rustc_traits/src/chalk/db.rs
diff --git a/src/librustc_traits/chalk/lowering.rs b/compiler/rustc_traits/src/chalk/lowering.rs
index a043fa3f4c8..a043fa3f4c8 100644
--- a/src/librustc_traits/chalk/lowering.rs
+++ b/compiler/rustc_traits/src/chalk/lowering.rs
diff --git a/src/librustc_traits/chalk/mod.rs b/compiler/rustc_traits/src/chalk/mod.rs
index f18b4ca65f6..f18b4ca65f6 100644
--- a/src/librustc_traits/chalk/mod.rs
+++ b/compiler/rustc_traits/src/chalk/mod.rs
diff --git a/src/librustc_traits/dropck_outlives.rs b/compiler/rustc_traits/src/dropck_outlives.rs
index ce00060b9b1..ce00060b9b1 100644
--- a/src/librustc_traits/dropck_outlives.rs
+++ b/compiler/rustc_traits/src/dropck_outlives.rs
diff --git a/src/librustc_traits/evaluate_obligation.rs b/compiler/rustc_traits/src/evaluate_obligation.rs
index 2404b7ff4b5..2404b7ff4b5 100644
--- a/src/librustc_traits/evaluate_obligation.rs
+++ b/compiler/rustc_traits/src/evaluate_obligation.rs
diff --git a/src/librustc_traits/implied_outlives_bounds.rs b/compiler/rustc_traits/src/implied_outlives_bounds.rs
index de3096eac9b..de3096eac9b 100644
--- a/src/librustc_traits/implied_outlives_bounds.rs
+++ b/compiler/rustc_traits/src/implied_outlives_bounds.rs
diff --git a/src/librustc_traits/lib.rs b/compiler/rustc_traits/src/lib.rs
index 6fea4732dda..6fea4732dda 100644
--- a/src/librustc_traits/lib.rs
+++ b/compiler/rustc_traits/src/lib.rs
diff --git a/src/librustc_traits/normalize_erasing_regions.rs b/compiler/rustc_traits/src/normalize_erasing_regions.rs
index 83aee31a39f..83aee31a39f 100644
--- a/src/librustc_traits/normalize_erasing_regions.rs
+++ b/compiler/rustc_traits/src/normalize_erasing_regions.rs
diff --git a/src/librustc_traits/normalize_projection_ty.rs b/compiler/rustc_traits/src/normalize_projection_ty.rs
index a8e376838e2..a8e376838e2 100644
--- a/src/librustc_traits/normalize_projection_ty.rs
+++ b/compiler/rustc_traits/src/normalize_projection_ty.rs
diff --git a/src/librustc_traits/type_op.rs b/compiler/rustc_traits/src/type_op.rs
index 139ed6dcd35..139ed6dcd35 100644
--- a/src/librustc_traits/type_op.rs
+++ b/compiler/rustc_traits/src/type_op.rs
diff --git a/compiler/rustc_ty/Cargo.toml b/compiler/rustc_ty/Cargo.toml
new file mode 100644
index 00000000000..acb011b2dc0
--- /dev/null
+++ b/compiler/rustc_ty/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_ty"
+version = "0.0.0"
+edition = "2018"
+
+[dependencies]
+tracing = "0.1"
+rustc_middle = { path = "../rustc_middle" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_infer = { path = "../rustc_infer" }
+rustc_span = { path = "../rustc_span" }
+rustc_session = { path = "../rustc_session" }
+rustc_target = { path = "../rustc_target" }
+rustc_trait_selection = { path = "../rustc_trait_selection" }
diff --git a/src/librustc_ty/common_traits.rs b/compiler/rustc_ty/src/common_traits.rs
index 24ba0717866..24ba0717866 100644
--- a/src/librustc_ty/common_traits.rs
+++ b/compiler/rustc_ty/src/common_traits.rs
diff --git a/src/librustc_ty/instance.rs b/compiler/rustc_ty/src/instance.rs
index d0bd88af1ff..d0bd88af1ff 100644
--- a/src/librustc_ty/instance.rs
+++ b/compiler/rustc_ty/src/instance.rs
diff --git a/src/librustc_ty/lib.rs b/compiler/rustc_ty/src/lib.rs
index 6e9042d1ba7..6e9042d1ba7 100644
--- a/src/librustc_ty/lib.rs
+++ b/compiler/rustc_ty/src/lib.rs
diff --git a/src/librustc_ty/needs_drop.rs b/compiler/rustc_ty/src/needs_drop.rs
index c4af95205fe..c4af95205fe 100644
--- a/src/librustc_ty/needs_drop.rs
+++ b/compiler/rustc_ty/src/needs_drop.rs
diff --git a/src/librustc_ty/ty.rs b/compiler/rustc_ty/src/ty.rs
index 0f1dee7e2e0..0f1dee7e2e0 100644
--- a/src/librustc_ty/ty.rs
+++ b/compiler/rustc_ty/src/ty.rs
diff --git a/compiler/rustc_typeck/Cargo.toml b/compiler/rustc_typeck/Cargo.toml
new file mode 100644
index 00000000000..0a6bfaef431
--- /dev/null
+++ b/compiler/rustc_typeck/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_typeck"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+test = false
+doctest = false
+
+[dependencies]
+rustc_arena = { path = "../rustc_arena" }
+tracing = "0.1"
+rustc_middle = { path = "../rustc_middle" }
+rustc_attr = { path = "../rustc_attr" }
+rustc_data_structures = { path = "../rustc_data_structures" }
+rustc_errors = { path = "../rustc_errors" }
+rustc_hir = { path = "../rustc_hir" }
+rustc_hir_pretty = { path = "../rustc_hir_pretty" }
+rustc_target = { path = "../rustc_target" }
+rustc_session = { path = "../rustc_session" }
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+rustc_ast = { path = "../rustc_ast" }
+rustc_span = { path = "../rustc_span" }
+rustc_index = { path = "../rustc_index" }
+rustc_infer = { path = "../rustc_infer" }
+rustc_trait_selection = { path = "../rustc_trait_selection" }
diff --git a/src/librustc_typeck/README.md b/compiler/rustc_typeck/README.md
index b61dbd8c964..b61dbd8c964 100644
--- a/src/librustc_typeck/README.md
+++ b/compiler/rustc_typeck/README.md
diff --git a/src/librustc_typeck/astconv/errors.rs b/compiler/rustc_typeck/src/astconv/errors.rs
index 685243f54cb..685243f54cb 100644
--- a/src/librustc_typeck/astconv/errors.rs
+++ b/compiler/rustc_typeck/src/astconv/errors.rs
diff --git a/src/librustc_typeck/astconv/generics.rs b/compiler/rustc_typeck/src/astconv/generics.rs
index 84dab6de958..84dab6de958 100644
--- a/src/librustc_typeck/astconv/generics.rs
+++ b/compiler/rustc_typeck/src/astconv/generics.rs
diff --git a/src/librustc_typeck/astconv/mod.rs b/compiler/rustc_typeck/src/astconv/mod.rs
index 80dd26e9154..80dd26e9154 100644
--- a/src/librustc_typeck/astconv/mod.rs
+++ b/compiler/rustc_typeck/src/astconv/mod.rs
diff --git a/src/librustc_typeck/bounds.rs b/compiler/rustc_typeck/src/bounds.rs
index 63295f5faac..63295f5faac 100644
--- a/src/librustc_typeck/bounds.rs
+++ b/compiler/rustc_typeck/src/bounds.rs
diff --git a/src/librustc_typeck/check/_match.rs b/compiler/rustc_typeck/src/check/_match.rs
index afd4413069e..afd4413069e 100644
--- a/src/librustc_typeck/check/_match.rs
+++ b/compiler/rustc_typeck/src/check/_match.rs
diff --git a/src/librustc_typeck/check/autoderef.rs b/compiler/rustc_typeck/src/check/autoderef.rs
index 97d2b3e5a8e..97d2b3e5a8e 100644
--- a/src/librustc_typeck/check/autoderef.rs
+++ b/compiler/rustc_typeck/src/check/autoderef.rs
diff --git a/src/librustc_typeck/check/callee.rs b/compiler/rustc_typeck/src/check/callee.rs
index 4ba64035ca4..4ba64035ca4 100644
--- a/src/librustc_typeck/check/callee.rs
+++ b/compiler/rustc_typeck/src/check/callee.rs
diff --git a/src/librustc_typeck/check/cast.rs b/compiler/rustc_typeck/src/check/cast.rs
index e41314e8ab0..e41314e8ab0 100644
--- a/src/librustc_typeck/check/cast.rs
+++ b/compiler/rustc_typeck/src/check/cast.rs
diff --git a/src/librustc_typeck/check/closure.rs b/compiler/rustc_typeck/src/check/closure.rs
index 97f7e4537ce..97f7e4537ce 100644
--- a/src/librustc_typeck/check/closure.rs
+++ b/compiler/rustc_typeck/src/check/closure.rs
diff --git a/src/librustc_typeck/check/coercion.rs b/compiler/rustc_typeck/src/check/coercion.rs
index f0802c45ae0..f0802c45ae0 100644
--- a/src/librustc_typeck/check/coercion.rs
+++ b/compiler/rustc_typeck/src/check/coercion.rs
diff --git a/src/librustc_typeck/check/compare_method.rs b/compiler/rustc_typeck/src/check/compare_method.rs
index 7adcd7b472e..7adcd7b472e 100644
--- a/src/librustc_typeck/check/compare_method.rs
+++ b/compiler/rustc_typeck/src/check/compare_method.rs
diff --git a/src/librustc_typeck/check/demand.rs b/compiler/rustc_typeck/src/check/demand.rs
index 5dc5480c335..5dc5480c335 100644
--- a/src/librustc_typeck/check/demand.rs
+++ b/compiler/rustc_typeck/src/check/demand.rs
diff --git a/src/librustc_typeck/check/dropck.rs b/compiler/rustc_typeck/src/check/dropck.rs
index 434886538fb..434886538fb 100644
--- a/src/librustc_typeck/check/dropck.rs
+++ b/compiler/rustc_typeck/src/check/dropck.rs
diff --git a/src/librustc_typeck/check/expr.rs b/compiler/rustc_typeck/src/check/expr.rs
index 1573fb96791..1573fb96791 100644
--- a/src/librustc_typeck/check/expr.rs
+++ b/compiler/rustc_typeck/src/check/expr.rs
diff --git a/src/librustc_typeck/check/generator_interior.rs b/compiler/rustc_typeck/src/check/generator_interior.rs
index 93fdf93e9e3..93fdf93e9e3 100644
--- a/src/librustc_typeck/check/generator_interior.rs
+++ b/compiler/rustc_typeck/src/check/generator_interior.rs
diff --git a/src/librustc_typeck/check/intrinsic.rs b/compiler/rustc_typeck/src/check/intrinsic.rs
index 47cea8649ef..47cea8649ef 100644
--- a/src/librustc_typeck/check/intrinsic.rs
+++ b/compiler/rustc_typeck/src/check/intrinsic.rs
diff --git a/src/librustc_typeck/check/method/confirm.rs b/compiler/rustc_typeck/src/check/method/confirm.rs
index 41e37ee9752..41e37ee9752 100644
--- a/src/librustc_typeck/check/method/confirm.rs
+++ b/compiler/rustc_typeck/src/check/method/confirm.rs
diff --git a/src/librustc_typeck/check/method/mod.rs b/compiler/rustc_typeck/src/check/method/mod.rs
index c9a4df0317a..c9a4df0317a 100644
--- a/src/librustc_typeck/check/method/mod.rs
+++ b/compiler/rustc_typeck/src/check/method/mod.rs
diff --git a/src/librustc_typeck/check/method/probe.rs b/compiler/rustc_typeck/src/check/method/probe.rs
index 7ac6681be1a..7ac6681be1a 100644
--- a/src/librustc_typeck/check/method/probe.rs
+++ b/compiler/rustc_typeck/src/check/method/probe.rs
diff --git a/src/librustc_typeck/check/method/suggest.rs b/compiler/rustc_typeck/src/check/method/suggest.rs
index 5cae66bc5da..5cae66bc5da 100644
--- a/src/librustc_typeck/check/method/suggest.rs
+++ b/compiler/rustc_typeck/src/check/method/suggest.rs
diff --git a/src/librustc_typeck/check/mod.rs b/compiler/rustc_typeck/src/check/mod.rs
index 031d48f8a60..031d48f8a60 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/compiler/rustc_typeck/src/check/mod.rs
diff --git a/src/librustc_typeck/check/op.rs b/compiler/rustc_typeck/src/check/op.rs
index 66fb01a54f5..66fb01a54f5 100644
--- a/src/librustc_typeck/check/op.rs
+++ b/compiler/rustc_typeck/src/check/op.rs
diff --git a/src/librustc_typeck/check/pat.rs b/compiler/rustc_typeck/src/check/pat.rs
index d1864ee2b35..d1864ee2b35 100644
--- a/src/librustc_typeck/check/pat.rs
+++ b/compiler/rustc_typeck/src/check/pat.rs
diff --git a/src/librustc_typeck/check/place_op.rs b/compiler/rustc_typeck/src/check/place_op.rs
index 4bef9aecd2e..4bef9aecd2e 100644
--- a/src/librustc_typeck/check/place_op.rs
+++ b/compiler/rustc_typeck/src/check/place_op.rs
diff --git a/src/librustc_typeck/check/regionck.rs b/compiler/rustc_typeck/src/check/regionck.rs
index 484961dbdb8..484961dbdb8 100644
--- a/src/librustc_typeck/check/regionck.rs
+++ b/compiler/rustc_typeck/src/check/regionck.rs
diff --git a/src/librustc_typeck/check/upvar.rs b/compiler/rustc_typeck/src/check/upvar.rs
index 9bb84c07868..9bb84c07868 100644
--- a/src/librustc_typeck/check/upvar.rs
+++ b/compiler/rustc_typeck/src/check/upvar.rs
diff --git a/src/librustc_typeck/check/wfcheck.rs b/compiler/rustc_typeck/src/check/wfcheck.rs
index 9c692edaa7f..9c692edaa7f 100644
--- a/src/librustc_typeck/check/wfcheck.rs
+++ b/compiler/rustc_typeck/src/check/wfcheck.rs
diff --git a/src/librustc_typeck/check/writeback.rs b/compiler/rustc_typeck/src/check/writeback.rs
index 67f67e64dd4..67f67e64dd4 100644
--- a/src/librustc_typeck/check/writeback.rs
+++ b/compiler/rustc_typeck/src/check/writeback.rs
diff --git a/src/librustc_typeck/check_unused.rs b/compiler/rustc_typeck/src/check_unused.rs
index 4fda8932e21..4fda8932e21 100644
--- a/src/librustc_typeck/check_unused.rs
+++ b/compiler/rustc_typeck/src/check_unused.rs
diff --git a/src/librustc_typeck/coherence/builtin.rs b/compiler/rustc_typeck/src/coherence/builtin.rs
index 0d3cac7f7f3..0d3cac7f7f3 100644
--- a/src/librustc_typeck/coherence/builtin.rs
+++ b/compiler/rustc_typeck/src/coherence/builtin.rs
diff --git a/src/librustc_typeck/coherence/inherent_impls.rs b/compiler/rustc_typeck/src/coherence/inherent_impls.rs
index 859d510dcbe..859d510dcbe 100644
--- a/src/librustc_typeck/coherence/inherent_impls.rs
+++ b/compiler/rustc_typeck/src/coherence/inherent_impls.rs
diff --git a/src/librustc_typeck/coherence/inherent_impls_overlap.rs b/compiler/rustc_typeck/src/coherence/inherent_impls_overlap.rs
index be77d049cae..be77d049cae 100644
--- a/src/librustc_typeck/coherence/inherent_impls_overlap.rs
+++ b/compiler/rustc_typeck/src/coherence/inherent_impls_overlap.rs
diff --git a/src/librustc_typeck/coherence/mod.rs b/compiler/rustc_typeck/src/coherence/mod.rs
index 1483244717b..1483244717b 100644
--- a/src/librustc_typeck/coherence/mod.rs
+++ b/compiler/rustc_typeck/src/coherence/mod.rs
diff --git a/src/librustc_typeck/coherence/orphan.rs b/compiler/rustc_typeck/src/coherence/orphan.rs
index 71469770f2a..71469770f2a 100644
--- a/src/librustc_typeck/coherence/orphan.rs
+++ b/compiler/rustc_typeck/src/coherence/orphan.rs
diff --git a/src/librustc_typeck/coherence/unsafety.rs b/compiler/rustc_typeck/src/coherence/unsafety.rs
index b281092ea63..b281092ea63 100644
--- a/src/librustc_typeck/coherence/unsafety.rs
+++ b/compiler/rustc_typeck/src/coherence/unsafety.rs
diff --git a/src/librustc_typeck/collect.rs b/compiler/rustc_typeck/src/collect.rs
index 7a3f7ec56a2..7a3f7ec56a2 100644
--- a/src/librustc_typeck/collect.rs
+++ b/compiler/rustc_typeck/src/collect.rs
diff --git a/src/librustc_typeck/collect/type_of.rs b/compiler/rustc_typeck/src/collect/type_of.rs
index 70ed92c5614..70ed92c5614 100644
--- a/src/librustc_typeck/collect/type_of.rs
+++ b/compiler/rustc_typeck/src/collect/type_of.rs
diff --git a/src/librustc_typeck/constrained_generic_params.rs b/compiler/rustc_typeck/src/constrained_generic_params.rs
index 7c80315ee19..7c80315ee19 100644
--- a/src/librustc_typeck/constrained_generic_params.rs
+++ b/compiler/rustc_typeck/src/constrained_generic_params.rs
diff --git a/src/librustc_typeck/expr_use_visitor.rs b/compiler/rustc_typeck/src/expr_use_visitor.rs
index e774f2d095d..e774f2d095d 100644
--- a/src/librustc_typeck/expr_use_visitor.rs
+++ b/compiler/rustc_typeck/src/expr_use_visitor.rs
diff --git a/src/librustc_typeck/impl_wf_check.rs b/compiler/rustc_typeck/src/impl_wf_check.rs
index 891e482b431..891e482b431 100644
--- a/src/librustc_typeck/impl_wf_check.rs
+++ b/compiler/rustc_typeck/src/impl_wf_check.rs
diff --git a/src/librustc_typeck/impl_wf_check/min_specialization.rs b/compiler/rustc_typeck/src/impl_wf_check/min_specialization.rs
index 3746e5778aa..3746e5778aa 100644
--- a/src/librustc_typeck/impl_wf_check/min_specialization.rs
+++ b/compiler/rustc_typeck/src/impl_wf_check/min_specialization.rs
diff --git a/src/librustc_typeck/lib.rs b/compiler/rustc_typeck/src/lib.rs
index 62f92fe7ffa..62f92fe7ffa 100644
--- a/src/librustc_typeck/lib.rs
+++ b/compiler/rustc_typeck/src/lib.rs
diff --git a/src/librustc_typeck/mem_categorization.rs b/compiler/rustc_typeck/src/mem_categorization.rs
index 8a6fe620af7..8a6fe620af7 100644
--- a/src/librustc_typeck/mem_categorization.rs
+++ b/compiler/rustc_typeck/src/mem_categorization.rs
diff --git a/src/librustc_typeck/outlives/explicit.rs b/compiler/rustc_typeck/src/outlives/explicit.rs
index 135960a4c11..135960a4c11 100644
--- a/src/librustc_typeck/outlives/explicit.rs
+++ b/compiler/rustc_typeck/src/outlives/explicit.rs
diff --git a/src/librustc_typeck/outlives/implicit_infer.rs b/compiler/rustc_typeck/src/outlives/implicit_infer.rs
index 762d4216f70..762d4216f70 100644
--- a/src/librustc_typeck/outlives/implicit_infer.rs
+++ b/compiler/rustc_typeck/src/outlives/implicit_infer.rs
diff --git a/src/librustc_typeck/outlives/mod.rs b/compiler/rustc_typeck/src/outlives/mod.rs
index 94926f480e2..94926f480e2 100644
--- a/src/librustc_typeck/outlives/mod.rs
+++ b/compiler/rustc_typeck/src/outlives/mod.rs
diff --git a/src/librustc_typeck/outlives/test.rs b/compiler/rustc_typeck/src/outlives/test.rs
index abe9319d71c..abe9319d71c 100644
--- a/src/librustc_typeck/outlives/test.rs
+++ b/compiler/rustc_typeck/src/outlives/test.rs
diff --git a/src/librustc_typeck/outlives/utils.rs b/compiler/rustc_typeck/src/outlives/utils.rs
index 8b069678796..8b069678796 100644
--- a/src/librustc_typeck/outlives/utils.rs
+++ b/compiler/rustc_typeck/src/outlives/utils.rs
diff --git a/src/librustc_typeck/structured_errors.rs b/compiler/rustc_typeck/src/structured_errors.rs
index 83125a3e2fe..83125a3e2fe 100644
--- a/src/librustc_typeck/structured_errors.rs
+++ b/compiler/rustc_typeck/src/structured_errors.rs
diff --git a/src/librustc_typeck/variance/constraints.rs b/compiler/rustc_typeck/src/variance/constraints.rs
index 535530a2ed4..535530a2ed4 100644
--- a/src/librustc_typeck/variance/constraints.rs
+++ b/compiler/rustc_typeck/src/variance/constraints.rs
diff --git a/src/librustc_typeck/variance/mod.rs b/compiler/rustc_typeck/src/variance/mod.rs
index a893f69c48a..a893f69c48a 100644
--- a/src/librustc_typeck/variance/mod.rs
+++ b/compiler/rustc_typeck/src/variance/mod.rs
diff --git a/src/librustc_typeck/variance/solve.rs b/compiler/rustc_typeck/src/variance/solve.rs
index 7402117a7eb..7402117a7eb 100644
--- a/src/librustc_typeck/variance/solve.rs
+++ b/compiler/rustc_typeck/src/variance/solve.rs
diff --git a/src/librustc_typeck/variance/terms.rs b/compiler/rustc_typeck/src/variance/terms.rs
index f61a783de69..f61a783de69 100644
--- a/src/librustc_typeck/variance/terms.rs
+++ b/compiler/rustc_typeck/src/variance/terms.rs
diff --git a/src/librustc_typeck/variance/test.rs b/compiler/rustc_typeck/src/variance/test.rs
index 1aab89310c6..1aab89310c6 100644
--- a/src/librustc_typeck/variance/test.rs
+++ b/compiler/rustc_typeck/src/variance/test.rs
diff --git a/src/librustc_typeck/variance/xform.rs b/compiler/rustc_typeck/src/variance/xform.rs
index 027f0859fcd..027f0859fcd 100644
--- a/src/librustc_typeck/variance/xform.rs
+++ b/compiler/rustc_typeck/src/variance/xform.rs
diff --git a/src/bootstrap/README.md b/src/bootstrap/README.md
index 86de3d5c6d8..975b8be02c8 100644
--- a/src/bootstrap/README.md
+++ b/src/bootstrap/README.md
@@ -274,7 +274,7 @@ directory, but rather the compiler is split into three different Cargo projects:
 
 * `library/std` - the standard library
 * `library/test` - testing support, depends on libstd
-* `src/rustc` - the actual compiler itself
+* `compiler/rustc` - the actual compiler itself
 
 Each "project" has a corresponding Cargo.lock file with all dependencies, and
 this means that building the compiler involves running Cargo three times. The
diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/builder/tests.rs
index 5b6c327896b..c395e1da6dd 100644
--- a/src/bootstrap/builder/tests.rs
+++ b/src/bootstrap/builder/tests.rs
@@ -371,7 +371,7 @@ mod dist {
         let mut builder = Builder::new(&build);
         builder.run_step_descriptions(
             &Builder::get_step_descriptions(Kind::Build),
-            &["src/rustc".into(), "library/std".into()],
+            &["compiler/rustc".into(), "library/std".into()],
         );
 
         let a = TargetSelection::from_user("A");
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index 373e240cb8e..bf06b61d1d7 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -449,7 +449,7 @@ impl Step for Rustc {
     const DEFAULT: bool = false;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.path("src/rustc")
+        run.path("compiler/rustc")
     }
 
     fn make_run(run: RunConfig<'_>) {
@@ -524,7 +524,7 @@ pub fn rustc_cargo(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetSelec
         .arg("--features")
         .arg(builder.rustc_features())
         .arg("--manifest-path")
-        .arg(builder.src.join("src/rustc/Cargo.toml"));
+        .arg(builder.src.join("compiler/rustc/Cargo.toml"));
     rustc_cargo_env(builder, cargo, target);
 }
 
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index d021feafbe4..c1022099a02 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -1097,7 +1097,7 @@ impl Step for PlainSourceTarball {
             "Cargo.toml",
             "Cargo.lock",
         ];
-        let src_dirs = ["src", "library"];
+        let src_dirs = ["src", "compiler", "library"];
 
         copy_src_dirs(builder, &builder.src, &src_dirs, &[], &plain_dst_src);
 
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index 2a8f43950db..d7f3a888edd 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -694,6 +694,7 @@ impl Step for UnstableBookGen {
         builder.remove_dir(&out);
         let mut cmd = builder.tool_cmd(Tool::UnstableBookGen);
         cmd.arg(builder.src.join("library"));
+        cmd.arg(builder.src.join("compiler"));
         cmd.arg(builder.src.join("src"));
         cmd.arg(out);
 
diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs
index 38b3a32e3b5..2db4bb07a9f 100644
--- a/src/bootstrap/flags.rs
+++ b/src/bootstrap/flags.rs
@@ -385,7 +385,7 @@ Arguments:
         ./x.py test src/test/ui --bless
         ./x.py test src/test/ui --compare-mode nll
 
-    Note that `test src/test/* --stage N` does NOT depend on `build src/rustc --stage N`;
+    Note that `test src/test/* --stage N` does NOT depend on `build compiler/rustc --stage N`;
     just like `build library/std --stage N` it tests the compiler produced by the previous
     stage.
 
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index ac833a55d4c..a7c9b99f45f 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -734,7 +734,7 @@ impl Step for Tidy {
     /// for the `dev` or `nightly` channels.
     fn run(self, builder: &Builder<'_>) {
         let mut cmd = builder.tool_cmd(Tool::Tidy);
-        cmd.arg(builder.src.join("src"));
+        cmd.arg(&builder.src);
         cmd.arg(&builder.initial_cargo);
         if builder.is_verbose() {
             cmd.arg("--verbose");
diff --git a/src/librustc_ast/Cargo.toml b/src/librustc_ast/Cargo.toml
deleted file mode 100644
index 73c5e33753f..00000000000
--- a/src/librustc_ast/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_ast"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_ast"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_serialize = { path = "../librustc_serialize" }
-tracing = "0.1"
-rustc_span = { path = "../librustc_span" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_index = { path = "../librustc_index" }
-rustc_lexer = { path = "../librustc_lexer" }
-rustc_macros = { path = "../librustc_macros" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-bitflags = "1.2.1"
diff --git a/src/librustc_ast_lowering/Cargo.toml b/src/librustc_ast_lowering/Cargo.toml
deleted file mode 100644
index bf7e69a31ab..00000000000
--- a/src/librustc_ast_lowering/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_ast_lowering"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_ast_lowering"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_arena = { path = "../librustc_arena" }
-tracing = "0.1"
-rustc_ast_pretty = { path = "../librustc_ast_pretty" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_target = { path = "../librustc_target" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_index = { path = "../librustc_index" }
-rustc_span = { path = "../librustc_span" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_session = { path = "../librustc_session" }
-rustc_ast = { path = "../librustc_ast" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_ast_passes/Cargo.toml b/src/librustc_ast_passes/Cargo.toml
deleted file mode 100644
index 6db9bce3164..00000000000
--- a/src/librustc_ast_passes/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_ast_passes"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_ast_passes"
-path = "lib.rs"
-
-[dependencies]
-itertools = "0.8"
-tracing = "0.1"
-rustc_ast_pretty = { path = "../librustc_ast_pretty" }
-rustc_attr = { path = "../librustc_attr" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_feature = { path = "../librustc_feature" }
-rustc_parse = { path = "../librustc_parse" }
-rustc_session = { path = "../librustc_session" }
-rustc_span = { path = "../librustc_span" }
-rustc_ast = { path = "../librustc_ast" }
diff --git a/src/librustc_ast_pretty/Cargo.toml b/src/librustc_ast_pretty/Cargo.toml
deleted file mode 100644
index d26205c791d..00000000000
--- a/src/librustc_ast_pretty/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_ast_pretty"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_ast_pretty"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-tracing = "0.1"
-rustc_span = { path = "../librustc_span" }
-rustc_ast = { path = "../librustc_ast" }
-rustc_target = { path = "../librustc_target" }
diff --git a/src/librustc_attr/Cargo.toml b/src/librustc_attr/Cargo.toml
deleted file mode 100644
index 35bdf747f08..00000000000
--- a/src/librustc_attr/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_attr"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_attr"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_ast_pretty = { path = "../librustc_ast_pretty" }
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_span = { path = "../librustc_span" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_feature = { path = "../librustc_feature" }
-rustc_lexer = { path = "../librustc_lexer" }
-rustc_macros = { path = "../librustc_macros" }
-rustc_session = { path = "../librustc_session" }
-rustc_ast = { path = "../librustc_ast" }
-version_check = "0.9"
diff --git a/src/librustc_builtin_macros/Cargo.toml b/src/librustc_builtin_macros/Cargo.toml
deleted file mode 100644
index dee6fed317e..00000000000
--- a/src/librustc_builtin_macros/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_builtin_macros"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_builtin_macros"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_parse_format = { path = "../librustc_parse_format" }
-tracing = "0.1"
-rustc_ast_pretty = { path = "../librustc_ast_pretty" }
-rustc_attr = { path = "../librustc_attr" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_feature = { path = "../librustc_feature" }
-rustc_parse = { path = "../librustc_parse" }
-rustc_target = { path = "../librustc_target" }
-rustc_session = { path = "../librustc_session" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-rustc_ast = { path = "../librustc_ast" }
-rustc_expand = { path = "../librustc_expand" }
-rustc_span = { path = "../librustc_span" }
diff --git a/src/librustc_codegen_llvm/Cargo.toml b/src/librustc_codegen_llvm/Cargo.toml
deleted file mode 100644
index d8ccaf16e28..00000000000
--- a/src/librustc_codegen_llvm/Cargo.toml
+++ /dev/null
@@ -1,36 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_codegen_llvm"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_codegen_llvm"
-path = "lib.rs"
-test = false
-doctest = false
-
-[dependencies]
-bitflags = "1.0"
-libc = "0.2"
-measureme = "0.7.1"
-snap = "1"
-tracing = "0.1"
-rustc_middle = { path = "../librustc_middle" }
-rustc-demangle = "0.1"
-rustc_attr = { path = "../librustc_attr" }
-rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_feature = { path = "../librustc_feature" }
-rustc_fs_util = { path = "../librustc_fs_util" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_incremental = { path = "../librustc_incremental" }
-rustc_index = { path = "../librustc_index" }
-rustc_llvm = { path = "../librustc_llvm" }
-rustc_session = { path = "../librustc_session" }
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_target = { path = "../librustc_target" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-rustc_ast = { path = "../librustc_ast" }
-rustc_span = { path = "../librustc_span" }
diff --git a/src/librustc_codegen_ssa/Cargo.toml b/src/librustc_codegen_ssa/Cargo.toml
deleted file mode 100644
index 5707d3cd0ed..00000000000
--- a/src/librustc_codegen_ssa/Cargo.toml
+++ /dev/null
@@ -1,38 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_codegen_ssa"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_codegen_ssa"
-path = "lib.rs"
-test = false
-
-[dependencies]
-bitflags = "1.2.1"
-cc = "1.0.1"
-num_cpus = "1.0"
-memmap = "0.7"
-tracing = "0.1"
-libc = "0.2.50"
-jobserver = "0.1.11"
-tempfile = "3.1"
-pathdiff = "0.2.0"
-
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_ast = { path = "../librustc_ast" }
-rustc_span = { path = "../librustc_span" }
-rustc_middle = { path = "../librustc_middle" }
-rustc_apfloat = { path = "../librustc_apfloat" }
-rustc_attr = { path = "../librustc_attr" }
-rustc_symbol_mangling = { path = "../librustc_symbol_mangling" }
-rustc_data_structures = { path = "../librustc_data_structures"}
-rustc_errors = { path = "../librustc_errors" }
-rustc_fs_util = { path = "../librustc_fs_util" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_incremental = { path = "../librustc_incremental" }
-rustc_index = { path = "../librustc_index" }
-rustc_macros = { path = "../librustc_macros" }
-rustc_target = { path = "../librustc_target" }
-rustc_session = { path = "../librustc_session" }
diff --git a/src/librustc_driver/Cargo.toml b/src/librustc_driver/Cargo.toml
deleted file mode 100644
index 46331c63113..00000000000
--- a/src/librustc_driver/Cargo.toml
+++ /dev/null
@@ -1,43 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_driver"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_driver"
-path = "lib.rs"
-crate-type = ["dylib"]
-
-[dependencies]
-lazy_static = "1.0"
-libc = "0.2"
-tracing = { version = "0.1.18", features = ["release_max_level_info"]  }
-tracing-subscriber = { version = "0.2.10", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] }
-rustc_middle = { path = "../librustc_middle" }
-rustc_ast_pretty = { path = "../librustc_ast_pretty" }
-rustc_target = { path = "../librustc_target" }
-rustc_lint = { path = "../librustc_lint" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_feature = { path = "../librustc_feature" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_hir_pretty = { path = "../librustc_hir_pretty" }
-rustc_metadata = { path = "../librustc_metadata" }
-rustc_mir = { path = "../librustc_mir" }
-rustc_parse = { path = "../librustc_parse" }
-rustc_plugin_impl = { path = "../librustc_plugin_impl" }
-rustc_save_analysis = { path = "../librustc_save_analysis" }
-rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
-rustc_session = { path = "../librustc_session" }
-rustc_error_codes = { path = "../librustc_error_codes" }
-rustc_interface = { path = "../librustc_interface" }
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_ast = { path = "../librustc_ast" }
-rustc_span = { path = "../librustc_span" }
-
-[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["consoleapi", "debugapi", "processenv"] }
-
-[features]
-llvm = ['rustc_interface/llvm']
diff --git a/src/librustc_expand/Cargo.toml b/src/librustc_expand/Cargo.toml
deleted file mode 100644
index 55a1862971b..00000000000
--- a/src/librustc_expand/Cargo.toml
+++ /dev/null
@@ -1,28 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_expand"
-version = "0.0.0"
-edition = "2018"
-build = false
-
-[lib]
-name = "rustc_expand"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_serialize = { path = "../librustc_serialize" }
-tracing = "0.1"
-rustc_span = { path = "../librustc_span" }
-rustc_ast_pretty = { path = "../librustc_ast_pretty" }
-rustc_ast_passes = { path = "../librustc_ast_passes" }
-rustc_attr = { path = "../librustc_attr" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_feature = { path = "../librustc_feature" }
-rustc_macros = { path = "../librustc_macros" }
-rustc_lexer = { path = "../librustc_lexer" }
-rustc_parse = { path = "../librustc_parse" }
-rustc_session = { path = "../librustc_session" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-rustc_ast = { path = "../librustc_ast" }
diff --git a/src/librustc_hir/Cargo.toml b/src/librustc_hir/Cargo.toml
deleted file mode 100644
index a473a8edcdd..00000000000
--- a/src/librustc_hir/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_hir"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_hir"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_target = { path = "../librustc_target" }
-rustc_macros = { path = "../librustc_macros" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_index = { path = "../librustc_index" }
-rustc_span = { path = "../librustc_span" }
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_ast = { path = "../librustc_ast" }
-lazy_static = "1"
-tracing = "0.1"
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_hir_pretty/Cargo.toml b/src/librustc_hir_pretty/Cargo.toml
deleted file mode 100644
index ccd3e9b6e43..00000000000
--- a/src/librustc_hir_pretty/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_hir_pretty"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_hir_pretty"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_ast_pretty = { path = "../librustc_ast_pretty" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_target = { path = "../librustc_target" }
-rustc_span = { path = "../librustc_span" }
-rustc_ast = { path = "../librustc_ast" }
diff --git a/src/librustc_incremental/Cargo.toml b/src/librustc_incremental/Cargo.toml
deleted file mode 100644
index 1f7e3725412..00000000000
--- a/src/librustc_incremental/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_incremental"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_incremental"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_graphviz = { path = "../librustc_graphviz" }
-tracing = "0.1"
-rand = "0.7"
-rustc_middle = { path = "../librustc_middle" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_ast = { path = "../librustc_ast" }
-rustc_macros = { path = "../librustc_macros" }
-rustc_span = { path = "../librustc_span" }
-rustc_fs_util = { path = "../librustc_fs_util" }
-rustc_session = { path = "../librustc_session" }
diff --git a/src/librustc_infer/Cargo.toml b/src/librustc_infer/Cargo.toml
deleted file mode 100644
index e1698d66323..00000000000
--- a/src/librustc_infer/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_infer"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_infer"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_graphviz = { path = "../librustc_graphviz" }
-tracing = "0.1"
-rustc_middle = { path = "../librustc_middle" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_index = { path = "../librustc_index" }
-rustc_macros = { path = "../librustc_macros" }
-rustc_session = { path = "../librustc_session" }
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_span = { path = "../librustc_span" }
-rustc_target = { path = "../librustc_target" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-rustc_ast = { path = "../librustc_ast" }
diff --git a/src/librustc_interface/Cargo.toml b/src/librustc_interface/Cargo.toml
deleted file mode 100644
index b9837c6ade9..00000000000
--- a/src/librustc_interface/Cargo.toml
+++ /dev/null
@@ -1,57 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_interface"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_interface"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-libc = "0.2"
-tracing = "0.1"
-rayon = { version = "0.3.0", package = "rustc-rayon" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-rustc_ast = { path = "../librustc_ast" }
-rustc_attr = { path = "../librustc_attr" }
-rustc_builtin_macros = { path = "../librustc_builtin_macros" }
-rustc_expand = { path = "../librustc_expand" }
-rustc_parse = { path = "../librustc_parse" }
-rustc_session = { path = "../librustc_session" }
-rustc_span = { path = "../librustc_span" }
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_middle = { path = "../librustc_middle" }
-rustc_ast_lowering = { path = "../librustc_ast_lowering" }
-rustc_ast_passes = { path = "../librustc_ast_passes" }
-rustc_incremental = { path = "../librustc_incremental" }
-rustc_traits = { path = "../librustc_traits" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
-rustc_symbol_mangling = { path = "../librustc_symbol_mangling" }
-rustc_codegen_llvm = { path = "../librustc_codegen_llvm", optional = true }
-rustc_hir = { path = "../librustc_hir" }
-rustc_metadata = { path = "../librustc_metadata" }
-rustc_mir = { path = "../librustc_mir" }
-rustc_mir_build = { path = "../librustc_mir_build" }
-rustc_passes = { path = "../librustc_passes" }
-rustc_typeck = { path = "../librustc_typeck" }
-rustc_lint = { path = "../librustc_lint" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_plugin_impl = { path = "../librustc_plugin_impl" }
-rustc_privacy = { path = "../librustc_privacy" }
-rustc_resolve = { path = "../librustc_resolve" }
-rustc_trait_selection = { path = "../librustc_trait_selection" }
-rustc_ty = { path = "../librustc_ty" }
-tempfile = "3.0.5"
-once_cell = "1"
-
-[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["libloaderapi"] }
-
-[dev-dependencies]
-rustc_target = { path = "../librustc_target" }
-
-[features]
-llvm = ['rustc_codegen_llvm']
diff --git a/src/librustc_lint/Cargo.toml b/src/librustc_lint/Cargo.toml
deleted file mode 100644
index d779f15f19a..00000000000
--- a/src/librustc_lint/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_lint"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_lint"
-path = "lib.rs"
-
-[dependencies]
-tracing = "0.1"
-unicode-security = "0.0.5"
-rustc_middle = { path = "../librustc_middle" }
-rustc_ast_pretty = { path = "../librustc_ast_pretty" }
-rustc_attr = { path = "../librustc_attr" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_target = { path = "../librustc_target" }
-rustc_ast = { path = "../librustc_ast" }
-rustc_span = { path = "../librustc_span" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_feature = { path = "../librustc_feature" }
-rustc_index = { path = "../librustc_index" }
-rustc_session = { path = "../librustc_session" }
-rustc_trait_selection = { path = "../librustc_trait_selection" }
diff --git a/src/librustc_metadata/Cargo.toml b/src/librustc_metadata/Cargo.toml
deleted file mode 100644
index 76e11bd689c..00000000000
--- a/src/librustc_metadata/Cargo.toml
+++ /dev/null
@@ -1,35 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_metadata"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_metadata"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-libc = "0.2"
-snap = "1"
-tracing = "0.1"
-memmap = "0.7"
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-rustc_middle = { path = "../librustc_middle" }
-rustc_attr = { path = "../librustc_attr" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_hir_pretty = { path = "../librustc_hir_pretty" }
-rustc_target = { path = "../librustc_target" }
-rustc_index = { path = "../librustc_index" }
-rustc_macros = { path = "../librustc_macros" }
-rustc_serialize = { path = "../librustc_serialize" }
-stable_deref_trait = "1.0.0"
-rustc_ast = { path = "../librustc_ast" }
-rustc_expand = { path = "../librustc_expand" }
-rustc_span = { path = "../librustc_span" }
-rustc_session = { path = "../librustc_session" }
-
-[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3", features = ["errhandlingapi", "libloaderapi"] }
diff --git a/src/librustc_middle/Cargo.toml b/src/librustc_middle/Cargo.toml
deleted file mode 100644
index 311126361bc..00000000000
--- a/src/librustc_middle/Cargo.toml
+++ /dev/null
@@ -1,35 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_middle"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_middle"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_arena = { path = "../librustc_arena" }
-bitflags = "1.2.1"
-tracing = "0.1"
-rustc-rayon-core = "0.3.0"
-polonius-engine = "0.12.0"
-rustc_apfloat = { path = "../librustc_apfloat" }
-rustc_attr = { path = "../librustc_attr" }
-rustc_feature = { path = "../librustc_feature" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_target = { path = "../librustc_target" }
-rustc_macros = { path = "../librustc_macros" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_query_system = { path = "../librustc_query_system" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_index = { path = "../librustc_index" }
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_ast = { path = "../librustc_ast" }
-rustc_span = { path = "../librustc_span" }
-byteorder = { version = "1.3" }
-chalk-ir = "0.14.0"
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-measureme = "0.7.1"
-rustc_session = { path = "../librustc_session" }
diff --git a/src/librustc_mir/Cargo.toml b/src/librustc_mir/Cargo.toml
deleted file mode 100644
index 2693d29e41c..00000000000
--- a/src/librustc_mir/Cargo.toml
+++ /dev/null
@@ -1,35 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_mir"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_mir"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-either = "1.5.0"
-rustc_graphviz = { path = "../librustc_graphviz" }
-itertools = "0.8"
-tracing = "0.1"
-log_settings = "0.1.1"
-polonius-engine = "0.12.0"
-rustc_middle = { path = "../librustc_middle" }
-rustc_attr = { path = "../librustc_attr" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_index = { path = "../librustc_index" }
-rustc_infer = { path = "../librustc_infer" }
-rustc_lexer = { path = "../librustc_lexer" }
-rustc_macros = { path = "../librustc_macros" }
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_session = { path = "../librustc_session" }
-rustc_target = { path = "../librustc_target" }
-rustc_trait_selection = { path = "../librustc_trait_selection" }
-rustc_ast = { path = "../librustc_ast" }
-rustc_span = { path = "../librustc_span" }
-rustc_apfloat = { path = "../librustc_apfloat" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_mir_build/Cargo.toml b/src/librustc_mir_build/Cargo.toml
deleted file mode 100644
index 97621f205fb..00000000000
--- a/src/librustc_mir_build/Cargo.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_mir_build"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_mir_build"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_arena = { path = "../librustc_arena" }
-tracing = "0.1"
-rustc_middle = { path = "../librustc_middle" }
-rustc_apfloat = { path = "../librustc_apfloat" }
-rustc_attr = { path = "../librustc_attr" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_index = { path = "../librustc_index" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_infer = { path = "../librustc_infer" }
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_session = { path = "../librustc_session" }
-rustc_span = { path = "../librustc_span" }
-rustc_target = { path = "../librustc_target" }
-rustc_trait_selection = { path = "../librustc_trait_selection" }
-rustc_ast = { path = "../librustc_ast" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_parse/Cargo.toml b/src/librustc_parse/Cargo.toml
deleted file mode 100644
index 31d858849af..00000000000
--- a/src/librustc_parse/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_parse"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_parse"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-bitflags = "1.0"
-tracing = "0.1"
-rustc_ast_pretty = { path = "../librustc_ast_pretty" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_feature = { path = "../librustc_feature" }
-rustc_lexer = { path = "../librustc_lexer" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_session = { path = "../librustc_session" }
-rustc_span = { path = "../librustc_span" }
-rustc_ast = { path = "../librustc_ast" }
-unicode-normalization = "0.1.11"
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_parse_format/Cargo.toml b/src/librustc_parse_format/Cargo.toml
deleted file mode 100644
index 646509569f3..00000000000
--- a/src/librustc_parse_format/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_parse_format"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_parse_format"
-path = "lib.rs"
-
-[dependencies]
-rustc_span = { path = "../librustc_span" }
-rustc_lexer = { path = "../librustc_lexer" }
diff --git a/src/librustc_passes/Cargo.toml b/src/librustc_passes/Cargo.toml
deleted file mode 100644
index db481c0d0d4..00000000000
--- a/src/librustc_passes/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_passes"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_passes"
-path = "lib.rs"
-
-[dependencies]
-tracing = "0.1"
-rustc_middle = { path = "../librustc_middle" }
-rustc_attr = { path = "../librustc_attr" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_index = { path = "../librustc_index" }
-rustc_session = { path = "../librustc_session" }
-rustc_target = { path = "../librustc_target" }
-rustc_ast = { path = "../librustc_ast" }
-rustc_span = { path = "../librustc_span" }
-rustc_trait_selection = { path = "../librustc_trait_selection" }
diff --git a/src/librustc_plugin_impl/Cargo.toml b/src/librustc_plugin_impl/Cargo.toml
deleted file mode 100644
index 38cfbd48de2..00000000000
--- a/src/librustc_plugin_impl/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_plugin_impl"
-version = "0.0.0"
-build = false
-edition = "2018"
-
-[lib]
-name = "rustc_plugin_impl"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_middle = { path = "../librustc_middle" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_lint = { path = "../librustc_lint" }
-rustc_metadata = { path = "../librustc_metadata" }
-rustc_ast = { path = "../librustc_ast" }
-rustc_session = { path = "../librustc_session" }
-rustc_span = { path = "../librustc_span" }
diff --git a/src/librustc_privacy/Cargo.toml b/src/librustc_privacy/Cargo.toml
deleted file mode 100644
index 3641f0f8a31..00000000000
--- a/src/librustc_privacy/Cargo.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_privacy"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_privacy"
-path = "lib.rs"
-
-[dependencies]
-rustc_middle = { path = "../librustc_middle" }
-rustc_attr = { path = "../librustc_attr" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_typeck = { path = "../librustc_typeck" }
-rustc_session = { path = "../librustc_session" }
-rustc_span = { path = "../librustc_span" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-tracing = "0.1"
diff --git a/src/librustc_query_system/Cargo.toml b/src/librustc_query_system/Cargo.toml
deleted file mode 100644
index 1e89d379cb7..00000000000
--- a/src/librustc_query_system/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_query_system"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_query_system"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_arena = { path = "../librustc_arena" }
-tracing = "0.1"
-rustc-rayon-core = "0.3.0"
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_macros = { path = "../librustc_macros" }
-rustc_index = { path = "../librustc_index" }
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_span = { path = "../librustc_span" }
-parking_lot = "0.10"
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_resolve/Cargo.toml b/src/librustc_resolve/Cargo.toml
deleted file mode 100644
index e5260866f29..00000000000
--- a/src/librustc_resolve/Cargo.toml
+++ /dev/null
@@ -1,31 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_resolve"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_resolve"
-path = "lib.rs"
-test = false
-doctest = false
-
-[dependencies]
-bitflags = "1.2.1"
-tracing = "0.1"
-rustc_ast = { path = "../librustc_ast" }
-rustc_arena = { path = "../librustc_arena" }
-rustc_middle = { path = "../librustc_middle" }
-rustc_ast_lowering = { path = "../librustc_ast_lowering" }
-rustc_ast_pretty = { path = "../librustc_ast_pretty" }
-rustc_attr = { path = "../librustc_attr" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_expand = { path = "../librustc_expand" }
-rustc_feature = { path = "../librustc_feature" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_index = { path = "../librustc_index" }
-rustc_metadata = { path = "../librustc_metadata" }
-rustc_session = { path = "../librustc_session" }
-rustc_span = { path = "../librustc_span" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_save_analysis/Cargo.toml b/src/librustc_save_analysis/Cargo.toml
deleted file mode 100644
index 979a8da2a9f..00000000000
--- a/src/librustc_save_analysis/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_save_analysis"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_save_analysis"
-path = "lib.rs"
-
-[dependencies]
-tracing = "0.1"
-rustc_middle = { path = "../librustc_middle" }
-rustc_ast = { path = "../librustc_ast" }
-rustc_ast_pretty = { path = "../librustc_ast_pretty" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_hir_pretty = { path = "../librustc_hir_pretty" }
-rustc_lexer = { path = "../librustc_lexer" }
-serde_json = "1"
-rustc_session = { path = "../librustc_session" }
-rustc_span = { path = "../librustc_span" }
-rls-data = "0.19"
-rls-span = "0.5"
diff --git a/src/librustc_session/Cargo.toml b/src/librustc_session/Cargo.toml
deleted file mode 100644
index 208bba1d962..00000000000
--- a/src/librustc_session/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_session"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_session"
-path = "lib.rs"
-
-[dependencies]
-bitflags = "1.2.1"
-getopts = "0.2"
-rustc_macros = { path = "../librustc_macros" }
-tracing = "0.1"
-rustc_errors = { path = "../librustc_errors" }
-rustc_feature = { path = "../librustc_feature" }
-rustc_target = { path = "../librustc_target" }
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_span = { path = "../librustc_span" }
-rustc_fs_util = { path = "../librustc_fs_util" }
-num_cpus = "1.0"
-rustc_ast = { path = "../librustc_ast" }
diff --git a/src/librustc_span/Cargo.toml b/src/librustc_span/Cargo.toml
deleted file mode 100644
index dd4928d4e32..00000000000
--- a/src/librustc_span/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_span"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_span"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_macros = { path = "../librustc_macros" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_index = { path = "../librustc_index" }
-rustc_arena = { path = "../librustc_arena" }
-scoped-tls = "1.0"
-unicode-width = "0.1.4"
-cfg-if = "0.1.2"
-tracing = "0.1"
-sha-1 = "0.8"
-md-5 = "0.8"
diff --git a/src/librustc_symbol_mangling/Cargo.toml b/src/librustc_symbol_mangling/Cargo.toml
deleted file mode 100644
index b44c0e4e027..00000000000
--- a/src/librustc_symbol_mangling/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_symbol_mangling"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_symbol_mangling"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-tracing = "0.1"
-punycode = "0.4.0"
-rustc-demangle = "0.1.16"
-
-rustc_ast = { path = "../librustc_ast" }
-rustc_span = { path = "../librustc_span" }
-rustc_middle = { path = "../librustc_middle" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_target = { path = "../librustc_target" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_session = { path = "../librustc_session" }
diff --git a/src/librustc_target/Cargo.toml b/src/librustc_target/Cargo.toml
deleted file mode 100644
index d2b50f44e43..00000000000
--- a/src/librustc_target/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_target"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_target"
-path = "lib.rs"
-
-[dependencies]
-bitflags = "1.2.1"
-tracing = "0.1"
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_macros = { path = "../librustc_macros" }
-rustc_serialize = { path = "../librustc_serialize" }
-rustc_span = { path = "../librustc_span" }
-rustc_index = { path = "../librustc_index" }
diff --git a/src/librustc_trait_selection/Cargo.toml b/src/librustc_trait_selection/Cargo.toml
deleted file mode 100644
index 444023baa69..00000000000
--- a/src/librustc_trait_selection/Cargo.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_trait_selection"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_trait_selection"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_parse_format = { path = "../librustc_parse_format" }
-tracing = "0.1"
-rustc_attr = { path = "../librustc_attr" }
-rustc_middle = { path = "../librustc_middle" }
-rustc_ast = { path = "../librustc_ast" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_index = { path = "../librustc_index" }
-rustc_infer = { path = "../librustc_infer" }
-rustc_macros = { path = "../librustc_macros" }
-rustc_session = { path = "../librustc_session" }
-rustc_span = { path = "../librustc_span" }
-rustc_target = { path = "../librustc_target" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_traits/Cargo.toml b/src/librustc_traits/Cargo.toml
deleted file mode 100644
index f5545f56293..00000000000
--- a/src/librustc_traits/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_traits"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_traits"
-path = "lib.rs"
-
-[dependencies]
-tracing = "0.1"
-rustc_middle = { path = "../librustc_middle" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_index = { path = "../librustc_index" }
-rustc_ast = { path = "../librustc_ast" }
-rustc_span = { path = "../librustc_span" }
-chalk-ir = "0.14.0"
-chalk-solve = "0.14.0"
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-rustc_infer = { path = "../librustc_infer" }
-rustc_trait_selection = { path = "../librustc_trait_selection" }
diff --git a/src/librustc_ty/Cargo.toml b/src/librustc_ty/Cargo.toml
deleted file mode 100644
index adc9740c2c1..00000000000
--- a/src/librustc_ty/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_ty"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_ty"
-path = "lib.rs"
-
-[dependencies]
-tracing = "0.1"
-rustc_middle = { path = "../librustc_middle" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_infer = { path = "../librustc_infer" }
-rustc_span = { path = "../librustc_span" }
-rustc_session = { path = "../librustc_session" }
-rustc_target = { path = "../librustc_target" }
-rustc_trait_selection = { path = "../librustc_trait_selection" }
diff --git a/src/librustc_typeck/Cargo.toml b/src/librustc_typeck/Cargo.toml
deleted file mode 100644
index 82c6ac7a0cd..00000000000
--- a/src/librustc_typeck/Cargo.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "rustc_typeck"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "rustc_typeck"
-path = "lib.rs"
-test = false
-doctest = false
-
-[dependencies]
-rustc_arena = { path = "../librustc_arena" }
-tracing = "0.1"
-rustc_middle = { path = "../librustc_middle" }
-rustc_attr = { path = "../librustc_attr" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_errors = { path = "../librustc_errors" }
-rustc_hir = { path = "../librustc_hir" }
-rustc_hir_pretty = { path = "../librustc_hir_pretty" }
-rustc_target = { path = "../librustc_target" }
-rustc_session = { path = "../librustc_session" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-rustc_ast = { path = "../librustc_ast" }
-rustc_span = { path = "../librustc_span" }
-rustc_index = { path = "../librustc_index" }
-rustc_infer = { path = "../librustc_infer" }
-rustc_trait_selection = { path = "../librustc_trait_selection" }
diff --git a/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs b/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs
index 75bf320dd5b..7a88c3df2e4 100644
--- a/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs
+++ b/src/test/ui/borrowck/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs
@@ -1,7 +1,7 @@
 // Test that attempt to reborrow an `&mut` pointer in an aliasable
 // location yields an error.
 //
-// Example from src/librustc_borrowck/borrowck/README.md
+// Example from compiler/rustc_borrowck/borrowck/README.md
 
 fn foo(t0: & &mut isize) {
     let t1 = t0;
diff --git a/src/test/ui/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs b/src/test/ui/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs
index 2839a9195a0..5ef282c0ca0 100644
--- a/src/test/ui/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs
+++ b/src/test/ui/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs
@@ -5,7 +5,7 @@
 // Test that freezing an `&mut` pointer while referent is
 // frozen is legal.
 //
-// Example from src/librustc_borrowck/borrowck/README.md
+// Example from compiler/rustc_borrowck/borrowck/README.md
 
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/ui/borrowck/borrowck-move-mut-base-ptr.rs b/src/test/ui/borrowck/borrowck-move-mut-base-ptr.rs
index 10fc1437253..fa2d5531b13 100644
--- a/src/test/ui/borrowck/borrowck-move-mut-base-ptr.rs
+++ b/src/test/ui/borrowck/borrowck-move-mut-base-ptr.rs
@@ -1,7 +1,7 @@
 // Test that attempt to move `&mut` pointer while pointee is borrowed
 // yields an error.
 //
-// Example from src/librustc_borrowck/borrowck/README.md
+// Example from compiler/rustc_borrowck/borrowck/README.md
 
 
 
diff --git a/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs b/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs
index 32caa466475..6174893bae9 100644
--- a/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs
+++ b/src/test/ui/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs
@@ -1,7 +1,7 @@
 // Test that attempt to mutably borrow `&mut` pointer while pointee is
 // borrowed yields an error.
 //
-// Example from src/librustc_borrowck/borrowck/README.md
+// Example from compiler/rustc_borrowck/borrowck/README.md
 
 
 
diff --git a/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.rs b/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.rs
index 3d40d319226..8170323efc5 100644
--- a/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.rs
+++ b/src/test/ui/borrowck/borrowck-swap-mut-base-ptr.rs
@@ -1,7 +1,7 @@
 // Test that attempt to swap `&mut` pointer while pointee is borrowed
 // yields an error.
 //
-// Example from src/librustc_borrowck/borrowck/README.md
+// Example from compiler/rustc_borrowck/borrowck/README.md
 
 use std::mem::swap;
 
diff --git a/src/test/ui/pattern/const-pat-ice.stderr b/src/test/ui/pattern/const-pat-ice.stderr
index 2aa0824f301..6b42c0e0848 100644
--- a/src/test/ui/pattern/const-pat-ice.stderr
+++ b/src/test/ui/pattern/const-pat-ice.stderr
@@ -1,4 +1,4 @@
-thread 'rustc' panicked at 'assertion failed: rows.iter().all(|r| r.len() == v.len())', src/librustc_mir_build/thir/pattern/_match.rs:LL:CC
+thread 'rustc' panicked at 'assertion failed: rows.iter().all(|r| r.len() == v.len())', compiler/rustc_mir_build/src/thir/pattern/_match.rs:LL:CC
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 
 error: internal compiler error: unexpected panic
diff --git a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-const.rs b/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-const.rs
index bc2bf9eca93..01769f71153 100644
--- a/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-const.rs
+++ b/src/test/ui/type-alias-impl-trait/type-alias-impl-trait-const.rs
@@ -4,7 +4,7 @@
 // Currently, the `type_alias_impl_trait` feature implicitly
 // depends on `impl_trait_in_bindings` in order to work properly.
 // Specifically, this line requires `impl_trait_in_bindings` to be enabled:
-// https://github.com/rust-lang/rust/blob/481068a707679257e2a738b40987246e0420e787/src/librustc_typeck/check/mod.rs#L856
+// https://github.com/rust-lang/rust/blob/481068a707679257e2a738b40987246e0420e787/compiler/rustc_typeck/check/mod.rs#L856
 #![feature(impl_trait_in_bindings)]
 //~^ WARN the feature `impl_trait_in_bindings` is incomplete
 
diff --git a/src/tools/error_index_generator/build.rs b/src/tools/error_index_generator/build.rs
index efa4177d1d8..caae8c61178 100644
--- a/src/tools/error_index_generator/build.rs
+++ b/src/tools/error_index_generator/build.rs
@@ -9,7 +9,7 @@ fn main() {
     let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
     let dest = out_dir.join("error_codes.rs");
 
-    let error_codes_path = "../../../src/librustc_error_codes/error_codes.rs";
+    let error_codes_path = "../../../compiler/rustc_error_codes/src/error_codes.rs";
 
     println!("cargo:rerun-if-changed={}", error_codes_path);
     let file = fs::read_to_string(error_codes_path)
@@ -19,7 +19,7 @@ fn main() {
     fs::write(&out_dir.join("all_error_codes.rs"), &contents).unwrap();
 
     // We copy the md files as well to the target directory.
-    for entry in WalkDir::new("../../../src/librustc_error_codes/error_codes") {
+    for entry in WalkDir::new("../../../compiler/rustc_error_codes/src/error_codes") {
         let entry = entry.unwrap();
         match entry.path().extension() {
             Some(s) if s == "md" => {}
diff --git a/src/tools/tidy/src/debug_artifacts.rs b/src/tools/tidy/src/debug_artifacts.rs
index 408be83b926..ab87230f888 100644
--- a/src/tools/tidy/src/debug_artifacts.rs
+++ b/src/tools/tidy/src/debug_artifacts.rs
@@ -1,4 +1,4 @@
-//! Tidy check to prevent creation of unnecessary debug artifacts.
+//! Tidy check to prevent creation of unnecessary debug artifacts while running tests.
 
 use std::path::{Path, PathBuf};
 
diff --git a/src/tools/tidy/src/edition.rs b/src/tools/tidy/src/edition.rs
index 4a2e49fd1c3..7761ae64ee0 100644
--- a/src/tools/tidy/src/edition.rs
+++ b/src/tools/tidy/src/edition.rs
@@ -1,5 +1,4 @@
 //! Tidy check to ensure that crate `edition` is '2018'
-//!
 
 use std::path::Path;
 
diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs
index 678e346bd4f..d8029ea04f0 100644
--- a/src/tools/tidy/src/features.rs
+++ b/src/tools/tidy/src/features.rs
@@ -71,8 +71,14 @@ pub fn collect_lib_features(base_src_path: &Path) -> Features {
     lib_features
 }
 
-pub fn check(src_path: &Path, lib_path: &Path, bad: &mut bool, verbose: bool) -> CollectedFeatures {
-    let mut features = collect_lang_features(src_path, bad);
+pub fn check(
+    src_path: &Path,
+    compiler_path: &Path,
+    lib_path: &Path,
+    bad: &mut bool,
+    verbose: bool,
+) -> CollectedFeatures {
+    let mut features = collect_lang_features(compiler_path, bad);
     assert!(!features.is_empty());
 
     let lib_features = get_and_check_lib_features(lib_path, bad, &features);
@@ -225,15 +231,15 @@ fn test_filen_gate(filen_underscore: &str, features: &mut Features) -> bool {
     false
 }
 
-pub fn collect_lang_features(base_src_path: &Path, bad: &mut bool) -> Features {
-    let mut all = collect_lang_features_in(base_src_path, "active.rs", bad);
-    all.extend(collect_lang_features_in(base_src_path, "accepted.rs", bad));
-    all.extend(collect_lang_features_in(base_src_path, "removed.rs", bad));
+pub fn collect_lang_features(base_compiler_path: &Path, bad: &mut bool) -> Features {
+    let mut all = collect_lang_features_in(base_compiler_path, "active.rs", bad);
+    all.extend(collect_lang_features_in(base_compiler_path, "accepted.rs", bad));
+    all.extend(collect_lang_features_in(base_compiler_path, "removed.rs", bad));
     all
 }
 
 fn collect_lang_features_in(base: &Path, file: &str, bad: &mut bool) -> Features {
-    let path = base.join("librustc_feature").join(file);
+    let path = base.join("rustc_feature").join("src").join(file);
     let contents = t!(fs::read_to_string(&path));
 
     // We allow rustc-internal features to omit a tracking issue.
diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
index 43105188ec4..36c9e58eb9a 100644
--- a/src/tools/tidy/src/main.rs
+++ b/src/tools/tidy/src/main.rs
@@ -11,44 +11,53 @@ use std::path::PathBuf;
 use std::process;
 
 fn main() {
-    let path: PathBuf = env::args_os().nth(1).expect("need path to src").into();
+    let root_path: PathBuf = env::args_os().nth(1).expect("need path to root of repo").into();
     let cargo: PathBuf = env::args_os().nth(2).expect("need path to cargo").into();
 
-    let library_path: PathBuf = path
-        .join("..")
-        .join("library")
-        .canonicalize()
-        .expect("unable to canonicalize path to library/");
+    let src_path = root_path.join("src");
+    let library_path = root_path.join("library");
+    let compiler_path = root_path.join("compiler");
 
     let args: Vec<String> = env::args().skip(1).collect();
 
     let mut bad = false;
     let verbose = args.iter().any(|s| *s == "--verbose");
 
+    // Checks over tests.
+    debug_artifacts::check(&src_path, &mut bad);
+    ui_tests::check(&src_path, &mut bad);
+
     // Checks that only make sense for the compiler.
-    debug_artifacts::check(&path, &mut bad);
-    errors::check(&path, &mut bad);
-    ui_tests::check(&path, &mut bad);
-    error_codes_check::check(&path, &mut bad);
+    errors::check(&compiler_path, &mut bad);
+    error_codes_check::check(&src_path, &mut bad);
 
     // Checks that only make sense for the std libs.
     pal::check(&library_path, &mut bad);
     unit_tests::check(&library_path, &mut bad);
 
-    // Check that need to be done for both the compiler and std libraries.
-    bins::check(&path, &mut bad);
+    // Checks that need to be done for both the compiler and std libraries.
+    bins::check(&src_path, &mut bad);
+    bins::check(&compiler_path, &mut bad);
     bins::check(&library_path, &mut bad);
-    style::check(&path, &mut bad);
+
+    style::check(&src_path, &mut bad);
+    style::check(&compiler_path, &mut bad);
     style::check(&library_path, &mut bad);
-    cargo::check(&path, &mut bad);
+
+    cargo::check(&src_path, &mut bad);
+    cargo::check(&compiler_path, &mut bad);
     cargo::check(&library_path, &mut bad);
-    edition::check(&path, &mut bad);
+
+    edition::check(&src_path, &mut bad);
+    edition::check(&compiler_path, &mut bad);
     edition::check(&library_path, &mut bad);
 
-    let collected = features::check(&path, &library_path, &mut bad, verbose);
-    unstable_book::check(&path, collected, &mut bad);
-    deps::check(&path.parent().unwrap(), &cargo, &mut bad);
-    extdeps::check(&path.parent().unwrap(), &mut bad);
+    let collected = features::check(&src_path, &compiler_path, &library_path, &mut bad, verbose);
+    unstable_book::check(&src_path, collected, &mut bad);
+
+    // Checks that are done on the cargo workspace.
+    deps::check(&root_path, &cargo, &mut bad);
+    extdeps::check(&root_path, &mut bad);
 
     if bad {
         eprintln!("some tidy checks failed");
diff --git a/src/tools/unstable-book-gen/src/main.rs b/src/tools/unstable-book-gen/src/main.rs
index 5d277e1c41f..387b2acd106 100644
--- a/src/tools/unstable-book-gen/src/main.rs
+++ b/src/tools/unstable-book-gen/src/main.rs
@@ -94,14 +94,16 @@ fn copy_recursive(from: &Path, to: &Path) {
 }
 
 fn main() {
-    let library_path_str = env::args_os().nth(1).expect("library path required");
-    let src_path_str = env::args_os().nth(2).expect("source path required");
-    let dest_path_str = env::args_os().nth(3).expect("destination path required");
+    let library_path_str = env::args_os().nth(1).expect("library/ path required");
+    let compiler_path_str = env::args_os().nth(2).expect("compiler/ path required");
+    let src_path_str = env::args_os().nth(3).expect("src/ path required");
+    let dest_path_str = env::args_os().nth(4).expect("destination path required");
     let library_path = Path::new(&library_path_str);
+    let compiler_path = Path::new(&compiler_path_str);
     let src_path = Path::new(&src_path_str);
     let dest_path = Path::new(&dest_path_str);
 
-    let lang_features = collect_lang_features(src_path, &mut false);
+    let lang_features = collect_lang_features(compiler_path, &mut false);
     let lib_features = collect_lib_features(library_path)
         .into_iter()
         .filter(|&(ref name, _)| !lang_features.contains_key(name))