Skip to content

Commit

Permalink
Auto merge of #70536 - Centril:rustc-middle, r=eddyb
Browse files Browse the repository at this point in the history
Rename `librustc` to `librustc_middle`

Here we rename `librustc` to `librustc_middle`.

This crate is not nearly as large or central as it was previously and so it doesn't make much sense to give it such a central name as `librustc` ("the entry point to the compiler"). Moreover, there is already a `rustc` crate which is has the actual `fn main` of `rustc`, so having `librustc` is confusing relative to that.

r? @eddyb
  • Loading branch information
bors committed Mar 30, 2020
2 parents 0afdf43 + 2a92839 commit 8926bb4
Show file tree
Hide file tree
Showing 602 changed files with 1,804 additions and 1,774 deletions.
106 changes: 53 additions & 53 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3132,39 +3132,6 @@ dependencies = [
"rustc-workspace-hack",
]

[[package]]
name = "rustc"
version = "0.0.0"
dependencies = [
"arena",
"backtrace",
"bitflags",
"byteorder",
"jobserver",
"log",
"measureme",
"parking_lot 0.10.0",
"polonius-engine",
"rustc-rayon",
"rustc-rayon-core",
"rustc_apfloat",
"rustc_ast",
"rustc_attr",
"rustc_data_structures",
"rustc_errors",
"rustc_feature",
"rustc_hir",
"rustc_index",
"rustc_macros",
"rustc_query_system",
"rustc_session",
"rustc_span",
"rustc_target",
"scoped-tls",
"serialize",
"smallvec 1.0.0",
]

[[package]]
name = "rustc-ap-arena"
version = "642.0.0"
Expand Down Expand Up @@ -3603,7 +3570,6 @@ dependencies = [
"libc",
"log",
"measureme",
"rustc",
"rustc-demangle",
"rustc_ast",
"rustc_attr",
Expand All @@ -3616,6 +3582,7 @@ dependencies = [
"rustc_incremental",
"rustc_index",
"rustc_llvm",
"rustc_middle",
"rustc_session",
"rustc_span",
"rustc_target",
Expand All @@ -3634,7 +3601,6 @@ dependencies = [
"log",
"memmap",
"num_cpus",
"rustc",
"rustc_apfloat",
"rustc_ast",
"rustc_attr",
Expand All @@ -3645,6 +3611,7 @@ dependencies = [
"rustc_incremental",
"rustc_index",
"rustc_metadata",
"rustc_middle",
"rustc_session",
"rustc_span",
"rustc_symbol_mangling",
Expand Down Expand Up @@ -3685,7 +3652,6 @@ dependencies = [
"env_logger 0.7.1",
"lazy_static 1.4.0",
"log",
"rustc",
"rustc_ast",
"rustc_ast_pretty",
"rustc_codegen_ssa",
Expand All @@ -3698,6 +3664,7 @@ dependencies = [
"rustc_interface",
"rustc_lint",
"rustc_metadata",
"rustc_middle",
"rustc_mir",
"rustc_parse",
"rustc_plugin_impl",
Expand Down Expand Up @@ -3797,11 +3764,11 @@ dependencies = [
"graphviz",
"log",
"rand 0.7.3",
"rustc",
"rustc_ast",
"rustc_data_structures",
"rustc_fs_util",
"rustc_hir",
"rustc_middle",
"rustc_session",
"rustc_span",
"serialize",
Expand All @@ -3821,13 +3788,13 @@ version = "0.0.0"
dependencies = [
"graphviz",
"log",
"rustc",
"rustc_ast",
"rustc_data_structures",
"rustc_errors",
"rustc_hir",
"rustc_index",
"rustc_macros",
"rustc_middle",
"rustc_session",
"rustc_span",
"rustc_target",
Expand All @@ -3840,7 +3807,6 @@ version = "0.0.0"
dependencies = [
"log",
"once_cell",
"rustc",
"rustc-rayon",
"rustc_ast",
"rustc_ast_lowering",
Expand All @@ -3857,6 +3823,7 @@ dependencies = [
"rustc_infer",
"rustc_lint",
"rustc_metadata",
"rustc_middle",
"rustc_mir",
"rustc_mir_build",
"rustc_parse",
Expand Down Expand Up @@ -3890,7 +3857,6 @@ name = "rustc_lint"
version = "0.0.0"
dependencies = [
"log",
"rustc",
"rustc_ast",
"rustc_ast_pretty",
"rustc_attr",
Expand All @@ -3900,6 +3866,7 @@ dependencies = [
"rustc_hir",
"rustc_index",
"rustc_infer",
"rustc_middle",
"rustc_session",
"rustc_span",
"rustc_target",
Expand Down Expand Up @@ -3933,7 +3900,6 @@ dependencies = [
"flate2",
"log",
"memmap",
"rustc",
"rustc_ast",
"rustc_attr",
"rustc_data_structures",
Expand All @@ -3942,6 +3908,7 @@ dependencies = [
"rustc_hir",
"rustc_hir_pretty",
"rustc_index",
"rustc_middle",
"rustc_session",
"rustc_span",
"rustc_target",
Expand All @@ -3951,6 +3918,39 @@ dependencies = [
"winapi 0.3.8",
]

[[package]]
name = "rustc_middle"
version = "0.0.0"
dependencies = [
"arena",
"backtrace",
"bitflags",
"byteorder",
"jobserver",
"log",
"measureme",
"parking_lot 0.10.0",
"polonius-engine",
"rustc-rayon",
"rustc-rayon-core",
"rustc_apfloat",
"rustc_ast",
"rustc_attr",
"rustc_data_structures",
"rustc_errors",
"rustc_feature",
"rustc_hir",
"rustc_index",
"rustc_macros",
"rustc_query_system",
"rustc_session",
"rustc_span",
"rustc_target",
"scoped-tls",
"serialize",
"smallvec 1.0.0",
]

[[package]]
name = "rustc_mir"
version = "0.0.0"
Expand All @@ -3961,7 +3961,6 @@ dependencies = [
"log",
"log_settings",
"polonius-engine",
"rustc",
"rustc_apfloat",
"rustc_ast",
"rustc_ast_pretty",
Expand All @@ -3973,6 +3972,7 @@ dependencies = [
"rustc_infer",
"rustc_lexer",
"rustc_macros",
"rustc_middle",
"rustc_session",
"rustc_span",
"rustc_target",
Expand All @@ -3987,7 +3987,6 @@ version = "0.0.0"
dependencies = [
"arena",
"log",
"rustc",
"rustc_apfloat",
"rustc_ast",
"rustc_attr",
Expand All @@ -3997,6 +3996,7 @@ dependencies = [
"rustc_index",
"rustc_infer",
"rustc_macros",
"rustc_middle",
"rustc_session",
"rustc_span",
"rustc_target",
Expand Down Expand Up @@ -4028,7 +4028,6 @@ name = "rustc_passes"
version = "0.0.0"
dependencies = [
"log",
"rustc",
"rustc_ast",
"rustc_attr",
"rustc_data_structures",
Expand All @@ -4037,6 +4036,7 @@ dependencies = [
"rustc_hir",
"rustc_index",
"rustc_infer",
"rustc_middle",
"rustc_session",
"rustc_span",
"rustc_target",
Expand All @@ -4047,12 +4047,12 @@ dependencies = [
name = "rustc_plugin_impl"
version = "0.0.0"
dependencies = [
"rustc",
"rustc_ast",
"rustc_errors",
"rustc_hir",
"rustc_lint",
"rustc_metadata",
"rustc_middle",
"rustc_session",
"rustc_span",
]
Expand All @@ -4062,12 +4062,12 @@ name = "rustc_privacy"
version = "0.0.0"
dependencies = [
"log",
"rustc",
"rustc_ast",
"rustc_attr",
"rustc_data_structures",
"rustc_errors",
"rustc_hir",
"rustc_middle",
"rustc_session",
"rustc_span",
"rustc_typeck",
Expand Down Expand Up @@ -4096,7 +4096,6 @@ dependencies = [
"arena",
"bitflags",
"log",
"rustc",
"rustc_ast",
"rustc_ast_lowering",
"rustc_ast_pretty",
Expand All @@ -4107,6 +4106,7 @@ dependencies = [
"rustc_feature",
"rustc_hir",
"rustc_metadata",
"rustc_middle",
"rustc_session",
"rustc_span",
"smallvec 1.0.0",
Expand All @@ -4119,12 +4119,12 @@ dependencies = [
"log",
"rls-data",
"rls-span",
"rustc",
"rustc_ast",
"rustc_ast_pretty",
"rustc_data_structures",
"rustc_hir",
"rustc_hir_pretty",
"rustc_middle",
"rustc_parse",
"rustc_session",
"rustc_span",
Expand Down Expand Up @@ -4169,12 +4169,12 @@ version = "0.0.0"
dependencies = [
"log",
"punycode",
"rustc",
"rustc-demangle",
"rustc_ast",
"rustc_data_structures",
"rustc_hir",
"rustc_metadata",
"rustc_middle",
"rustc_session",
"rustc_span",
"rustc_target",
Expand Down Expand Up @@ -4209,7 +4209,6 @@ version = "0.0.0"
dependencies = [
"fmt_macros",
"log",
"rustc",
"rustc_ast",
"rustc_attr",
"rustc_data_structures",
Expand All @@ -4218,6 +4217,7 @@ dependencies = [
"rustc_index",
"rustc_infer",
"rustc_macros",
"rustc_middle",
"rustc_session",
"rustc_span",
"rustc_target",
Expand All @@ -4229,12 +4229,12 @@ name = "rustc_traits"
version = "0.0.0"
dependencies = [
"log",
"rustc",
"rustc_ast",
"rustc_data_structures",
"rustc_hir",
"rustc_infer",
"rustc_macros",
"rustc_middle",
"rustc_span",
"rustc_target",
"rustc_trait_selection",
Expand All @@ -4246,10 +4246,10 @@ name = "rustc_ty"
version = "0.0.0"
dependencies = [
"log",
"rustc",
"rustc_data_structures",
"rustc_hir",
"rustc_infer",
"rustc_middle",
"rustc_session",
"rustc_span",
"rustc_target",
Expand All @@ -4262,14 +4262,14 @@ version = "0.0.0"
dependencies = [
"arena",
"log",
"rustc",
"rustc_ast",
"rustc_attr",
"rustc_data_structures",
"rustc_errors",
"rustc_hir",
"rustc_index",
"rustc_infer",
"rustc_middle",
"rustc_session",
"rustc_span",
"rustc_target",
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/clone.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ pub struct AssertParamIsCopy<T: Copy + ?Sized> {
/// Implementations of `Clone` for primitive types.
///
/// Implementations that cannot be described in Rust
/// are implemented in `SelectionContext::copy_clone_conditions()` in librustc.
/// are implemented in `SelectionContext::copy_clone_conditions()` in librustc_middle.
mod impls {

use super::Clone;
Expand Down
2 changes: 1 addition & 1 deletion src/libcore/marker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ impl<T: ?Sized> Unpin for *mut T {}
/// Implementations of `Copy` for primitive types.
///
/// Implementations that cannot be described in Rust
/// are implemented in `SelectionContext::copy_clone_conditions()` in librustc.
/// are implemented in `SelectionContext::copy_clone_conditions()` in librustc_middle.
mod copy_impls {

use super::Copy;
Expand Down
Loading

0 comments on commit 8926bb4

Please sign in to comment.