Skip to content

Rename librustc to librustc_middle - #70536

Merged
bors merged 5 commits into
rust-lang:masterfrom
Centril:rustc-middle
Mar 30, 2020
Merged

Rename librustc to librustc_middle#70536
bors merged 5 commits into
rust-lang:masterfrom
Centril:rustc-middle

Conversation

@Centril

@CentrilCentril commented Mar 29, 2020

Copy link
Copy Markdown
Contributor

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
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/libcore/clone.rs Outdated

@eddybeddybMar 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@CentrilCentrilMar 29, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Filed #70537 for checking followups.

eddyb
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/libcore/raw.rs Outdated

@eddybeddybMar 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/libstd/alloc.rs Outdated

@eddybeddybMar 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@CentrilCentril mentioned this pull request Mar 29, 2020
Closed
eddyb
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/librustc_infer/infer/lexical_region_resolve/graphviz.rs Outdated

@eddybeddybMar 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this module even exist anymore, it looks off.

@CentrilCentrilMar 29, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I don't think it does.

eddyb
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/librustc_middle/lib.rs Outdated
eddyb
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/librustc_mir/borrow_check/region_infer/mod.rs Outdated

@eddybeddybMar 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that still there, wasn't InferCtxt moved?

@CentrilCentrilMar 29, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

eddyb
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/librustc_mir/borrow_check/type_check/mod.rs Outdated

@eddybeddybMar 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@CentrilCentrilMar 29, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

eddyb
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/librustc_passes/stability.rs Outdated

@eddybeddybMar 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

eddyb
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/librustc_session/filesearch.rs Outdated

@eddybeddybMar 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

eddyb
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/librustc_session/lint.rs Outdated

@eddybeddybMar 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

eddyb
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/librustc_session/lint.rs Outdated

@eddybeddybMar 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

eddyb
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/librustc_trait_selection/traits/project.rs Outdated

@eddybeddybMar 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this was moved.

eddyb
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/librustc_traits/implied_outlives_bounds.rs Outdated

@eddybeddybMar 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likely outdated.

eddyb
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/librustc_ty/instance.rs Outdated

@eddybeddybMar 29, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likely moved in the meanwhile.

eddyb
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/test/ui-fulldeps/hash-stable-is-unstable.stderr Outdated
eddyb
eddyb reviewed Mar 29, 2020
View reviewed changes
Comment threadsrc/test/ui-fulldeps/pathless-extern-unstable.stderr Outdated
@eddyb

eddyb commented Mar 29, 2020

Copy link
Copy Markdown
Contributor

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

bors commented Mar 29, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit aaad8e77c07bad1db5aae2a40ed4d09e439c7ef5 has been approved by eddyb

@borsbors 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
@bors

bors commented Mar 29, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit aaad8e77c07bad1db5aae2a40ed4d09e439c7ef5 with merge 4119b5a1717ea70c38981c45b8ba9d4d8d986364...

@crlf0710

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@borsbors 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
Closed
Closed
Merged
@nnethercotennethercote mentioned this pull request Mar 30, 2020
Open
This was referenced Mar 30, 2020
Merged
Merged
Merged
Closed
Merged
Merged
Merged
Merged
Merged
Closed
Merged
Merged
Merged
Merged
@RalfJung

RalfJung commented Mar 30, 2020

Copy link
Copy Markdown
Member

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

@Centril

Centril commented Mar 30, 2020

Copy link
Copy Markdown
ContributorAuthor

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

matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Mar 30, 2020
@matthiaskrgr
rustuprust-lang/rust#70536
aff57e0
@LeSeulArtichautLeSeulArtichaut mentioned this pull request Mar 30, 2020
Merged
bors added a commit to rust-lang/rust-clippy that referenced this pull request Mar 30, 2020
@bors
Auto merge of#5392- matthiaskrgr:rustup_40, r=phansch
e170c84
rustup rust-lang/rust#70536
changelog: none
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 30, 2020
@matthiaskrgr
submodules: update clippy from70b93aatoe170c84
eef8e48
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
````
Fixesrust-lang#70554
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 30, 2020
@bors
Auto merge ofrust-lang#70574- matthiaskrgr:submodule_upd, r=Centril
2113659
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
````
Fixesrust-lang#70554
@flip1995flip1995 mentioned this pull request Apr 4, 2020
Merged
artemmukhin added a commit to intellij-rust/intellij-rust that referenced this pull request Apr 10, 2020
@artemmukhin
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)
@artemmukhinartemmukhin mentioned this pull request Apr 10, 2020
Merged
borsBot added a commit to intellij-rust/intellij-rust that referenced this pull request Apr 10, 2020
@bors@artemmukhin
Merge#5220
98c7633
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>
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request May 5, 2020
@matthiaskrgr
submodules: update clippy from70b93aatoe170c84
d256371
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
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@eddybeddybeddyb approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@eddybeddyb

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@Centril@eddyb@bors@crlf0710@rust-highfive@mark-i-m@RalfJung