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.

Sign up for GitHub

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

Jump to bottom

zig fmt fixes #6293

Merged
merged 11 commits into from
Sep 27, 2020
Merged

zig fmt fixes #6293

merged 11 commits into from
Sep 27, 2020

Conversation

LakeByTheWoods
Copy link
Contributor

This closes a bunch of fmt issues
I think the changes are at least justifiable, but am happy to revert things upon getting other's opinions.

@LemonBoy
Copy link
Contributor

LemonBoy commented Sep 9, 2020

If you want to close one more ticket related to zig fmt there's #6171 too

@andrewrk
Copy link
Member

Nice work! I'm going to back out ed24adb before merging just so that it doesn't cause unnecessary conflicts with several of the open stage2 PRs: #6291 #6255 #6250 #6295
We can run zig fmt on these directories at a strategic moment when there is not a bunch of open PRs in those directories.

andrewrk
andrewrk requested changes Sep 10, 2020
View reviewed changes
lib/std/build.zig Outdated Show resolved Hide resolved
test/stage2/zir.zig Outdated Show resolved Hide resolved
@LakeByTheWoods
Copy link
Contributor Author

I'm going to back out ed24adb

By all means do, that was mostly to show changes in context. Would you like me to push a revert commit, or drop it in a rebase, or is it easier for you to handle it when pulling?

@andrewrk
Copy link
Member

By all means do, that was mostly to show changes in context. Would you like me to push a revert commit, or drop it in a rebase, or is it easier for you to handle it when pulling?

If you don't mind dropping it in a rebase, that will be easiest for me so that I can give this one more lookover and then SLAP that big green button.

@LakeByTheWoods
Copy link
Contributor Author

Hmm, I'm not sure why the Mac build failed...

@andrewrk
Copy link
Member

Looks like an operational issue with Azure, not anything on your end. Thanks for the ping - I'll take one final look and then hit that phat merge button

@andrewrk andrewrk merged commit 8794ce6 into ziglang:master Sep 27, 2020
@andrewrk andrewrk mentioned this pull request Sep 27, 2020
Merged
@LakeByTheWoods LakeByTheWoods deleted the fmt_fixes branch October 1, 2020 22:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewrk andrewrk Awaiting requested review from andrewrk

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@LakeByTheWoods @LemonBoy @andrewrk