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

LLVM 13 support #21

Merged
merged 6 commits into from
Oct 10, 2021
Merged

LLVM 13 support #21

merged 6 commits into from
Oct 10, 2021

Conversation

SamuelMarks
Copy link
Contributor

Closes #20

WiP I guess

…rMain.cpp,CodeStyleCheckerMain.cpp,LACommenterMain.cpp}] LLVM 13
@banach-space
Copy link
Owner

Many thanks for submitting this! I've left a few suggestions inline. We will also have to update the CI files. Would you be able to do that, pls?

-Andrzej

…, and Ninja; [.editorconfig] Init; [lib/CodeRefactor.cpp] Use `size_t` for array size index type; use .empty() for string size == 0 check
@SamuelMarks
Copy link
Contributor Author

Done. Where are the inline suggestions?

tools/CodeStyleCheckerMain.cpp Outdated Show resolved Hide resolved
tools/CodeStyleCheckerMain.cpp Outdated Show resolved Hide resolved
… use LLVM error stream; as per Expected docs (& as per new factory from https://reviews.llvm.org/D39042 that the CLI parser returns); [.gitignore] Ignore IDE and build dir
COMMAND chmod +x ninja
)
endif()
git clone git:https://github.com/martine/ninja.git
Copy link
Owner

@banach-space banach-space Oct 9, 2021

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ohhh the guide still hasn't taken in my patch? - https://clang.llvm.org/docs/HowToSetupToolingForLLVM.html#using-ninja-build-system to https://reviews.llvm.org/D98594 - let me send them a new patch to include the ninja-build org

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Owner

@banach-space banach-space left a comment

Choose a reason for hiding this comment

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

Looking really good, thanks!

  1. Is .editorconfig a VS Code config file? Was it added by accident?

  2. There are a few unrelated changes here, i.e. changes that are not required for the switch to LLVM 13. My personal preference would be to move them to a dedicated patch. But I don't want to create extra work for you. Instead, could you add a note in the commit message that summarises the additional improvements? This way the git history will make it clear that this was intentional. Otherwise, it's unrelated and confusing.

  3. Btw, most of these "unrelated changes" make a lot of sense - thanks for the improvements!

Before merging, I suggest that you squash all your changes and force push to your branch. Basically, I try to stick to one commit per PR and no merge-commits. Just to keep the history simple. I could squash your commits in the GitHub UI myself, but I think that it's nicer if you are in full control of the commit message.

@SamuelMarks
Copy link
Contributor Author

  1. .editorconfig is an IDE/editor independent format. I noticed your two spaces causing problems with my IDE by default.
  2. I can update the commit message on squash, but as you say you can squash from your GitHub UI interface (which I'm fine with)
  3. Happy to help :)

@banach-space
Copy link
Owner

banach-space commented Oct 9, 2021

  1. Would .clang-format work for you as well? That would be my preferred format.

@SamuelMarks
Copy link
Contributor Author

@banach-space Sure I don't care, as long as it's a format that IDEs and editors recognise (and it is).

@banach-space
Copy link
Owner

LGTM, let's merge this! Shall I squash this with the web UI? Or do you prefer to do it yourself?

@SamuelMarks
Copy link
Contributor Author

Great, merge away

(squash in web UI is fine)

@banach-space banach-space merged commit 4a95f18 into banach-space:main Oct 10, 2021
banach-space added a commit that referenced this pull request Oct 12, 2021
After #21, the following
is no longer correct nor required:

```CMake
-D CMAKE_MAKE_PROGRAM=$GITHUB_WORKSPACE/ninja
```
banach-space added a commit that referenced this pull request Oct 12, 2021
After #21, the following
is no longer correct nor required:

```CMake
-D CMAKE_MAKE_PROGRAM=$GITHUB_WORKSPACE/ninja
```
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.

LLVM 13
2 participants