Skip to content

[Merged by Bors] - chore: script to replace headers with #align_import statements#5979

Closed
kim-em wants to merge 16 commits intomasterfrom
align-import
Closed

[Merged by Bors] - chore: script to replace headers with #align_import statements#5979
kim-em wants to merge 16 commits intomasterfrom
align-import

Conversation

@kim-em
Copy link
Copy Markdown
Contributor

@kim-em kim-em commented Jul 18, 2023

@ghost ghost added blocked-by-other-PR This PR depends on another PR (this label is automatically managed by a bot) merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) and removed blocked-by-other-PR This PR depends on another PR (this label is automatically managed by a bot) labels Jul 18, 2023
@ghost
Copy link
Copy Markdown

ghost commented Jul 18, 2023

This PR/issue depends on:

@kim-em kim-em added awaiting-review awaiting-CI This PR does not pass CI yet. This label is automatically removed once it does. labels Jul 18, 2023
@kim-em kim-em requested a review from eric-wieser July 18, 2023 11:22
@ghost ghost removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label Jul 18, 2023
@ghost ghost added the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label Jul 18, 2023
Comment on lines +1 to +4
#!/usr/bin/env python3

# This script was written by ChatGPT.
# https://chat.openai.com/share/e0363ebf-ed6f-4fd8-9b76-ebf422ed9f62
Copy link
Copy Markdown
Member

@eric-wieser eric-wieser Jul 19, 2023

Choose a reason for hiding this comment

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

This should include a doc-comment along the lines of:

"""
This script was used in #5979 to convert from one header format to another.

It can be safely deleted in a few weeks.
"""

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Or we could just delete it and not ever commit it; it's only use is being in the history for this PR, really.

Copy link
Copy Markdown
Member

@eric-wieser eric-wieser left a comment

Choose a reason for hiding this comment

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

bors d+

Some downstream stuff will break, and I won't be fixing it for at least 8 hours.

Merging in 6 hours or so is probably a good compromise, since it might take some time to propagate anyway.

@bors
Copy link
Copy Markdown

bors bot commented Jul 19, 2023

✌️ semorrison can now approve this pull request. To approve and merge a pull request, simply reply with bors r+. More detailed instructions are available here.

@ghost ghost added delegated This pull request has been delegated to the PR author (or occasionally another non-maintainer). and removed awaiting-review merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) labels Jul 19, 2023
@github-actions github-actions bot removed the awaiting-CI This PR does not pass CI yet. This label is automatically removed once it does. label Jul 19, 2023
@jcommelin
Copy link
Copy Markdown
Member

Thanks 🎉

bors merge

@github-actions github-actions bot added the ready-to-merge This PR has been sent to bors. label Jul 19, 2023
bors bot pushed a commit that referenced this pull request Jul 19, 2023
- [x] depends on: #5966

[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/from-referrer/)


Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
@bors
Copy link
Copy Markdown

bors bot commented Jul 19, 2023

Pull request successfully merged into master.

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@bors bors bot changed the title chore: script to replace headers with #align_import statements [Merged by Bors] - chore: script to replace headers with #align_import statements Jul 19, 2023
@bors bors bot closed this Jul 19, 2023
@bors bors bot deleted the align-import branch July 19, 2023 10:08
kim-em added a commit that referenced this pull request Aug 14, 2023
- [x] depends on: #5966

[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/from-referrer/)


Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

delegated This pull request has been delegated to the PR author (or occasionally another non-maintainer). ready-to-merge This PR has been sent to bors.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants