Skip to content

Update version of clang format in CODING_STANDARDs #4196

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

Merged
merged 1 commit into from
Feb 16, 2019

Conversation

thk123
Copy link
Contributor

@thk123 thk123 commented Feb 15, 2019

Was saying 3.8, but CBMC moved to version 7 in #3245

  • Each commit message has a non-empty body, explaining why the change was made.
  • Methods or procedures I have added are documented, following the guidelines provided in CODING_STANDARD.md.
  • [n/a] The feature or user visible behaviour I have added or modified has been documented in the User Guide in doc/cprover-manual/
  • [n/a] Regression or unit tests are included, or existing tests cover the modified code (in this case I have detailed which ones those are in the commit message).
  • [n/a] My commit message includes data points confirming performance improvements (if claimed).
  • My PR is restricted to a single feature or bugfix.
  • White-space or formatting changes outside the feature-related changed lines are in commits of their own.

Spotted whilst looking for something else.

Copy link
Collaborator

@tautschnig tautschnig left a comment

Choose a reason for hiding this comment

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

(assuming squashing)

```
*Important:* If your branch is based on a branch other than `upstream/develop`,
use the name or checksum of that branch instead. It is strongly recommended to
rebase your work onto the tip of the branch it's based on before running
`git-clang-format` in this way.

Note: git-clang-format uses the git config variable `clangformat.binary` so if you
have multiple versions of clang-format installed, you might need to update this.
Copy link
Collaborator

Choose a reason for hiding this comment

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

"or explicitly specify the binary to use via --binary clang-format-7."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't know that!

Copy link
Collaborator

Choose a reason for hiding this comment

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

I didn't know about the clangformat.binary variable... ;-)

Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

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

✔️
Passed Diffblue compatibility checks (cbmc commit: c03e326).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/101102370

@tautschnig
Copy link
Collaborator

@thk123 Would you mind squashing the commits?

Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

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

✔️
Passed Diffblue compatibility checks (cbmc commit: 742d7f7).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/101103587

Was saying 3.8, but CBMC moved to version 7 in #3245

Fixup previous commit

fixup previous commit

add explanation about --binary
@thk123 thk123 force-pushed the update-clang-format-docs branch from ef6de2a to 4a005d9 Compare February 15, 2019 15:50
@thk123
Copy link
Contributor Author

thk123 commented Feb 15, 2019

@tautschnig done.

Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

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

🚫
This PR failed Diffblue compatibility checks (cbmc commit: ef6de2a).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/101107899
Status will be re-evaluated on next push.
Please contact @peterschrammel, @thk123, or @allredj for support.

Common spurious failures:

  • the cbmc commit has disappeared in the mean time (e.g. in a force-push)
  • the author is not in the list of contributors (e.g. first-time contributors).

The incompatibility may have been introduced by an earlier PR. In that case merging this
PR should be avoided unless it fixes the current incompatibility.

Copy link
Contributor

@allredj allredj left a comment

Choose a reason for hiding this comment

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

✔️
Passed Diffblue compatibility checks (cbmc commit: 4a005d9).
Build URL: https://travis-ci.com/diffblue/test-gen/builds/101152389

@kroening kroening merged commit a869788 into develop Feb 16, 2019
@kroening kroening deleted the update-clang-format-docs branch February 16, 2019 08:16
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