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

Remove system include in gcc/rust/typecheck/rust-hir-type-check.h #2924

Merged

Conversation

SIGMazer
Copy link
Contributor

issue #2920

move system include to rust-system.h

#include <stack>

@SIGMazer SIGMazer force-pushed the issue-2920-rust-hir-type-check-include branch 2 times, most recently from 4535df2 to cef07b5 Compare March 23, 2024 18:17
@CohenArthur
Copy link
Member

@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 SIGMazer force-pushed the issue-2920-rust-hir-type-check-include branch from 05472d4 to f752320 Compare March 27, 2024 16:50
@CohenArthur
Copy link
Member

@SIGMazer do you need help fixing the failing CI steps?

@SIGMazer SIGMazer force-pushed the issue-2920-rust-hir-type-check-include branch 2 times, most recently from 0915824 to 6e38f55 Compare April 23, 2024 11:30
@SIGMazer
Copy link
Contributor Author

@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?

@CohenArthur
Copy link
Member

@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 SIGMazer force-pushed the issue-2920-rust-hir-type-check-include branch 2 times, most recently from 479078c to 49721d2 Compare April 23, 2024 15:41
@P-E-P P-E-P requested a review from CohenArthur May 6, 2024 12:34
@P-E-P
Copy link
Member

P-E-P commented May 21, 2024

@SIGMazer Could you please add the changes to the changelog in your commit message ?

@SIGMazer
Copy link
Contributor Author

@P-E-P changelog is already in the commit message.
image

@P-E-P
Copy link
Member

P-E-P commented May 21, 2024

@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 <mazinasd7@gmail.com>

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 49721d2 does not modify it. It does not even remove something but add <stack>. You may have deleted some content whilst rebasing ?

@SIGMazer
Copy link
Contributor Author

@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 <mazinasd7@gmail.com>

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 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 form gcc/rust/typecheck/rust-hir-type-check.h but it modified after resolve conflict

@SIGMazer SIGMazer force-pushed the issue-2920-rust-hir-type-check-include branch from 49721d2 to cfdea3b Compare May 21, 2024 11:47
gcc/rust/ChangeLog:

	* rust-system.h: Add system include <stack>

Signed-off-by: SIGMazer <mazinasd7@gmail.com>
@SIGMazer SIGMazer force-pushed the issue-2920-rust-hir-type-check-include branch from cfdea3b to 91842a8 Compare May 21, 2024 11:47
@SIGMazer
Copy link
Contributor Author

SIGMazer commented May 21, 2024

@P-E-P I edited the commit message and added change log

Copy link
Member

@P-E-P P-E-P left a comment

Choose a reason for hiding this comment

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

Thank you!

@P-E-P P-E-P enabled auto-merge May 21, 2024 11:56
@P-E-P P-E-P added this pull request to the merge queue May 21, 2024
Merged via the queue into Rust-GCC:master with commit 219cea7 May 21, 2024
9 checks passed
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.

None yet

3 participants