Skip to content

style-guide: Add chapter about formatting for nightly-only syntax#111119

Merged
bors merged 2 commits intorust-lang:masterfrom
compiler-errors:style-nightly
Jul 6, 2023
Merged

style-guide: Add chapter about formatting for nightly-only syntax#111119
bors merged 2 commits intorust-lang:masterfrom
compiler-errors:style-nightly

Conversation

@compiler-errors
Copy link
Contributor

@compiler-errors compiler-errors commented May 3, 2023

cc @rust-lang/style

nightly policy mentioned below is being proposed in rust-lang/style-team#180

@rustbot
Copy link
Collaborator

rustbot commented May 3, 2023

r? @calebcartwright

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-style Relevant to the style team, which will review and decide on the PR/issue. labels May 3, 2023
@rustbot
Copy link
Collaborator

rustbot commented May 3, 2023

Some changes occurred in src/doc/style-guide

cc @rust-lang/style

@compiler-errors compiler-errors mentioned this pull request Jun 19, 2023
Merged
@compiler-errors
Copy link
Contributor Author

compiler-errors commented Jun 19, 2023

opening an FCP to merge this and rust-lang/style-team#180.

@rfcbot fcp merge

@rfcbot
Copy link

rfcbot commented Jun 19, 2023 •
edited
Loading

Team member @compiler-errors has proposed to merge this. The next step is review by the rest of the tagged team members:

Concerns:

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

@rfcbot rfcbot added proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. labels Jun 19, 2023
@compiler-errors
Copy link
Contributor Author

compiler-errors commented Jun 19, 2023

@rfcbot concern all-boxes-should-be-checked

@joshtriplett
Copy link
Member

joshtriplett commented Jun 21, 2023 •
edited
Loading

👍 for documenting current practice. I'm not sure how this aligns with us actually documenting nightly style somewhere, though. https://github.com/rust-lang/style-team/pull/180/files says "The style guide may or may not prescribe formatting behavior for nightly syntax".

compiler-errors
compiler-errors commented Jun 21, 2023
View reviewed changes
joshtriplett
joshtriplett reviewed Jun 21, 2023
View reviewed changes
@joshtriplett
Copy link
Member

joshtriplett commented Jun 21, 2023

@rfcbot concern wait-for-revised-text

@compiler-errors is currently overhauling this text; would like to wait to read the new version.

@joshtriplett
Copy link
Member

joshtriplett commented Jun 22, 2023

@rfcbot resolved wait-for-revised-text
@rfcbot reviewed

@joshtriplett joshtriplett changed the title Clarify that style guide does not cover nightly-only features style-guide: Add chapter about formatting for nightly-only syntax Jun 22, 2023
@compiler-errors
Copy link
Contributor Author

compiler-errors commented Jun 22, 2023

@rfcbot resolve all-boxes-should-be-checked

@rfcbot rfcbot added the final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. label Jun 22, 2023
@rfcbot
Copy link

rfcbot commented Jun 22, 2023

🔔 This is now entering its final comment period, as per the review above. 🔔

@rfcbot rfcbot removed the proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. label Jun 22, 2023
@bors
Copy link
Collaborator

bors commented Jun 23, 2023

☔ The latest upstream changes (presumably #112957) made this pull request unmergeable. Please resolve the merge conflicts.

@calebcartwright calebcartwright mentioned this pull request Jun 24, 2023
Closed
@rfcbot rfcbot added finished-final-comment-period The final comment period is finished for this PR / Issue. to-announce Announce this issue on triage meeting and removed final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. labels Jul 2, 2023
@rfcbot
Copy link

rfcbot commented Jul 2, 2023

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

This will be merged soon.

@compiler-errors
Copy link
Contributor Author

compiler-errors commented Jul 5, 2023

I think we can merge this since the FCP is over. Anyone got a spare r+?

@bors rollup

@joshtriplett
Copy link
Member

joshtriplett commented Jul 5, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 5, 2023

📌 Commit 5957f02 has been approved by joshtriplett

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 5, 2023
@fee1-dead fee1-dead mentioned this pull request Jul 6, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 6, 2023
@bors
Auto merge of rust-lang#113391 - fee1-dead-contrib:rollup-9bqlw9z, r=…
0d50ab7 
…fee1-dead

Rollup of 9 pull requests

Successful merges:

 - rust-lang#111119 (style-guide: Add chapter about formatting for nightly-only syntax)
 - rust-lang#112791 (llvm ffi: Expose `CallInst->setTailCallKind`)
 - rust-lang#113145 (style-guide: Document newline rules for assignment operators)
 - rust-lang#113163 (Add a regression test for rust-lang#112895)
 - rust-lang#113332 (resolve: Use `Interned` for some interned structures)
 - rust-lang#113334 (Revert the lexing of `c"…"` string literals)
 - rust-lang#113350 (Fix the issue of wrong diagnosis for extern pub fn)
 - rust-lang#113371 (Fix submodule handling when the current branch is named after a tag)
 - rust-lang#113384 (style-guide: Clarify grammar for small patterns (not a semantic change))

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6e9bdac into rust-lang:master Jul 6, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jul 6, 2023
@bors
Copy link
Collaborator

bors commented Jul 6, 2023

⌛ Testing commit 5957f02 with merge 0d50ab7...

@apiraino apiraino removed the to-announce Announce this issue on triage meeting label Jul 6, 2023
@compiler-errors compiler-errors deleted the style-nightly branch August 11, 2023 20:20
@traviscross traviscross mentioned this pull request Apr 1, 2025
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@joshtriplett joshtriplett joshtriplett left review comments

@calebcartwright calebcartwright calebcartwright approved these changes

Assignees

@calebcartwright calebcartwright

Labels

disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. finished-final-comment-period The final comment period is finished for this PR / Issue. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-style Relevant to the style team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

7 participants

@compiler-errors @rustbot @rfcbot @joshtriplett @bors @calebcartwright @apiraino