Rust-GCC
Remove system include in `gcc/rust/typecheck/rust-hir-type-check.h`
@SIGMazer thanks for the PR :D the changelog in your second commit message needs to appear in the first one too - each commit should contain such a changelog entry. I would suggest squashing them together as one commit
@SIGMazer do you need help fixing the failing CI steps? @CohenArthur I fixed the clang format but now if i resolve the conflict with github it will create a commit without change log. any help with that?
@SIGMazer the best thing would be to resolve the conflict outside of github, with the tool you use for git (git command line or gitgui, or maybe gitkraken etc). you should "fetch" the upstream master branch, and rebase your branch on that - this will create a conflict, which you can solve. then you'll finish your rebase and your commit will have the right changelog and won't have any conflicts. Checkout the first answer here: https://stackoverflow.com/questions/7244321/how-do-i-update-or-sync-a-forked-repository-on-github
@SIGMazer Could you please add the changes to the changelog in your commit message ?
@P-E-P changelog is already in the commit message.
Yes but it is empty. The commiter is supposed to fill the changelog lines with the changes applied to the mentioned file. In your case you may simply repeat what you wrote earlier:
Remove system include in gcc/rust/typecheck/rust-hir-type-check.h
gcc/rust/ChangeLog:
* rust-system.h: Remove system include.
Signed-off-by: SIGMazer <[email protected]>
I know this seems kinda useless and even repetitive on a small commit like this but changelogs are processed later in a changelog file independently from their commit.
On a side note the commit message does not seems to match the commit content ? You're mentioning gcc/rust/typecheck/rust-hir-type-check.h but 49721d21864fc41e47c83d8de25084646710cfad does not modify it. It does not even remove something but add <stack>. You may have deleted some content whilst rebasing ?
@P-E-P changelog is already in the commit message.
Yes but it is empty. The commiter is supposed to fill the changelog lines with the changes applied to the mentioned file. In your case you may simply repeat what you wrote earlier:
Remove system include in gcc/rust/typecheck/rust-hir-type-check.h gcc/rust/ChangeLog: * rust-system.h: Remove system include. Signed-off-by: SIGMazer <[email protected]>I know this seems kinda useless and even repetitive on a small commit like this but changelogs are processed later in a changelog file independently from their commit.
On a side note the commit message does not seems to match the commit content ? You're mentioning
gcc/rust/typecheck/rust-hir-type-check.hbut 49721d2 does not modify it. It does not even remove something but add<stack>. You may have deleted some content whilst rebasing ?
At the first i've deleted gcc/rust/typecheck/rust-hir-type-check.h but it modified after resolve conflict