Skip to content

bugfix: finalize resolutions of macros in trait positions - #40849

Merged
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:finalize_trait_macro_resolutions
Mar 29, 2017
Merged

bugfix: finalize resolutions of macros in trait positions #40849
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:finalize_trait_macro_resolutions

Conversation

@jseyfried

@jseyfriedjseyfried commented Mar 27, 2017

Copy link
Copy Markdown
Contributor

Fixes#40845.
r? @nrc

jseyfried
jseyfried commented Mar 27, 2017
View reviewed changes
Comment threadsrc/librustc_resolve/macros.rs
expansion: mark,
};
expansion.visit_with(&mut visitor);
self.current_module.unresolved_invocations.borrow_mut().remove(&mark);

@jseyfriedjseyfriedMar 27, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated: remove duplicated line (always a no-op)

@jseyfriedjseyfried added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 27, 2017
@jseyfriedjseyfried mentioned this pull request Mar 27, 2017
Closed
@nrc

nrc commented Mar 27, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Mar 27, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 737511e has been approved by nrc

@alexcrichtonalexcrichton mentioned this pull request Mar 27, 2017
Merged
alexcrichton added a commit to alexcrichton/rust that referenced this pull request Mar 27, 2017
@alexcrichton
Rollup merge ofrust-lang#40849- jseyfried:finalize_trait_macro_reso…
68c7385
…lutions, r=nrc
bugfix: finalize resolutions of macros in trait positions
Fixesrust-lang#40845.
r? @nrc
bors added a commit that referenced this pull request Mar 27, 2017
@bors
Auto merge of#40867- alexcrichton:rollup, r=alexcrichton
32a2d73
Rollup of 19 pull requests
- Successful merges: #40317, #40516, #40524, #40606, #40683, #40751, #40778, #40813, #40818, #40819, #40824, #40828, #40832, #40833, #40837, #40849, #40852, #40853, #40865
- Failed merges:
bors added a commit that referenced this pull request Mar 28, 2017
@bors
Auto merge of#40867- alexcrichton:rollup, r=alexcrichton
07a3429
Rollup of 19 pull requests
- Successful merges: #40317, #40516, #40524, #40606, #40683, #40751, #40778, #40813, #40818, #40819, #40824, #40828, #40832, #40833, #40837, #40849, #40852, #40853, #40865
- Failed merges:
@bors
bors merged commit 737511e into rust-lang:masterMar 29, 2017
@nikomatsakisnikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 4, 2017
@nikomatsakis

nikomatsakis commented Apr 4, 2017

Copy link
Copy Markdown
Contributor

Accepting for beta. Small patch, regression.

cc @rust-lang/compiler

@jseyfried
jseyfried deleted the finalize_trait_macro_resolutions branch April 4, 2017 20:07
@alexcrichtonalexcrichton mentioned this pull request Apr 4, 2017
Merged
@alexcrichtonalexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 4, 2017
bors added a commit that referenced this pull request Apr 5, 2017
@bors
Auto merge of#41071- alexcrichton:beta-next, r=alexcrichton
ca3d118
[beta] Backport accepted nominations
This is a backport of
* #40813
* #40849
This also includes #41069
Finally, this includes a bump to beta .3.
This is all current nominations except #40863, which is not passing tests yet.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nrcnrc

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jseyfried@nrc@bors@nikomatsakis@alexcrichton