Skip to content
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

bugfix: finalize resolutions of macros in trait positions #40849

Merged
merged 1 commit into from
Mar 29, 2017
Merged

bugfix: finalize resolutions of macros in trait positions #40849

merged 1 commit into from
Mar 29, 2017

Conversation

jseyfried
Copy link
Contributor

Fixes #40845.
r? @nrc

jseyfried
jseyfried commented Mar 27, 2017
View reviewed changes
src/librustc_resolve/macros.rs
@@ -172,7 +172,6 @@ impl<'a> base::Resolver for Resolver<'a> {
expansion: mark,
};
expansion.visit_with(&mut visitor);
self.current_module.unresolved_invocations.borrow_mut().remove(&mark);
Copy link
Contributor Author

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)

@jseyfried jseyfried 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
@jseyfried jseyfried mentioned this pull request Mar 27, 2017
Closed
@nrc
Copy link
Member

nrc commented Mar 27, 2017

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 27, 2017

📌 Commit 737511e has been approved by nrc

@alexcrichton alexcrichton 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 of rust-lang#40849 - jseyfried:finalize_trait_macro_reso…
68c7385 
…lutions, r=nrc

bugfix: finalize resolutions of macros in trait positions

Fixes rust-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:master Mar 29, 2017
@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 4, 2017
@nikomatsakis
Copy link
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
@alexcrichton alexcrichton mentioned this pull request Apr 4, 2017
Merged
@alexcrichton alexcrichton 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.
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@nrc nrc

Labels
beta-accepted Accepted 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jseyfried @nrc @bors @nikomatsakis @alexcrichton