Rename `librustc` to `librustc_middle` #70536

Centril · 2020-03-29T15:10:02Z

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

eddyb · 2020-03-29T15:13:34Z

src/libcore/clone.rs

-/// are implemented in `SelectionContext::copy_clone_conditions()` in librustc.
+/// are implemented in `SelectionContext::copy_clone_conditions()` in librustc_middle.


Is this accurate? Some stuff has been moved out into separate crates.

Filed #70537 for checking followups.

eddyb · 2020-03-29T15:14:52Z

src/libcore/raw.rs

-//! Their definition should always match the ABI defined in `rustc::back::abi`.
+//! Their definition should always match the ABI defined in `rustc_target::abi`.


rustc_middle::ty::layout (which IMO should be rustc_middle::ty::abi or rustc_middle::abi but I've never gotten around to it)

eddyb · 2020-03-29T15:15:55Z

src/libstd/alloc.rs

-    // for symbol names src/librustc/middle/allocator.rs
+    // for symbol names src/librustc_middle/middle/allocator.rs


Is that file still there? But also I'm suspicious of rustc_middle::middle existing, in general.

eddyb · 2020-03-29T16:00:56Z

src/librustc_infer/infer/lexical_region_resolve/graphviz.rs

-//! `rustc::middle::typeck::infer::region_constraints`, generating a
+//! `rustc_middle::middle::typeck::infer::region_constraints`, generating a


Does this module even exist anymore, it looks off.

Yeah I don't think it does.

src/librustc_middle/lib.rs

eddyb · 2020-03-29T16:09:14Z

src/librustc_mir/borrow_check/region_infer/mod.rs

-/// `InferCtxt::type_must_outlive` in `rustc::infer::outlives`.
+/// `InferCtxt::type_must_outlive` in `rustc_middle::infer::outlives`.


Is that still there, wasn't InferCtxt moved?

Was moved to rustc_infer::infer::InferCtxt says rustdoc nightly docs.

eddyb · 2020-03-29T16:10:01Z

src/librustc_mir/borrow_check/type_check/mod.rs

-    /// **Any `rustc::infer` operations that might generate region
+    /// **Any `rustc_middle::infer` operations that might generate region


Again, I'm not sure infer is really there anymore.

rustc_middle::infer exists, but it's only 3 small modules.

eddyb · 2020-03-29T16:16:48Z

src/librustc_passes/stability.rs

-        // compiling librustc crates themselves so we can leverage crates.io
+        // compiling librustc_middle crates themselves so we can leverage crates.io


NB: this said "librustc crates". It could now be "librustc_* crates" or just "rustc crates".

eddyb · 2020-03-29T16:19:23Z

src/librustc_session/filesearch.rs

-    // of the directory where librustc is located, rather than where the rustc
+    // of the directory where librustc_middle is located, rather than where the rustc


This should probably say librustc_driver, if it refers to the dynamic library (since it's the only one left).

eddyb · 2020-03-29T16:20:23Z

src/librustc_session/lint.rs

@@ -207,7 +207,7 @@ pub struct BufferedEarlyLint {
    /// The `NodeId` of the AST node that generated the lint.
    pub node_id: NodeId,

-    /// A lint Id that can be passed to `rustc::lint::Lint::from_parser_lint_id`.
+    /// A lint Id that can be passed to `rustc_session::lint::Lint::from_parser_lint_id`.


The two mentions of "passed" in this file should refer to the same thing, no?

eddyb · 2020-03-29T16:20:47Z

src/librustc_session/lint.rs

@@ -195,7 +195,7 @@ pub enum BuiltinLintDiagnostics {
 }

 /// Lints that are buffered up early on in the `Session` before the
-/// `LintLevels` is calculated. These are later passed to `librustc`.
+/// `LintLevels` is calculated. These are later passed to `librustc_middle`.


This is the other "passed to" (GH won't let me do multi-line comments on this diff).

eddyb · 2020-03-29T16:22:11Z

src/librustc_trait_selection/traits/project.rs

-                // `rustc::ty::instance::resolve_associated_item()`.
+                // `rustc_middle::ty::instance::resolve_associated_item()`.


I believe this was moved.

eddyb · 2020-03-29T16:24:15Z

src/librustc_traits/implied_outlives_bounds.rs

-//! Do not call this query directory. See [`rustc::traits::query::implied_outlives_bounds`].
+//! Do not call this query directory. See [`rustc_middle::traits::query::implied_outlives_bounds`].


Likely outdated.

eddyb · 2020-03-29T16:27:53Z

src/librustc_ty/instance.rs

-            // `rustc::traits::project::assemble_candidates_from_impls()`.
+            // `rustc_middle::traits::project::assemble_candidates_from_impls()`.


Likely moved in the meanwhile.

src/test/ui-fulldeps/hash-stable-is-unstable.stderr

src/test/ui-fulldeps/pathless-extern-unstable.stderr

eddyb · 2020-03-29T16:40:29Z

cc @rust-lang/compiler I'm approving this now because it's easier to revert it than to land it.
If this isn't wanted, @Centril or me will do s/rustc_middle/rustc/ + ./x.py fmt to revert it.

(long-term, I'd like "type/trait-system is part of MIR", which is why the Mir->mir::Body rename was suggested, but I expect that would be far more controversial than rustc_middle existing)

@bors r+ p=123

bors · 2020-03-29T16:40:30Z

📌 Commit aaad8e77c07bad1db5aae2a40ed4d09e439c7ef5 has been approved by eddyb

bors · 2020-03-29T17:57:27Z

⌛ Testing commit aaad8e77c07bad1db5aae2a40ed4d09e439c7ef5 with merge 4119b5a1717ea70c38981c45b8ba9d4d8d986364...

RalfJung · 2020-03-30T08:44:00Z

So now we have rustc_middle::middle? ;-)

Centril · 2020-03-30T08:44:59Z

Yep, and rustc_ast::ast and rustc_hir::hir 🙃 😅

rustup rust-lang/rust#70536 changelog: none

Changes: ```` rustup rust-lang#70536 Rustup to rust-lang#70449 readme: move "how to run single lint" instructions to "Allowing/denying lints" section. git attribute macros not allowed in submodules Deprecate REPLACE_CONSTS lint Bump itertools ```` Fixes rust-lang#70554

submodules: update clippy from 70b93aa to e170c84 Changes: ```` rustup rust-lang#70536 Rustup to rust-lang#70449 readme: move "how to run single lint" instructions to "Allowing/denying lints" section. git attribute macros not allowed in submodules Deprecate REPLACE_CONSTS lint Bump itertools ```` Fixes rust-lang#70554

"rustc" package was renamed to "rustc_middle" in rust-lang/rust#70536 (>=1.42.0)

5220: Fix stdlib detection when working with rust-lang/rust project r=vlad20012 a=ortem Our analysis is broken on the latest nightly rustc (1.42.0) because "rustc" package was renamed to "rustc_middle" in rust-lang/rust#70536 and now "rust-lang/rust" is not detected by the plugin. Co-authored-by: ortem <ortem00@gmail.com>

Changes: ```` rustup rust-lang/rust#70536 Rustup to rust-lang/rust#70449 readme: move "how to run single lint" instructions to "Allowing/denying lints" section. git attribute macros not allowed in submodules Deprecate REPLACE_CONSTS lint Bump itertools ```` Fixes #70554

rust-highfive assigned eddyb Mar 29, 2020

eddyb reviewed Mar 29, 2020

View reviewed changes

Centril mentioned this pull request Mar 29, 2020

Check accuracy of some references in docs to files in librustc(_middle) #70537

Closed

eddyb reviewed Mar 29, 2020

View reviewed changes

src/librustc_middle/lib.rs Outdated Show resolved Hide resolved

eddyb reviewed Mar 29, 2020

View reviewed changes

src/test/ui-fulldeps/hash-stable-is-unstable.stderr Outdated Show resolved Hide resolved

eddyb reviewed Mar 29, 2020

View reviewed changes

src/test/ui-fulldeps/pathless-extern-unstable.stderr Outdated Show resolved Hide resolved

Centril force-pushed the rustc-middle branch from 31b5a5a to aaad8e7 Compare March 29, 2020 16:37

eddyb approved these changes Mar 29, 2020

View reviewed changes

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 29, 2020

This comment has been minimized.

Sign in to view

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 29, 2020

This was referenced Mar 30, 2020

Add lint for never type regressions #68350

Closed

Record lifetime constraints inside generator interior #68362

Closed

Implement RFC 2396: #[target_feature] 1.1 #69274

Merged

nnethercote mentioned this pull request Mar 30, 2020

The rustc_query_impl crate is too big, which hurts compile times for the compiler itself #65031

Open

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Mar 30, 2020

rustup rust-lang/rust#70536

aff57e0

LeSeulArtichaut mentioned this pull request Mar 30, 2020

Rename librustc to librustc_middle rust-lang/rustc-dev-guide#642

Merged

bors added a commit to rust-lang/rust-clippy that referenced this pull request Mar 30, 2020

Auto merge of #5392 - matthiaskrgr:rustup_40, r=phansch

e170c84

rustup rust-lang/rust#70536 changelog: none

flip1995 mentioned this pull request Apr 4, 2020

Fix link to internal rustc documentation rust-lang/rust-forge#329

Merged

artemmukhin added a commit to intellij-rust/intellij-rust that referenced this pull request Apr 10, 2020

Fix stdlib detection when working with rust-lang/rust project

0c321da

"rustc" package was renamed to "rustc_middle" in rust-lang/rust#70536 (>=1.42.0)

artemmukhin mentioned this pull request Apr 10, 2020

Fix stdlib detection when working with rust-lang/rust project intellij-rust/intellij-rust#5220

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rename `librustc` to `librustc_middle` #70536

Rename `librustc` to `librustc_middle` #70536

Centril commented Mar 29, 2020

eddyb Mar 29, 2020

Centril Mar 29, 2020

eddyb Mar 29, 2020

eddyb Mar 29, 2020

eddyb Mar 29, 2020

Centril Mar 29, 2020

eddyb Mar 29, 2020

Centril Mar 29, 2020

eddyb Mar 29, 2020

Centril Mar 29, 2020

eddyb Mar 29, 2020

eddyb Mar 29, 2020

eddyb Mar 29, 2020

eddyb Mar 29, 2020

eddyb Mar 29, 2020

eddyb Mar 29, 2020

eddyb Mar 29, 2020

eddyb commented Mar 29, 2020

bors commented Mar 29, 2020

bors commented Mar 29, 2020

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

RalfJung commented Mar 30, 2020

Centril commented Mar 30, 2020

		/// are implemented in `SelectionContext::copy_clone_conditions()` in librustc.
		/// are implemented in `SelectionContext::copy_clone_conditions()` in librustc_middle.

		//! Their definition should always match the ABI defined in `rustc::back::abi`.
		//! Their definition should always match the ABI defined in `rustc_target::abi`.

		// for symbol names src/librustc/middle/allocator.rs
		// for symbol names src/librustc_middle/middle/allocator.rs

		//! `rustc::middle::typeck::infer::region_constraints`, generating a
		//! `rustc_middle::middle::typeck::infer::region_constraints`, generating a

		/// `InferCtxt::type_must_outlive` in `rustc::infer::outlives`.
		/// `InferCtxt::type_must_outlive` in `rustc_middle::infer::outlives`.

		/// **Any `rustc::infer` operations that might generate region
		/// **Any `rustc_middle::infer` operations that might generate region

		// compiling librustc crates themselves so we can leverage crates.io
		// compiling librustc_middle crates themselves so we can leverage crates.io

		// of the directory where librustc is located, rather than where the rustc
		// of the directory where librustc_middle is located, rather than where the rustc

		// `rustc::ty::instance::resolve_associated_item()`.
		// `rustc_middle::ty::instance::resolve_associated_item()`.

		//! Do not call this query directory. See [`rustc::traits::query::implied_outlives_bounds`].
		//! Do not call this query directory. See [`rustc_middle::traits::query::implied_outlives_bounds`].

		// `rustc::traits::project::assemble_candidates_from_impls()`.
		// `rustc_middle::traits::project::assemble_candidates_from_impls()`.

Rename librustc to librustc_middle #70536

Rename librustc to librustc_middle #70536

Conversation

Centril commented Mar 29, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eddyb commented Mar 29, 2020

bors commented Mar 29, 2020

bors commented Mar 29, 2020

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

RalfJung commented Mar 30, 2020

Centril commented Mar 30, 2020

Rename `librustc` to `librustc_middle` #70536

Rename `librustc` to `librustc_middle` #70536