Skip to content

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

Merged
bors merged 5 commits into
rust-lang:masterfrom
jseyfried:import_macros_in_resolve
Oct 25, 2016
Merged

Process #[macro_use] imports in resolve and clean up macro loading#37292
bors merged 5 commits into
rust-lang:masterfrom
jseyfried:import_macros_in_resolve

Conversation

@jseyfried

Copy link
Copy Markdown
Contributor

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

@jseyfried
jseyfriedforce-pushed the import_macros_in_resolve branch from f088f3c to 003c069CompareOctober 20, 2016 00:00
@jseyfriedjseyfried changed the title Process #[macro_use] imports in resolve clean up macro loadingProcess #[macro_use] imports in resolve and clean up macro loadingOct 20, 2016
@jseyfried
jseyfriedforce-pushed the import_macros_in_resolve branch from 003c069 to df7bb6fCompareOctober 20, 2016 00:14
@bors

bors commented Oct 21, 2016

Copy link
Copy Markdown
Collaborator

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

@jseyfried
jseyfriedforce-pushed the import_macros_in_resolve branch 2 times, most recently from 020f379 to 5f57f34CompareOctober 22, 2016 06:11
@bors

bors commented Oct 23, 2016

Copy link
Copy Markdown
Collaborator

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

@jseyfried
jseyfriedforce-pushed the import_macros_in_resolve branch from 5f57f34 to f145236CompareOctober 23, 2016 06:15
@jseyfried
jseyfriedforce-pushed the import_macros_in_resolve branch from f145236 to 5e8951dCompareOctober 24, 2016 00:55
@nrc

nrc commented Oct 24, 2016

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Oct 24, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 5e8951d has been approved by nrc

@bors

bors commented Oct 25, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5e8951d with merge affc3b7...

bors added a commit that referenced this pull request Oct 25, 2016
Process `#[macro_use]` imports in `resolve` and clean up macro loading
Groundwork macro modularization (cc #35896).
r? @nrc
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@jseyfried@bors@nrc