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

Create E0774 #76406

Merged
merged 2 commits into from
Sep 9, 2020
Merged

Create E0774 #76406

merged 2 commits into from
Sep 9, 2020

Conversation

GuillaumeGomez
Copy link
Member

No description provided.

@rust-highfive
Copy link
Collaborator

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 6, 2020
@jyn514 jyn514 added the A-diagnostics Area: Messages for errors, warnings, and lints label Sep 7, 2020
jyn514
jyn514 reviewed Sep 7, 2020
View reviewed changes
compiler/rustc_expand/src/expand.rs Outdated Show resolved Hide resolved
compiler/rustc_expand/src/base.rs Outdated Show resolved Hide resolved
@jyn514 jyn514 added A-macros Area: All kinds of macros (custom derive, macro_rules!, proc macros, ..) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. A-error-codes Area: Explanation of an error code (--explain) labels Sep 7, 2020
@GuillaumeGomez
Copy link
Member Author

@jyn514 @pickfire Did you decide on a solution? Either way I'm fine with it. :)

@jyn514
Copy link
Member

jyn514 commented Sep 8, 2020

I think this should use struct_span_err!.

@GuillaumeGomez
Copy link
Member Author

Then let's go!

@GuillaumeGomez
Copy link
Member Author

Updated!

jyn514
jyn514 approved these changes Sep 8, 2020
View reviewed changes
compiler/rustc_expand/src/expand.rs
let mut err = self
.cx
.struct_span_err(span, "`derive` may only be applied to structs, enums and unions");
let mut err = rustc_errors::struct_span_err!(
Copy link
Member

Choose a reason for hiding this comment

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

nit: this is generally imported and used without the rustc_errors prefix

@GuillaumeGomez GuillaumeGomez mentioned this pull request Sep 9, 2020
Closed
@GuillaumeGomez
Copy link
Member Author

@bors: r=pickfire,jyn514

@bors
Copy link
Contributor

bors commented Sep 9, 2020

📌 Commit 1d02f4f has been approved by pickfire,jyn514

@bors bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 9, 2020
@bors
Copy link
Contributor

bors commented Sep 9, 2020

⌛ Testing commit 1d02f4f with merge 3f5e617...

@bors
Copy link
Contributor

bors commented Sep 9, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: pickfire,jyn514
Pushing 3f5e617 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 9, 2020
@bors bors merged commit 3f5e617 into rust-lang:master Sep 9, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 9, 2020
@bors bors mentioned this pull request Sep 9, 2020
Merged
@GuillaumeGomez GuillaumeGomez deleted the create-e0774 branch September 9, 2020 11:24
@jyn514 jyn514 mentioned this pull request Sep 9, 2020
Closed
@Veetaha Veetaha mentioned this pull request Sep 10, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pickfire pickfire pickfire left review comments

@jyn514 jyn514 jyn514 approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels
A-diagnostics Area: Messages for errors, warnings, and lints A-error-codes Area: Explanation of an error code (--explain) A-macros Area: All kinds of macros (custom derive, macro_rules!, proc macros, ..) merged-by-bors This PR was explicitly merged by bors. 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
1.48.0
Development

Successfully merging this pull request may close these issues.
7 participants
@GuillaumeGomez @rust-highfive @jyn514 @bors @pickfire @nikomatsakis @rustbot