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

Updated error format for E0069 #35351

Merged
merged 1 commit into from
Aug 6, 2016
Merged

Conversation

jaredwy
Copy link

@jaredwy jaredwy commented Aug 5, 2016

Fixes #35219 which is part of the error bonanza at #35233

r? @jonathandturner

@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 @jonathandturner (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.

return;
//~^ ERROR `return;` in a function whose return type is not `()`
//~| NOTE return type is not ()

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for PR - Looks good, but can you remove this extra line?

@jaredwy
Copy link
Author

jaredwy commented Aug 5, 2016

@jonathandturner let me know if you want me to rebase this.

@sophiajt
Copy link
Contributor

sophiajt commented Aug 5, 2016

@jaredwy - would you mind squashing the commits?

@sophiajt
Copy link
Contributor

sophiajt commented Aug 5, 2016

hehe, good call. yes, please :)

@jaredwy
Copy link
Author

jaredwy commented Aug 5, 2016

@jonathandturner hopefully good to go now.

@sophiajt
Copy link
Contributor

sophiajt commented Aug 5, 2016

Looks good!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 5, 2016

📌 Commit 1cf5142 has been approved by jonathandturner

eddyb added a commit to eddyb/rust that referenced this pull request Aug 6, 2016
…dturner

Updated error format for E0069

Fixes rust-lang#35219 which is part of the error bonanza at rust-lang#35233

r? @jonathandturner
bors added a commit that referenced this pull request Aug 6, 2016
@bors bors merged commit 1cf5142 into rust-lang:master Aug 6, 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.

5 participants