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 compiler error 0093 to use new error format #35346

Merged
merged 1 commit into from
Aug 18, 2016

Conversation

stanislav-tkach
Copy link
Contributor

Addresses #35230, Part of the #35233 meta bug

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.

@sophiajt
Copy link
Contributor

sophiajt commented Aug 4, 2016

Looks good, but I noticed an extra space at the end of one of the lines. Before it's ready you'll need to run it through tidy:

python src/bootstrap/bootstrap.py --stage 1 --step check-tidy

And fix any warnings it has.

@sophiajt
Copy link
Contributor

sophiajt commented Aug 5, 2016

Ah, and one more point (sorry, should have mentioned this earlier). Be sure to also update the unit test so that it's also testing for the new label.

@sophiajt
Copy link
Contributor

sophiajt commented Aug 7, 2016

Great. Looks almost ready. Last step, can you squash your 3 commits down to 1 commit?

@stanislav-tkach
Copy link
Contributor Author

Thank you for patience. Probably I have done something wrong with merge...

@GuillaumeGomez
Copy link
Member

So explanations to squash your commits (I should create a blog post about it haha).

First:

git rebase -i HEAD~5

(5 corresponds to your commit number). Then replace all "pick" by "s" except the one at the top. Confirm and save.

Now add a "#" in front of all commit's comments you don't want (so normally all except the one at the top).

Once this done, push the new git history like this:

git push -f origin HEAD:your_branch_name

your_branch_name should be e0093-formatting in your case.

@stanislav-tkach stanislav-tkach force-pushed the e0093-formatting branch 2 times, most recently from 7c0eb51 to 59b3e8c Compare August 9, 2016 10:11
@stanislav-tkach
Copy link
Contributor Author

/home/travis/build.sh: line 45: docker: command not found
The command "docker build -t rust -f src/etc/Dockerfile src/etc" failed and exited with 127 during .

Strange failure. I suppose it is not caused by my changes?..

@sophiajt
Copy link
Contributor

@DarkEld3r - Travis CI was down the other day. I'm guessing this is related to that.

Looks good now, that's for squashing.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 11, 2016

📌 Commit 127489a has been approved by jonathandturner

sophiajt pushed a commit to sophiajt/rust that referenced this pull request Aug 13, 2016
…handturner

Update compiler error 0093 to use new error format

Addresses rust-lang#35230, Part of the rust-lang#35233 meta bug

r? @jonathandturner
eddyb added a commit to eddyb/rust that referenced this pull request Aug 14, 2016
…handturner

Update compiler error 0093 to use new error format

Addresses rust-lang#35230, Part of the rust-lang#35233 meta bug

r? @jonathandturner
@eddyb
Copy link
Member

eddyb commented Aug 14, 2016

@bors r- failed on travis

@stanislav-tkach
Copy link
Contributor Author

Did something go wrong? Should I do something or just wait patiently?

@GuillaumeGomez
Copy link
Member

@eddyb: Travis didn't start correctly so I restarted it.
@DarkEld3r: Nothing to do (for the moment). Once travis has really run, we'll be able to see more.

@eddyb
Copy link
Member

eddyb commented Aug 17, 2016

@bors r=jonathandturner rollup

@bors
Copy link
Contributor

bors commented Aug 17, 2016

📌 Commit 127489a has been approved by jonathandturner

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

Update compiler error 0093 to use new error format

Addresses rust-lang#35230, Part of the rust-lang#35233 meta bug

r? @jonathandturner
bors added a commit that referenced this pull request Aug 18, 2016
Rollup of 12 pull requests

- Successful merges: #35346, #35734, #35739, #35740, #35742, #35744, #35749, #35750, #35751, #35756, #35766, #35768
- Failed merges:
@bors bors merged commit 127489a into rust-lang:master Aug 18, 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.

6 participants