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

Fix #54, Remove unnecessary parentheses around return values. #55

Merged
merged 1 commit into from
Feb 26, 2024

Conversation

thnkslprpt
Copy link
Contributor

@thnkslprpt thnkslprpt commented Sep 27, 2022

Checklist (Please check before submitting)

Describe the contribution

This aligns these return statements with the predominant style of cFS.

Testing performed
None, prior to submission of the pull request.

Expected behavior changes
No impact on behavior.

Contributor Info - All information REQUIRED for consideration of pull request
@thnkslprpt

@dzbaker
Copy link
Contributor

dzbaker commented Oct 3, 2022

@thnkslprpt Would you be able to resolve the conflicts?

@thnkslprpt thnkslprpt force-pushed the fix-54-return-parentheses branch from d20e209 to 89ede56 Compare October 4, 2022 01:05
@thnkslprpt
Copy link
Contributor Author

@thnkslprpt Would you be able to resolve the conflicts?

I think it's resolved now.
I added another commit to fix the rest of the cases (of parentheses around return values) that were introduced after the merge conflict resolution.
Should I squash those commits together now?

@dzbaker
Copy link
Contributor

dzbaker commented Oct 6, 2022

@thnkslprpt Would you be able to resolve the conflicts?

I think it's resolved now. I added another commit to fix the rest of the cases (of parentheses around return values) that were introduced after the merge conflict resolution. Should I squash those commits together now?

Thanks! That would be good. I'll add this to the CCB agenda for today just so everyone can take a quick look since the scope increased a bit.

@dzbaker
Copy link
Contributor

dzbaker commented Oct 6, 2022

@thnkslprpt CCB 6 October 2022: Approved pending resolution of failed workflow checks.

@thnkslprpt thnkslprpt force-pushed the fix-54-return-parentheses branch 4 times, most recently from 05fe61a to dff2807 Compare October 14, 2022 02:07
@dzbaker
Copy link
Contributor

dzbaker commented Oct 19, 2022

@thnkslprpt Would you be able to squash together the commits (so the commit message check passes)?

@thnkslprpt
Copy link
Contributor Author

@thnkslprpt Would you be able to squash together the commits (so the commit message check passes)?

Hi @dzbaker - I may need a bit of a hand with that...
I tried a few times but just ended up tying myself in knots.
image

@dzbaker
Copy link
Contributor

dzbaker commented Oct 20, 2022

@thnkslprpt Would you be able to squash together the commits (so the commit message check passes)?

Hi @dzbaker - I may need a bit of a hand with that... I tried a few times but just ended up tying myself in knots. image

@thnkslprpt Hmm, that's odd. Are you able to change the commit message for the merge commit (using "git commit --amend") instead?

@thnkslprpt thnkslprpt force-pushed the fix-54-return-parentheses branch from f3360c2 to 8d84f21 Compare October 21, 2022 03:05
@thnkslprpt
Copy link
Contributor Author

@thnkslprpt Hmm, that's odd. Are you able to change the commit message for the merge commit (using "git commit --amend") instead?

I couldn't get it working in the original local git repository I used for these changes, but by opening a clean folder and cloning it in again, git finally let me amend the commit message of the merge commit. Still didn't let me squash them together, though...

@thnkslprpt
Copy link
Contributor Author

thnkslprpt commented Mar 3, 2023

With the help of @skliper I was finally able to squash these 3 commits incl. the merge resolution into 1 clean commit.

@thnkslprpt thnkslprpt force-pushed the fix-54-return-parentheses branch 5 times, most recently from 15bdb0b to 111b861 Compare March 14, 2023 07:54
@thnkslprpt thnkslprpt force-pushed the fix-54-return-parentheses branch from 111b861 to 838dbd1 Compare July 12, 2023 21:22
@thnkslprpt thnkslprpt force-pushed the fix-54-return-parentheses branch from 838dbd1 to e124beb Compare October 26, 2023 12:29
@jphickey jphickey force-pushed the fix-54-return-parentheses branch from e124beb to faf21ec Compare February 26, 2024 15:32
@dzbaker dzbaker merged commit 1805d10 into nasa:main Feb 26, 2024
17 checks passed
@thnkslprpt thnkslprpt deleted the fix-54-return-parentheses branch February 27, 2024 07:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Scrub use of () in return statements
3 participants