Skip to content

Process #[macro_use] imports in resolve and clean up macro loading #37292

New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom
Merged
merged 5 commits into from
Oct 25, 2016
Merged

Process #[macro_use] imports in resolve and clean up macro loading #37292

merged 5 commits into from
Oct 25, 2016

Conversation

jseyfried
Copy link
Contributor

Groundwork macro modularization (cc #35896).
r? @nrc

@jseyfried jseyfried force-pushed the import_macros_in_resolve branch from f088f3c to 003c069 Compare October 20, 2016 00:00
@jseyfried jseyfried changed the title Process #[macro_use] imports in resolve clean up macro loading Process #[macro_use] imports in resolve and clean up macro loading Oct 20, 2016
@jseyfried jseyfried force-pushed the import_macros_in_resolve branch from 003c069 to df7bb6f Compare October 20, 2016 00:14
@bors
Copy link
Collaborator

bors commented Oct 21, 2016

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

@jseyfried jseyfried force-pushed the import_macros_in_resolve branch 2 times, most recently from 020f379 to 5f57f34 Compare October 22, 2016 06:11
@bors
Copy link
Collaborator

bors commented Oct 23, 2016

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

@jseyfried jseyfried force-pushed the import_macros_in_resolve branch from 5f57f34 to f145236 Compare October 23, 2016 06:15
@jseyfried jseyfried force-pushed the import_macros_in_resolve branch from f145236 to 5e8951d Compare October 24, 2016 00:55
@nrc
Copy link
Member

nrc commented Oct 24, 2016

@bors: r+

@bors
Copy link
Collaborator

bors commented Oct 24, 2016

📌 Commit 5e8951d has been approved by nrc

@bors
Copy link
Collaborator

bors commented Oct 25, 2016

⌛ Testing commit 5e8951d with merge affc3b7...

bors added a commit that referenced this pull request Oct 25, 2016
@bors
Auto merge of #37292 - jseyfried:import_macros_in_resolve, r=nrc
affc3b7 
Process `#[macro_use]` imports in `resolve` and clean up macro loading

Groundwork macro modularization (cc #35896).
r? @nrc
@alexcrichton alexcrichton mentioned this pull request Oct 25, 2016
Merged
@bors
Copy link
Collaborator

bors commented Oct 25, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: nrc
Pushing affc3b7 to master...

@bors bors merged commit 5e8951d into rust-lang:master Oct 25, 2016
This was referenced Oct 25, 2016
Merged
Merged
Merged
@jseyfried jseyfried mentioned this pull request Feb 7, 2017
Closed
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@nrc nrc

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jseyfried @bors @nrc