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

Restyle [format] Manually correct code style of examples. #419

Closed
wants to merge 4 commits into from

Conversation

restyled-io[bot]
Copy link
Contributor

@restyled-io restyled-io bot commented Apr 17, 2020

A duplicate of #418 with additional commits that automatically address
incorrect style, created by Restyled.

Since the original Pull Request was opened as a fork in a contributor's
repository, we are unable to create a Pull Request branching from it with only
the style fixes.

The following Restylers made fixes:

  • astyle
  • clang-format
  • whitespace

To incorporate these changes, you can either:

  1. Merge this Pull Request instead of the original, or

  2. Ask your contributor to locally incorporate these commits and push them to
    the original Pull Request

    Expand for example instructions
    ```console
    git remote add upstream https://github.com/project-chip/connectedhomeip.git
    git fetch upstream pull/<this PR number>/head
    git merge --ff-only FETCH_HEAD
    git push
    ```
    

NOTE: As work continues on the original Pull Request, this process will
re-run and update (force-push) this Pull Request with updated style fixes as
necessary. If the style is fixed manually at any point (i.e. this process finds
no fixes to make), this Pull Request will be closed automatically.

Sorry if this was unexpected. To disable it, see our documentation.

*
******************************************************************************/
/***************************************************************************/ /**
* @file

Choose a reason for hiding this comment

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

is this correct?

Copy link
Contributor

Choose a reason for hiding this comment

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

Upstream needs to rebase, as well as fix the clang-format. Restyled is just doing what it’s told.

Copy link
Contributor

@woody-apple woody-apple Apr 17, 2020

Choose a reason for hiding this comment

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

Meaning, there’s another styler editor in there too, it might also be confusing it

@restyled-io restyled-io bot force-pushed the restyled/pull-418 branch from fa9851b to 1fb0970 Compare April 17, 2020 20:43
Copy link

@jelderton jelderton left a comment

Choose a reason for hiding this comment

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

Should we hold off on completing this until the other changes are in place?

@woody-apple
Copy link
Contributor

Should we hold off on completing this until the other changes are in place?

Yeah, no need to approve this. Once the requests from restyled are in, as well as the rebase, this PR will auto close.

@restyled-io restyled-io bot closed this Apr 17, 2020
@rwalker-apple rwalker-apple deleted the restyled/pull-418 branch April 24, 2020 03:12
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