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

style-guide: Fix chain example to match rustfmt behavior #113385

Merged
merged 1 commit into from
Jul 12, 2023

Conversation

joshtriplett
Copy link
Member

The style guide gave an example of breaking a multi-line chain element
and all subsequent elements to a new line, but that same example and the
accompanying text also had several chain items stacked on the first
line. rustfmt doesn't do this, except when the rule saying to combine

shrt
    .y()

into

shrt.y()

applies.

This is a bugfix to match rustfmt behavior, so it's not a breaking change, and
it just needs a @rust-lang/style reviewer to r+.

The style guide gave an example of breaking a multi-line chain element
and all subsequent elements to a new line, but that same example and the
accompanying text also had several chain items stacked on the first
line. rustfmt doesn't do this, except when the rule saying to combine

```
shrt
    .y()
```

into

```
shrt.y()
```

applies.
@rustbot
Copy link
Collaborator

rustbot commented Jul 5, 2023

r? @yaahc

(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 Jul 5, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jul 5, 2023

Some changes occurred in src/doc/style-guide

cc @rust-lang/style

@calebcartwright
Copy link
Member

@bors r+ rollup

It was rust-lang/style-team#151 that I had in the back of my mind and just want to refresh my memory on the specifics of what we discussed back then

@bors
Copy link
Contributor

bors commented Jul 12, 2023

📌 Commit 24534cf has been approved by calebcartwright

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 12, 2023
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jul 12, 2023
…hains, r=calebcartwright

style-guide: Fix chain example to match rustfmt behavior

The style guide gave an example of breaking a multi-line chain element
and all subsequent elements to a new line, but that same example and the
accompanying text also had several chain items stacked on the first
line. rustfmt doesn't do this, except when the rule saying to combine

```
shrt
    .y()
```

into

```
shrt.y()
```

applies.

This is a bugfix to match rustfmt behavior, so it's not a breaking change, and
it just needs a `@rust-lang/style` reviewer to r+.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 12, 2023
…kingjubilee

Rollup of 5 pull requests

Successful merges:

 - rust-lang#113373 (various download-rustc fixes)
 - rust-lang#113385 (style-guide: Fix chain example to match rustfmt behavior)
 - rust-lang#113567 (While let suggestion will work for closure body)
 - rust-lang#113579 (Revert "fix: 🐛 etc/bash_complettion -> src/etc/... to avoid copy …)
 - rust-lang#113595 (Use constants from object crate)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3518041 into rust-lang:master Jul 12, 2023
11 checks passed
@rustbot rustbot added this to the 1.73.0 milestone Jul 12, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 1, 2023
…t, r=calebcartwright

style-guide: Document style editions, start 2024 style edition

Link to a snapshot for the 2015/2018/2021 style edition.

This is a draft, because I'd like to wait for a few style guide fixes to merge
before snapshotting the 2015/2018/2021 style edition:

- rust-lang#113145
- rust-lang#113380
- rust-lang#113384
- rust-lang#113385
- rust-lang#113386
- rust-lang#113392

I'd like to wait for these for two reasons: to make it easier to see the
differences between the 2015/2018/2021 style edition and the 2024 style
edition (without the noise of guide-wide changes), and to minimize confusion so
that bugfixes to the style guide that we include in the previous edition don't
look like they're only part of the 2024 style edition.

I've used "Miscellaneous `rustfmt` bugfixes" as a starting point for the list
of 2024 changes, for now. We can update that when we add more 2024 changes.

The section added in this PR can then serve as a baseline for our drafts of
2024 style edition changes.

In the meantime, I'd like to get someone from `@rust-lang/style` to review and
approve the text here; I'll update it with a commit hash when the above PRs
have merged.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

5 participants