Break dependencies between `syntax_ext` and other crates #62771

petrochenkov · 2019-07-17T23:28:55Z

Move source_util macros into syntax_ext.
Move other early code generation facilities like standard library injection into syntax_ext.

The only crate that depends on syntax_ext now is rustc_interface which is one of the "final" crates that depend on everything.

Minor: Cleanup dependencies of rustc_driver, many of them are no longer used after introduction of rustc_interface.

r? @eddyb

eddyb · 2019-07-18T07:19:31Z

without either moving the whole proc macro server into libsyntax

IMO that's where it should go, I probably should've put it there myself.
Can we rename syntax_ext to rustc_builtin_macros or something?

eddyb

cc @Zoxc but LGTM

eddyb · 2019-07-18T07:21:06Z

@bors r+

bors · 2019-07-18T07:21:08Z

📌 Commit 62863279eaa63d5d068f7b136d705ecd3147b33f has been approved by eddyb

petrochenkov · 2019-07-18T10:13:30Z

@bors r-
(I'll move the proc macro server.)

petrochenkov · 2019-07-18T20:43:01Z

Updated.
syntax_ext is no longer tied to rustc_metadata (proc macro server is in libsyntax now) and more code is moved into syntax_ext.

eddyb

r=me

petrochenkov · 2019-07-18T23:52:38Z

@bors r=eddyb

bors · 2019-07-18T23:52:39Z

📌 Commit 4e718ac1efd4fa2a76259f197eea4b145d176c58 has been approved by eddyb

bors · 2019-07-20T00:55:08Z

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

petrochenkov · 2019-07-20T11:11:30Z

@bors r=eddyb

@eddyb

Break dependencies between `syntax_ext` and other crates Move `source_util` macros into `syntax_ext`. Move other early code generation facilities like standard library injection into `syntax_ext`. The only crate that depends on `syntax_ext` now is `rustc_interface` which is one of the "final" crates that depend on everything. Minor: Cleanup dependencies of `rustc_driver`, many of them are no longer used after introduction of `rustc_interface`. r? @eddyb

bors · 2019-07-26T21:22:49Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout depext (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self depext --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/libsyntax_ext/test_harness.rs
Removing src/libsyntax_ext/test_case.rs
Auto-merging src/libsyntax_ext/standard_library_imports.rs
Auto-merging src/libsyntax_ext/source_util.rs
Removing src/libsyntax_ext/proc_macro_impl.rs
Auto-merging src/libsyntax_ext/proc_macro_harness.rs
Removing src/libsyntax_ext/deriving/custom.rs
Auto-merging src/libsyntax/parse/lexer/mod.rs
Auto-merging src/libsyntax/ext/proc_macro_server.rs
Removing src/libsyntax/ext/derive.rs
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

bors · 2019-07-27T03:26:03Z

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

Move `source_uitil` macros into `syntax_ext` Cleanup dependencies of `rustc_driver`

Few other minor renamings for consistency. Remove one unused dependency from `rustc_passes`. Fix libsyntax tests. Fix rebase.

petrochenkov · 2019-07-27T11:16:51Z

@bors r=eddyb

bors · 2019-07-27T11:16:52Z

📌 Commit b5a0e6e has been approved by eddyb

@eddyb

Break dependencies between `syntax_ext` and other crates Move `source_util` macros into `syntax_ext`. Move other early code generation facilities like standard library injection into `syntax_ext`. The only crate that depends on `syntax_ext` now is `rustc_interface` which is one of the "final" crates that depend on everything. Minor: Cleanup dependencies of `rustc_driver`, many of them are no longer used after introduction of `rustc_interface`. r? @eddyb

@eddyb

Break dependencies between `syntax_ext` and other crates Move `source_util` macros into `syntax_ext`. Move other early code generation facilities like standard library injection into `syntax_ext`. The only crate that depends on `syntax_ext` now is `rustc_interface` which is one of the "final" crates that depend on everything. Minor: Cleanup dependencies of `rustc_driver`, many of them are no longer used after introduction of `rustc_interface`. r? @eddyb

@eddyb

Break dependencies between `syntax_ext` and other crates Move `source_util` macros into `syntax_ext`. Move other early code generation facilities like standard library injection into `syntax_ext`. The only crate that depends on `syntax_ext` now is `rustc_interface` which is one of the "final" crates that depend on everything. Minor: Cleanup dependencies of `rustc_driver`, many of them are no longer used after introduction of `rustc_interface`. r? @eddyb

@ghost

Rollup of 8 pull requests Successful merges: - #61207 (Allow lifetime elision in `Pin<&(mut) Self>`) - #62074 (squash of all commits for nth_back on ChunksMut) - #62771 (Break dependencies between `syntax_ext` and other crates) - #62883 (Refactoring use common code between option, result and accum) - #62949 (Re-enable assertions in PPC dist builder) - #62996 (tidy: Add a check for inline unit tests) - #63038 (Make more informative error on outer attribute after inner) - #63050 (ci: download awscli from our mirror) Failed merges: r? @ghost

Move injection of attributes from command line to `libsyntax_ext` Just a tiny bit of code generation that wasn't moved into `libsyntax_ext` in rust-lang#62771.

rust-highfive assigned eddyb Jul 17, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 17, 2019

eddyb approved these changes Jul 18, 2019

View reviewed changes

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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 18, 2019

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 Jul 18, 2019

petrochenkov force-pushed the depext branch from 6286327 to 922252d Compare July 18, 2019 10:36

petrochenkov changed the title ~~Break dependencies between syntax_ext and some other crates~~ [WIP] Break dependencies between syntax_ext and some other crates Jul 18, 2019

eddyb approved these changes Jul 18, 2019

View reviewed changes

petrochenkov force-pushed the depext branch from 922252d to 9f3a81e Compare July 18, 2019 20:35

petrochenkov changed the title ~~[WIP] Break dependencies between syntax_ext and some other crates~~ Break dependencies between syntax_ext and other crates Jul 18, 2019

petrochenkov added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 18, 2019

petrochenkov force-pushed the depext branch from 9f3a81e to 4e718ac Compare July 18, 2019 20:57

eddyb approved these changes Jul 18, 2019

View reviewed changes

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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 18, 2019

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 Jul 20, 2019

petrochenkov force-pushed the depext branch from 4e718ac to ec5f089 Compare July 20, 2019 11:11

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 26, 2019

Centril mentioned this pull request Jul 26, 2019

Rollup of 7 pull requests #63025

Closed

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 Jul 26, 2019

petrochenkov added 5 commits July 27, 2019 13:52

Break dependencies between syntax_ext and some other crates

3eeec1c

Move `source_uitil` macros into `syntax_ext` Cleanup dependencies of `rustc_driver`

Move proc macro server into libsyntax

4ad0daa

Move test harness generation into libsyntax_ext

f6eda99

Move standard library injection into libsyntax_ext

4d535bd

syntax_ext: proc_macro_decls -> proc_macro_harness

b5a0e6e

Few other minor renamings for consistency. Remove one unused dependency from `rustc_passes`. Fix libsyntax tests. Fix rebase.

petrochenkov force-pushed the depext branch from 0a24e28 to b5a0e6e Compare July 27, 2019 11:16

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 Jul 27, 2019

Centril mentioned this pull request Jul 27, 2019

Rollup of 5 pull requests #63049

Closed

Centril mentioned this pull request Jul 27, 2019

Rollup of 6 pull requests #63052

Closed

Centril mentioned this pull request Jul 28, 2019

Rollup of 8 pull requests #63057

Merged

bors merged commit b5a0e6e into rust-lang:master Jul 28, 2019

petrochenkov mentioned this pull request Sep 6, 2019

Move injection of attributes from command line to libsyntax_ext #64243

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Break dependencies between `syntax_ext` and other crates #62771

Break dependencies between `syntax_ext` and other crates #62771

petrochenkov commented Jul 17, 2019 •

edited

Loading

eddyb commented Jul 18, 2019

eddyb left a comment

eddyb commented Jul 18, 2019

bors commented Jul 18, 2019

petrochenkov commented Jul 18, 2019

petrochenkov commented Jul 18, 2019

eddyb left a comment

petrochenkov commented Jul 18, 2019

bors commented Jul 18, 2019

bors commented Jul 20, 2019

petrochenkov commented Jul 20, 2019

bors commented Jul 26, 2019

bors commented Jul 27, 2019

petrochenkov commented Jul 27, 2019

bors commented Jul 27, 2019

Break dependencies between syntax_ext and other crates #62771

Break dependencies between syntax_ext and other crates #62771

Conversation

petrochenkov commented Jul 17, 2019 • edited Loading

eddyb commented Jul 18, 2019

eddyb left a comment

Choose a reason for hiding this comment

eddyb commented Jul 18, 2019

bors commented Jul 18, 2019

petrochenkov commented Jul 18, 2019

petrochenkov commented Jul 18, 2019

eddyb left a comment

Choose a reason for hiding this comment

petrochenkov commented Jul 18, 2019

bors commented Jul 18, 2019

bors commented Jul 20, 2019

petrochenkov commented Jul 20, 2019

bors commented Jul 26, 2019

bors commented Jul 27, 2019

petrochenkov commented Jul 27, 2019

bors commented Jul 27, 2019

Break dependencies between `syntax_ext` and other crates #62771

Break dependencies between `syntax_ext` and other crates #62771

petrochenkov commented Jul 17, 2019 •

edited

Loading