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

Add long diagnostics for E0133. #24552

Merged
merged 1 commit into from
Apr 19, 2015
Merged

Add long diagnostics for E0133. #24552

merged 1 commit into from
Apr 19, 2015

Conversation

meqif
Copy link
Contributor

@meqif meqif commented Apr 18, 2015

cc #24407

@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 @nrc (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. 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 CONTRIBUTING.md for more information.

@alexcrichton
Copy link
Member

@bors: r+ 312b301 rollup

Thanks!

bors added a commit that referenced this pull request Apr 18, 2015
@bors
Copy link
Contributor

bors commented Apr 18, 2015

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

@meqif
Copy link
Contributor Author

meqif commented Apr 18, 2015

Should I rebase and push -f the changes?

@michaelsproul
Copy link
Contributor

@meqif: Yeah, do a rebase and a push, then I'll cherry-pick your commit into a roll-up with a few of the other extended error commits (otherwise we get horrendous merge conflicts).

@meqif
Copy link
Contributor Author

meqif commented Apr 18, 2015

@michaelsproul: Done, thank you.

@michaelsproul
Copy link
Contributor

Thank you! 😄

@alexcrichton
Copy link
Member

@bors: r+ 5c7a0ba

@bors
Copy link
Contributor

bors commented Apr 19, 2015

⌛ Testing commit 5c7a0ba with merge 14d9d1c...

bors added a commit that referenced this pull request Apr 19, 2015
@bors bors merged commit 5c7a0ba into rust-lang:master Apr 19, 2015
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.

6 participants