Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move almost all compiler crates to compiler/ #74862

Merged
merged 1 commit into from
Aug 30, 2020

Conversation

mark-i-m
Copy link
Member

@mark-i-m mark-i-m commented Jul 28, 2020

This PR implements rust-lang/compiler-team#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.

@rust-highfive
Copy link
Collaborator

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 28, 2020
@mark-i-m
Copy link
Member Author

r? @ghost for now

Cargo.toml Outdated Show resolved Hide resolved
@petrochenkov
Copy link
Contributor

LGTM.
I had some reservations regarding llvm (including #74787) and tests, but they are not moved here.

Do you plan to introduce the inner src directories though?
They were added to library but not here.

@mark-i-m
Copy link
Member Author

Do you plan to introduce the inner src directories though?

Yes, you beat me to it :) I just pushed a commit.

I had some reservations regarding llvm (including #74787) and tests,

Yeah, I think those will be the big questions here... It might be reasonable to do those in a followup PR.

@bors

This comment has been minimized.

@Muirrum Muirrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 13, 2020
@petrochenkov
Copy link
Contributor

ping @mark-i-m
Will you be able to update the PR to mergeable state in the near future?

@mark-i-m
Copy link
Member Author

@petrochenkov sure, but this rebase will be rather painful. Would it make sense to get it nominated and fcp'ed first? It seems like we have general consensus on the changes made in this PR, and we can leave more controversial things like LLVM or tests for followup PRs.

@mark-i-m
Copy link
Member Author

@petrochenkov I've finally managed to fix up the PR. Should we do an FCP?

@mark-i-m mark-i-m marked this pull request as ready for review August 28, 2020 03:59
@mark-i-m mark-i-m changed the title [WIP] Move almost all compiler crates to compiler/ Move almost all compiler crates to compiler/ Aug 28, 2020
@mark-i-m
Copy link
Member Author

Hmm... well, it looks like we still need to fix tidy and other tools. @Dylan-DPC you had mentioned that you were interested in helping with this MCP? Do you happen to have a good machine where you can run ./x.py test until it works?

@mati865
Copy link
Contributor

mati865 commented Aug 28, 2020

I could help with 2700X based machine but I won't have time today for it.

@petrochenkov
Copy link
Contributor

@mark-i-m

Should we do an FCP?

Again? This is already accepted.

@petrochenkov
Copy link
Contributor

Similarly to #73265 the commits will need to be squashed before the merged.
The PR description also needs an update.

@petrochenkov petrochenkov self-assigned this Aug 28, 2020
@bors

This comment has been minimized.

@mark-i-m
Copy link
Member Author

Oh, I guess I misunderstood the process. I was under the impression the MCP was on the general direction, rather than the specifics of this PR.

What in particular do you want me to update in the op?

@Dylan-DPC-zz
Copy link

you had mentioned that you were interested in helping with this MCP? Do you happen to have a good machine where you can run ./x.py test until it works?

Sadly I don't :/

@cynecx
Copy link
Contributor

cynecx commented Aug 30, 2020

Mhh. This change makes it really hard to view the history of a file through github. Because almost every file will have this change as their only “commit”.

@dtolnay
Copy link
Member

dtolnay commented Aug 30, 2020

For blame, git sees these correctly as moves. See for example the correct blame information by line on https://github.com/rust-lang/rust/blame/85fbf49ce0e2274d0acf798f6e703747674feec3/compiler/rustc_ast/src/lib.rs.

This is bare though: https://github.com/rust-lang/rust/commits/85fbf49ce0e2274d0acf798f6e703747674feec3/compiler/rustc_ast/src/lib.rs. That's not great.

Feature request for GitHub: a "follow" link to the history of a file beyond a move, like Phabricator does:

Screen Shot 2020-08-30 at 11 28 17 AM

@cynecx
Copy link
Contributor

cynecx commented Aug 30, 2020

This is apparently a known issue: isaacs/github#900.

@mark-i-m
Copy link
Member Author

Thanks for the help @petrochenkov!

@matklad
Copy link
Member

matklad commented Aug 30, 2020

I think the auto-publish script needs adjustment: https://github.com/alexcrichton/rustc-auto-publish

@mark-i-m mark-i-m deleted the mv-compiler branch August 31, 2020 02:06
@vandenheuvel
Copy link
Contributor

Is this documentation still accurate?

@mark-i-m
Copy link
Member Author

@vandenheuvel I just made a PR to update that. It is accurate now.

@ecstatic-morse
Copy link
Contributor

ecstatic-morse commented Sep 1, 2020

Not quite worthy of inclusion in this weeks perf triage report, but this PR caused a small regression on doc builds across all benchmarks and a very small regression on some check builds.

Clearly we need to switch to shorter directory names. I propose that we switch to r for "rust", remove repeated phrases, and start using common abbreviations, so compiler/rustc_middle would become r/mid, etc.

@petrochenkov
Copy link
Contributor

@mark-i-m
Looks like highfive bot wasn't updated properly, all compiler PRs are still assigned to nikomatsakis.

@Dylan-DPC-zz
Copy link

yeah i try to reassign some of them especially the smaller ones :D

@Mark-Simulacrum
Copy link
Member

I hope to fix highfive later today, I'm not sure why the change we made didn't work. Will need to debug.

koic added a commit to koic/rust that referenced this pull request May 6, 2022
https://github.com/rust-lang/rust/blob/master/src/librustc_session/lint/builtin.rs
returns page not found.

The following is the background of the move.
First rust-lang#74862 moves from src/librustc_session/lint/builtin.rs
to compiler/rustc_session/src/lint/builtin.rs
Then rust-lang@23018a5 moves from compiler/rustc_session/src/lint/builtin.rs
to compiler/rustc_lint_defs/src/builtin.rs

So, the current correct link is https://github.com/rust-lang/rust/blob/master/compiler/rustc_lint_defs/src/builtin.rs

This PR fixes a broken link on the following page:
https://doc.rust-lang.org/beta/unstable-book/language-features/plugin.html
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request May 6, 2022
…nstable_book, r=ehuss

Fix an incorrect link in The Unstable Book

https://github.com/rust-lang/rust/blob/master/src/librustc_session/lint/builtin.rs returns page not found.

The following is the background of the move.
First rust-lang#74862 moves from src/librustc_session/lint/builtin.rs to compiler/rustc_session/src/lint/builtin.rs.
Then rust-lang@23018a5 moves from compiler/rustc_session/src/lint/builtin.rs to compiler/rustc_lint_defs/src/builtin.rs.

So, the current correct link is https://github.com/rust-lang/rust/blob/master/compiler/rustc_lint_defs/src/builtin.rs.

This PR fixes a broken link on the following page:
https://doc.rust-lang.org/beta/unstable-book/language-features/plugin.html
compiler-errors added a commit to compiler-errors/rust that referenced this pull request May 7, 2022
…nstable_book, r=ehuss

Fix an incorrect link in The Unstable Book

https://github.com/rust-lang/rust/blob/master/src/librustc_session/lint/builtin.rs returns page not found.

The following is the background of the move.
First rust-lang#74862 moves from src/librustc_session/lint/builtin.rs to compiler/rustc_session/src/lint/builtin.rs.
Then rust-lang@23018a5 moves from compiler/rustc_session/src/lint/builtin.rs to compiler/rustc_lint_defs/src/builtin.rs.

So, the current correct link is https://github.com/rust-lang/rust/blob/master/compiler/rustc_lint_defs/src/builtin.rs.

This PR fixes a broken link on the following page:
https://doc.rust-lang.org/beta/unstable-book/language-features/plugin.html
koic added a commit to koic/rls that referenced this pull request May 7, 2022
@cuviper cuviper added this to the 1.48.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet