Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:fix_bad_derive_collection
Sep 27, 2017
Merged

macros: fix bug in collecting trait and impl items with derives.#44757
bors merged 1 commit into
rust-lang:masterfrom
jseyfried:fix_bad_derive_collection

Conversation

@jseyfried

@jseyfriedjseyfried commented Sep 21, 2017

Copy link
Copy Markdown
Contributor

Fixes#43023.
r? @nrc

@jseyfriedjseyfried mentioned this pull request Sep 21, 2017
Closed
@nikomatsakisnikomatsakis 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

nikomatsakis commented Sep 21, 2017

Copy link
Copy Markdown
Contributor

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

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

arielb1 commented Sep 21, 2017•
edited by jseyfried
Loading

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

@jseyfried
jseyfriedforce-pushed the fix_bad_derive_collection branch from da99d8a to 7ba7021CompareSeptember 21, 2017 20:47
@nrc

nrc commented Sep 21, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Sep 21, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 7ba7021 has been approved by nrc

@shepmastershepmaster 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

bors commented Sep 23, 2017

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Sep 23, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

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

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

@kennytmkennytmSep 23, 2017

Copy link
Copy Markdown
Member

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

@carols10centscarols10cents 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
jseyfriedforce-pushed the fix_bad_derive_collection branch from 7ba7021 to 8bc49e7CompareSeptember 25, 2017 22:47
@jseyfried
jseyfriedforce-pushed the fix_bad_derive_collection branch from 8bc49e7 to 375332cCompareSeptember 26, 2017 01:22
@jseyfried

jseyfried commented Sep 26, 2017

Copy link
Copy Markdown
ContributorAuthor

@bors r=nrc

@bors

bors commented Sep 26, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 375332c has been approved by nrc

@jseyfriedjseyfried 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

alexcrichton commented Sep 26, 2017

Copy link
Copy Markdown
Member

@bors: p=1

fixing a regression and beta-accepted

@bors

bors commented Sep 26, 2017

Copy link
Copy Markdown
Collaborator

⌛ 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
@borsbors mentioned this pull request Sep 26, 2017
Merged
@bors

bors commented Sep 27, 2017

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 375332c into rust-lang:masterSep 27, 2017
@nikomatsakis

nikomatsakis commented Sep 28, 2017

Copy link
Copy Markdown
Contributor

Backporting to beta.

This was referenced Sep 28, 2017
Closed
Merged
@alexcrichtonalexcrichton 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kennytmkennytmkennytm requested changes

Assignees

@nrcnrc

Labels

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

9 participants

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