Update compiler error 0034 to use new format. #35959 modified #36009
Conversation
|
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. |
| @@ -241,7 +241,8 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { | |||
|
|
|||
| MethodError::Ambiguity(sources) => { | |||
| let mut err = struct_span_err!(self.sess(), span, E0034, | |||
| "multiple applicable items in scope"); | |||
| "multiple applicable items in scope"); | |||
There was a problem hiding this comment.
Why changing the indent?
There was a problem hiding this comment.
Oh!, I did that unintentionally. Will recommit it.
There was a problem hiding this comment.
You can commit then squash. It'll be faster. If you don't know how to squash, take a look here.
There was a problem hiding this comment.
Sorry, that blog link is not loading.
|
Any more changes to be done..? |
|
@athulappadan - looks pretty close. Can you squash your git commits down from 3 commits to 1? You can read how with articles like http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html |
|
I am getting all kinds of errors while trying to squash and I am not able to figure it out myself. Seems like I have messed it up with my commits and merges. If possible, shall I open a fresh PR and finish the thing in one commit? (I think I need to spend some time to get a fix on how to use git properly) |
|
:-/ Go ask on IRC if possible. We can't merge like this. |
|
@athulappadan - yes, you can close this PR and open a new one if you need to. Getting used to squashing can take a little practice. Something I like to do is to always use a branch for a specific PR. That way, if I ever need to update something, I can switch back to Not sure if that helps you. It took me a while to get use to git and the techniques they use here, but after a while it gets easier. |
|
Earlier itself I thought of making a new branch but then I saw the line saying push against master branch. Now I will make a new branch and push the changes. |
Part of #35233
Addresses #35205
I have updated the unit test to check for the labels and also removed the tab characters. As I am relatively new to contributing to open source projects, please make suggestions if I am not using git in the correct way.
r? @jonathandturner