Skip to content

Fix a regression in the configuration folder#34031

Merged
bors merged 2 commits into
rust-lang:masterfrom
jseyfried:fix_cfg_bug
Jun 5, 2016
Merged

Fix a regression in the configuration folder#34031
bors merged 2 commits into
rust-lang:masterfrom
jseyfried:fix_cfg_bug

Conversation

@jseyfried

@jseyfried jseyfried commented Jun 2, 2016

Copy link
Copy Markdown
Contributor

This fixes #34028, a regression caused by #33706 in which unconfigured impl items generated by a macro in an impl item position are not removed.
r? @nrc

@jseyfried jseyfried changed the title Fix a bug in the configuration folder Fix a regression in the configuration folder Jun 2, 2016
Comment thread src/libsyntax/config.rs

fn fold_item(&mut self, item: P<ast::Item>) -> SmallVector<P<ast::Item>> {
self.configure(item).map(|item| SmallVector::one(item.map(|i| self.fold_item_simple(i))))
self.configure(item).map(|item| fold::noop_fold_item(item, self))

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is a pure uninlining refactoring -- c.f. noop_fold_item.

@jseyfried

Copy link
Copy Markdown
Contributor Author

It would be nice to land this ASAP (cc @alexcrichton or @eddyb -- r?)

@eddyb

eddyb commented Jun 4, 2016

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jun 4, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 9639ec8 has been approved by eddyb

@bors

bors commented Jun 4, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 9639ec8 with merge ccfaaa7...

bors added a commit that referenced this pull request Jun 4, 2016
Fix a regression in the configuration folder

This fixes #34028, a regression caused by #33706 in which unconfigured impl items generated by a macro in an impl item position are not removed.
r? @nrc
@jseyfried

Copy link
Copy Markdown
Contributor Author

@eddyb Thanks!

@bors

bors commented Jun 5, 2016

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-mac-32-opt

@jseyfried

Copy link
Copy Markdown
Contributor Author

@bors retry

@bors bors merged commit 9639ec8 into rust-lang:master Jun 5, 2016
Sign up for free to 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.

Macro hygiene regression

4 participants