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

Rename some crates and modules in the frontend #67707

Merged
merged 4 commits into from
Dec 30, 2019

Conversation

petrochenkov
Copy link
Contributor

@petrochenkov petrochenkov commented Dec 29, 2019

Migrate from syntax_* naming scheme to rustc_*.
See #65324 (comment) and several comments below.

Renamed crates:
syntax_expand -> rustc_expand
syntax_pos -> rustc_span (motivation)
syntax_ext -> rustc_builtin_macros

Also one module in resolve is renamed for consistency and to avoid tautology.

r? @Centril

@petrochenkov
Copy link
Contributor Author

TODO: Rename syntax_pos to rustc_span in source code. It's some big churn which is better done in a separate PR.

@petrochenkov
Copy link
Contributor Author

cc @eddyb

@Centril
Copy link
Contributor

Centril commented Dec 29, 2019

TODO: Rename syntax_pos to rustc_span in source code. It's some big churn which is better done in a separate PR.

Ideally that should be done soon tho because the new directory in the filesystem with the old crate name in code becomes confusing.

@bors r+

@bors
Copy link
Contributor

bors commented Dec 29, 2019

📌 Commit a3eadd0ec1de4d003a5289fe8c830bae86b4c393 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 29, 2019
@bors
Copy link
Contributor

bors commented Dec 29, 2019

☔ The latest upstream changes (presumably #67112) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 29, 2019
@petrochenkov
Copy link
Contributor Author

@bors r=Centril p=1 (conflict-prone)

@bors
Copy link
Contributor

bors commented Dec 30, 2019

📌 Commit 7608f21 has been approved by Centril

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 30, 2019
@bors
Copy link
Contributor

bors commented Dec 30, 2019

⌛ Testing commit 7608f21 with merge a9dd56f...

bors added a commit that referenced this pull request Dec 30, 2019
Rename some crates and modules in the frontend

Migrate from `syntax_*` naming scheme to `rustc_*`.
See #65324 (comment) and several comments below.

Renamed crates:
`syntax_expand` -> `rustc_expand`
`syntax_pos` -> `rustc_span` ([motivation](#65324 (comment)))
`syntax_ext` -> `rustc_builtin_macros`

Also one module in resolve is renamed for consistency and to avoid tautology.

r? @Centril
@bors
Copy link
Contributor

bors commented Dec 30, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing a9dd56f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 30, 2019
@bors bors merged commit 7608f21 into rust-lang:master Dec 30, 2019
JohnTitor added a commit to JohnTitor/rust-clippy that referenced this pull request Dec 31, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request Dec 31, 2019
Rustup to rust-lang/rust#67707

`syntax_pos` -> `rustc_span`

changelog: none
bors added a commit to rust-lang/rust-clippy that referenced this pull request Dec 31, 2019
Rustup to rust-lang/rust#67707

`syntax_pos` -> `rustc_span`

changelog: none
bors added a commit to rust-lang/rust-clippy that referenced this pull request Dec 31, 2019
Rustup to rust-lang/rust#67707

`syntax_pos` -> `rustc_span`

changelog: none
bors added a commit to rust-lang/rust-clippy that referenced this pull request Dec 31, 2019
Rustup to rust-lang/rust#67707

`syntax_pos` -> `rustc_span`

changelog: none
bors added a commit that referenced this pull request Jan 1, 2020
Rename `syntax_pos` to `rustc_span` in source code

Follow-up to #67707.

r? @Centril
calebcartwright added a commit to calebcartwright/rustfmt that referenced this pull request Jan 16, 2020
syntax_pos was renamed to rustc_span
rust-lang/rust#67707

and modules like `symbol` and `source_map` are no longer re-exported in
libsyanx so we also need to consume them directly from the rustc_span
crate
rust-lang/rust#67786
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants