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.

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

Update E0424 to the new error format #35841

Merged
merged 1 commit into from
Aug 23, 2016
Merged

Update E0424 to the new error format #35841

merged 1 commit into from
Aug 23, 2016

Conversation

kyrias
Copy link
Contributor

@kyrias kyrias commented Aug 20, 2016

Fixes #35797.
Part of #35233.

r? @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @GuillaumeGomez (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@@ -59,7 +59,7 @@ impl cat {
impl cat {
fn meow() {
if self.whiskers > 3 {
//~^ ERROR: `self` is not available in a static method. Maybe a `self` argument is missing?
//~^ ERROR: `self` is not available in a static method
Copy link
Member

@GuillaumeGomez GuillaumeGomez Aug 20, 2016

Choose a reason for hiding this comment

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

Missing the note you added (like you did in E0424 file).

@kyrias
Copy link
Contributor Author

kyrias commented Aug 20, 2016

Ah, added that afterwards and forgot to check the diff of the first file.

@GuillaumeGomez
Copy link
Member

No problem. Please squash your commits and then I r+.

Fixes #35797.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
@kyrias
Copy link
Contributor Author

kyrias commented Aug 20, 2016

Squashed!

@GuillaumeGomez
Copy link
Member

Thanks!

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Aug 20, 2016

📌 Commit ff44f08 has been approved by GuillaumeGomez

eddyb added a commit to eddyb/rust that referenced this pull request Aug 22, 2016
sophiajt pushed a commit to sophiajt/rust that referenced this pull request Aug 22, 2016
sophiajt pushed a commit to sophiajt/rust that referenced this pull request Aug 22, 2016
bors added a commit that referenced this pull request Aug 22, 2016
@bors
Copy link
Contributor

bors commented Aug 23, 2016

☔ The latest upstream changes (presumably #35908) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors merged commit ff44f08 into rust-lang:master Aug 23, 2016
@kyrias kyrias deleted the new-error-E0424 branch August 23, 2016 08:45
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.

4 participants