Skip to content

Nix reexports from rustc_span in syntax - #67786

Merged
bors merged 5 commits into
rust-lang:masterfrom
Centril:canon-span
Jan 4, 2020
Merged

Nix reexports from rustc_span in syntax#67786
bors merged 5 commits into
rust-lang:masterfrom
Centril:canon-span

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Remove reexports syntax::{source_map, symbol, edition} and use rustc_span paths directly.

r? @petrochenkov

@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@bors

This comment has been minimized.

@borsbors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 2, 2020
@petrochenkov

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jan 2, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 059bdee2a99f46cadd33c8fb2c76a172b65e48fa has been approved by petrochenkov

@borsbors 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 Jan 2, 2020
@rust-highfive

This comment has been minimized.

@Centril

This comment has been minimized.

@borsbors 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 Jan 2, 2020
@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r=petrochenkov

@bors

bors commented Jan 2, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 6e4ea14 has been approved by petrochenkov

@borsbors 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 Jan 2, 2020
Centril added a commit to Centril/rust that referenced this pull request Jan 4, 2020
Nix reexports from `rustc_span` in `syntax`
Remove reexports `syntax::{source_map, symbol, edition}` and use `rustc_span` paths directly.
r? @petrochenkov
@CentrilCentril mentioned this pull request Jan 4, 2020
bors added a commit that referenced this pull request Jan 4, 2020
Rollup of 8 pull requests
Successful merges:
- #66913 (Suggest calling method when first argument is `self`)
- #67531 (no longer promote non-pattern const functions)
- #67773 (Add a test for #37333)
- #67786 (Nix reexports from `rustc_span` in `syntax`)
- #67789 (Cleanup linkchecker whitelist)
- #67810 (Implement uncommon_codepoints lint.)
- #67835 (tweak wording of mismatched delimiter errors)
- #67845 (Also remove const-hack for abs)
Failed merges:
r? @ghost
@bors
bors merged commit 6e4ea14 into rust-lang:masterJan 4, 2020
phansch added a commit to phansch/rust-clippy that referenced this pull request Jan 4, 2020
phansch added a commit to phansch/rust-clippy that referenced this pull request Jan 4, 2020
bors added a commit to rust-lang/rust-clippy that referenced this pull request Jan 4, 2020
@Centril
Centril deleted the canon-span branch January 4, 2020 15:31
Xanewok added a commit to rust-lang/rls that referenced this pull request Jan 4, 2020
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
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 18, 2020
Move `MapInPlace` to rustc_data_structures
Follow-up of rust-lang#67786, it fits the purpose of rustc_data_structures.
r? @petrochenkov
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 18, 2020
Move `MapInPlace` to rustc_data_structures
Follow-up of rust-lang#67786, it fits the purpose of rustc_data_structures.
r? @petrochenkov
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 18, 2020
Move `MapInPlace` to rustc_data_structures
Follow-up of rust-lang#67786, it fits the purpose of rustc_data_structures.
r? @petrochenkov
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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.

4 participants

@Centril@rust-highfive@bors@petrochenkov