Skip to content

macros: fix bug in collecting trait and impl items with derives. #44757

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom
Merged
bors merged 1 commit into from
Sep 27, 2017
Merged

macros: fix bug in collecting trait and impl items with derives. #44757

bors merged 1 commit into from
Sep 27, 2017
+29 −7

Conversation

@jseyfried
Copy link
Contributor

@jseyfried jseyfried commented Sep 21, 2017

Fixes #43023.
r? @nrc

@jseyfried jseyfried mentioned this pull request Sep 21, 2017
Closed
@nikomatsakis nikomatsakis 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 Sep 21, 2017
@nikomatsakis
Copy link
Contributor

nikomatsakis commented Sep 21, 2017

Nominating for backport because fixes a stable-to-beta regression (#43023).

@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 21, 2017
@arielb1
Copy link
Contributor

arielb1 commented Sep 21, 2017 •
edited by jseyfried
Loading 

[00:03:56] tidy error: /checkout/src/libsyntax/ext/expand.rs:755: line longer than 100 chars

@jseyfried jseyfried force-pushed the fix_bad_derive_collection branch from da99d8a to 7ba7021 Compare September 21, 2017 20:47
@nrc
Copy link
Member

nrc commented Sep 21, 2017

@bors: r+

@bors
Copy link
Collaborator

bors commented Sep 21, 2017

📌 Commit 7ba7021 has been approved by nrc

@shepmaster shepmaster added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 22, 2017
@bors
Copy link
Collaborator

bors commented Sep 23, 2017

⌛ Testing commit 7ba7021 with merge fdfa6ab...

bors added a commit that referenced this pull request Sep 23, 2017
@bors
Auto merge of #44757 - jseyfried:fix_bad_derive_collection, r=nrc
fdfa6ab 
macros: fix bug in collecting trait and impl items with derives.

Fixes #43023.
r? @nrc
@bors
Copy link
Collaborator

bors commented Sep 23, 2017

💔 Test failed - status-travis

kennytm
kennytm requested changes Sep 23, 2017
View reviewed changes
src/test/compile-fail/issue-43023.rs Outdated
struct S;

impl S {
#[derive(Debug)] //~ ERROR `derive` can be only be applied to items
Copy link
Member

@kennytm kennytm Sep 23, 2017

Choose a reason for hiding this comment

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

Please update the error messages.

[00:55:08] ---- [compile-fail] compile-fail/issue-43023.rs stdout ----
[00:55:08] 	
[00:55:08] error: /checkout/src/test/compile-fail/issue-43023.rs:14: unexpected "error": '14:5: 14:21: `derive` may only be applied to structs, enums and unions'
[00:55:08] 
[00:55:08] error: /checkout/src/test/compile-fail/issue-43023.rs:21: unexpected "error": '21:5: 21:21: `derive` may only be applied to structs, enums and unions'
[00:55:08] 
[00:55:08] error: /checkout/src/test/compile-fail/issue-43023.rs:26: unexpected "error": '26:5: 26:21: `derive` may only be applied to structs, enums and unions'
[00:55:08] 
[00:55:08] error: 3 unexpected errors found, 0 expected errors not found

@carols10cents carols10cents added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 25, 2017
@jseyfried jseyfried force-pushed the fix_bad_derive_collection branch from 7ba7021 to 8bc49e7 Compare September 25, 2017 22:47
@jseyfried jseyfried force-pushed the fix_bad_derive_collection branch from 8bc49e7 to 375332c Compare September 26, 2017 01:22
@jseyfried
Copy link
Contributor Author

jseyfried commented Sep 26, 2017

@bors r=nrc

@bors
Copy link
Collaborator

bors commented Sep 26, 2017

📌 Commit 375332c has been approved by nrc

@jseyfried jseyfried added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 26, 2017
@alexcrichton
Copy link
Member

alexcrichton commented Sep 26, 2017

@bors: p=1

fixing a regression and beta-accepted

@bors
Copy link
Collaborator

bors commented Sep 26, 2017

⌛ Testing commit 375332c with merge d4da744...

bors added a commit that referenced this pull request Sep 26, 2017
@bors
Auto merge of #44757 - jseyfried:fix_bad_derive_collection, r=nrc
d4da744 
macros: fix bug in collecting trait and impl items with derives.

Fixes #43023.
r? @nrc
@bors bors mentioned this pull request Sep 26, 2017
Merged
@bors
Copy link
Collaborator

bors commented Sep 27, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: nrc
Pushing d4da744 to master...

@bors bors merged commit 375332c into rust-lang:master Sep 27, 2017
@nikomatsakis
Copy link
Contributor

nikomatsakis commented Sep 28, 2017

Backporting to beta.

This was referenced Sep 28, 2017
Closed
Merged
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 28, 2017
bors added a commit that referenced this pull request Sep 28, 2017
@bors
Auto merge of #44908 - nikomatsakis:beta-20170928, r=alexcrichton
d158897 
Beta 20170928

Backports of:

- Allow unused extern crate again #44825
- macros: fix bug in collecting trait and impl items with derives. #44757
-  `--cap-lints allow` switches off `can_emit_warnings` #44627
-  Update the libc submodule #44116
- limit and clear cache obligations opportunistically #44269
- clear out projection subobligations after they are processed #43999
bors added a commit that referenced this pull request Oct 7, 2017
@bors
Auto merge of #44908 - nikomatsakis:beta-20170928, r=alexcrichton
aa30011 
Beta 20170928

Backports of:

- Allow unused extern crate again #44825
- macros: fix bug in collecting trait and impl items with derives. #44757
-  `--cap-lints allow` switches off `can_emit_warnings` #44627
-  Update the libc submodule #44116
- limit and clear cache obligations opportunistically #44269
- clear out projection subobligations after they are processed #43999
-  fix logic error in #44269's `prune_cache_value_obligations` #45065
- REVERTS #43543: Cleanup some remains of `hr_lifetime_in_assoc_type` compatibility lint:
@jseyfried jseyfried deleted the fix_bad_derive_collection branch December 7, 2017 05:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kennytm kennytm kennytm requested changes

Assignees

@nrc nrc

Labels

beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.

9 participants

@jseyfried @nikomatsakis @arielb1 @nrc @bors @alexcrichton @kennytm @shepmaster @carols10cents