Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

style-guide: When breaking binops handle multi-line first operand better #119838

Merged
merged 3 commits into from
May 14, 2024
Merged

style-guide: When breaking binops handle multi-line first operand better #119838

merged 3 commits into from
May 14, 2024

Conversation

joshtriplett
Copy link
Member

Use the indentation of the last line of the first operand, not the first.

Fixes rust-lang/style-team#189

@rustbot
Copy link
Collaborator

rustbot commented Jan 11, 2024

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 Jan 11, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jan 11, 2024

Some changes occurred in src/doc/style-guide

cc @rust-lang/style

@joshtriplett
Copy link
Member Author

This is @compiler-errors' suggested change from today's @rust-lang/style meeting.

Checking that we have consensus:

@rfcbot merge

@rfcbot
Copy link

rfcbot commented Jan 11, 2024 •
edited by calebcartwright
Loading

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

No concerns currently listed.

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 Jan 11, 2024
@calebcartwright
Copy link
Member

cc @rust-lang/rustfmt for awareness

@rfcbot rfcbot added final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. and removed proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. labels Jan 24, 2024
@rfcbot
Copy link

rfcbot commented Jan 24, 2024

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

@bors
Copy link
Contributor

bors commented Jan 24, 2024

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

@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 Feb 3, 2024
@rfcbot
Copy link

rfcbot commented Feb 3, 2024

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
compiler-errors approved these changes Feb 5, 2024
View reviewed changes
Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

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

r=me when rebased

@compiler-errors compiler-errors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 5, 2024
@apiraino apiraino removed the to-announce Announce this issue on triage meeting label Feb 8, 2024
joshtriplett and others added 3 commits May 14, 2024 06:00
@joshtriplett
style-guide: When breaking binops handle multi-line first operand better
57c32a1 
Use the indentation of the *last* line of the first operand, not the first.

Fixes rust-lang/style-team#189
@joshtriplett @calebcartwright
Fix missing word
e2d9c0d 
Co-authored-by: Caleb Cartwright <calebcartwright@users.noreply.github.com>
@joshtriplett @calebcartwright
Wording improvement
e098eb1 
Co-authored-by: Caleb Cartwright <calebcartwright@users.noreply.github.com>
@joshtriplett joshtriplett force-pushed the style-guide-binop-indent branch from a382dc0 to e098eb1 Compare May 14, 2024 04:00
@joshtriplett
Copy link
Member Author

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented May 14, 2024

📌 Commit e098eb1 has been approved by compiler-errors

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 14, 2024
@joshtriplett
Copy link
Member Author

@bors rollup

@compiler-errors compiler-errors mentioned this pull request May 14, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 14, 2024
@bors
Auto merge of rust-lang#125120 - compiler-errors:rollup-mnjybwv, r=co…
ac385a5 
…mpiler-errors

Rollup of 7 pull requests

Successful merges:

 - rust-lang#119838 (style-guide: When breaking binops handle multi-line first operand better)
 - rust-lang#124844 (Use a proper probe for shadowing impl)
 - rust-lang#125047 (Migrate `run-make/issue-14500` to new `rmake.rs` format)
 - rust-lang#125080 (only find segs chain for missing methods when no available candidates)
 - rust-lang#125088 (Uplift `AliasTy` and `AliasTerm`)
 - rust-lang#125100 (Don't do post-method-probe error reporting steps if we're in a suggestion)
 - rust-lang#125118 (Use new utility functions/methods in run-make tests)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3628783 into rust-lang:master May 14, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 14, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 14, 2024
@rust-timer
Unrolled build for rust-lang#119838
2cfdb84 
Rollup merge of rust-lang#119838 - joshtriplett:style-guide-binop-indent, r=compiler-errors

style-guide: When breaking binops handle multi-line first operand better

Use the indentation of the *last* line of the first operand, not the first.

Fixes rust-lang/style-team#189
@joshtriplett joshtriplett deleted the style-guide-binop-indent branch May 14, 2024 20:26
celinval pushed a commit to celinval/rust-dev that referenced this pull request Jun 4, 2024
@github-actions @tautschnig
Automatic toolchain upgrade to nightly-2024-05-15 (rust-lang#3185)
33b7d85 
Update Rust toolchain from nightly-2024-05-14 to nightly-2024-05-15
without any other source changes.
This is an automatically generated pull request. If any of the CI checks
fail, manual intervention is required. In such a case, review the
changes at https://github.com/rust-lang/rust from
rust-lang@ab14f94
up to
rust-lang@8387315.
The log for this commit range is:
rust-lang@8387315ab3 Auto merge of
rust-lang#125125 - lovesegfault:opt-dist-specify-rustc-perf, r=Mark-Simulacrum
rust-lang@c3c9783de2
feat(tools/opt-dist): allow local builds to specify a rustc-perf
checkout
rust-lang@ac385a5af6 Auto merge of
rust-lang#125120 - compiler-errors:rollup-mnjybwv, r=compiler-errors
rust-lang@31016d5879 Rollup merge of
rust-lang#125118 - GuillaumeGomez:cleanup-run-make, r=jieyouxu
rust-lang@d59f430eec Rollup merge of
rust-lang#125100 - compiler-errors:faster, r=nnethercote
rust-lang@712e7c37f7 Rollup merge of
rust-lang#125088 - compiler-errors:uplift-alias-ty, r=lcnr
rust-lang@8c64acdbdc Rollup merge of
rust-lang#125080 - bvanjoi:fix-124946, r=nnethercote
rust-lang@844c7e826e Rollup merge of
rust-lang#125047 - Oneirical:test5, r=jieyouxu
rust-lang@0458d8a53b Rollup merge of
rust-lang#124844 - compiler-errors:shadow-probe, r=lcnr
rust-lang@36287830a2 Rollup merge of
rust-lang#119838 - joshtriplett:style-guide-binop-indent, r=compiler-errors
rust-lang@ade33b02f2 only find segs chain
for missing methods when no available candidates
rust-lang@bdfd941f4d Auto merge of
rust-lang#123816 - tgross35:f16-f128-mangling, r=michaelwoerister
rust-lang@f97d915173 Use new utility
functions/methods in run-make tests
rust-lang@792a9bdd4b Enable v0 mangling
tests and add checks for `f16`/`f128`
rust-lang@809b84edba Add v0 symbol
mangling for `f16` and `f128`
rust-lang@31026b7fe3 Auto merge of
rust-lang#125023 - morr0ne:linux-none-target, r=Nilstrieb
rust-lang@68407f9049 fix typo in
x86_64-unknown-linux-none docs
rust-lang@c45e831d8f Auto merge of
rust-lang#124228 - compiler-errors:lint-overcaptures, r=oli-obk
rust-lang@58426f4a5b Auto merge of
rust-lang#125026 - Oneirical:clink-tests, r=jieyouxu
rust-lang@e098eb14ae Wording improvement
rust-lang@e2d9c0d938 Fix missing word
rust-lang@57c32a193f style-guide: When
breaking binops handle multi-line first operand better
rust-lang@dbd2ca6478 Use a proper probe
for shadowing impl
rust-lang@052de1da4f And finally add
tests
rust-lang@1529c661e4 Warn against
redundant use<...>
rust-lang@f3fb727b08 Don't suggest using
use<> syntax to capture APITs
rust-lang@6afe1352d9 Suggest adding use<>
syntax
rust-lang@554becc180 Add some commenting
rust-lang@d57e57ca1f Implement initial
IMPL_TRAIT_OVERCAPTURES lint
rust-lang@8f97a2588c Add test to make
sure suggestions are still quick
rust-lang@fba5f44bd8 Auto merge of
rust-lang#125098 - jhpratt:rollup-2qm4gga, r=jhpratt
rust-lang@45b50d303c lto function,
static_library call, rename
rust-lang@9f8cdb286e Remove to_term
rust-lang@1ad28a6f53 Uplift AliasTy
rust-lang@812f89728a fix fmt
rust-lang@2e4c90c3f7 Don't do
post-method-probe error reporting steps if we're in a suggestion
rust-lang@32d74f1800 Rollup merge of
rust-lang#125090 - erickt:bump-fuchsia, r=tmandry
rust-lang@209703af85 Rollup merge of
rust-lang#125072 - Darksonn:pin-dyn-dispatch-sound, r=jhpratt
rust-lang@18d9c039bb Rollup merge of
rust-lang#124997 - gurry:124848-ice-should-be-sized, r=Nadrieril
rust-lang@74a78af0e2 Rollup merge of
rust-lang#116675 - joshlf:patch-10, r=scottmcm
rust-lang@9105c57b7f Auto merge of
rust-lang#124256 - nnethercote:rm-NtIdent-NtLifetime, r=petrochenkov
rust-lang@34582118af Auto merge of
rust-lang#125076 - compiler-errors:alias-term, r=lcnr
rust-lang@95e519ecbf Remove `NtIdent` and
`NtLifetime`.
rust-lang@fa84018c2e Apply nits
rust-lang@58ee9192e0 Migrate fuchsia docs
from `pm` to `ffx`
rust-lang@293b5cb1ca [ptr] Document
maximum allocation size
rust-lang@3bcdf3058e split out AliasTy ->
AliasTerm
rust-lang@b3a78c1d09 Add test for dynamic
dispatch + Pin::new soundness
rust-lang@9a63a42cb7 Remove a `Span` from
`TokenKind::Interpolated`.
rust-lang@71fd2cf5b4 fix function call
and import
rust-lang@a1b5ea0cc2 make tidy happy
rust-lang@f2de5fb2ae rewrite issue-14500
to rmake
rust-lang@a6f237ca85 docs: fix typo in
platform-support docs
rust-lang@923cdb35aa test: Add assembly
tests for x86_64-unknown-linux-none target
rust-lang@10c358f111 Make tidy happy
rust-lang@e37d2989c1 remove trailing
whitespace
rust-lang@a2e7e79a13 Port
c-link-to-rust-va-list-fn to Rust
rust-lang@9cf080099d docs: Document
x86_64-unknown-linux-none target
rust-lang@a3ef01b1fc Add
x86_64-unknown-linux-none target
rust-lang@fb619ec208 FIx ICE while
casting a type with error

Co-authored-by: tautschnig <1144736+tautschnig@users.noreply.github.com>
This was referenced Oct 30, 2024
Closed
Closed
ehuss added a commit to ehuss/rust that referenced this pull request Dec 31, 2024
@ehuss
Revert "Rollup merge of rust-lang#119838 - joshtriplett:style-guide-b…
7a46c7b 
…inop-indent, r=compiler-errors"

This reverts commit 3628783, reversing
changes made to 31026b7.
@ehuss ehuss mentioned this pull request Dec 31, 2024
Merged
Noratrieb added a commit to Noratrieb/rust that referenced this pull request Dec 31, 2024
@Noratrieb
Rollup merge of rust-lang#134975 - ehuss:revert-style-guide-rhs-break…
37d0d1d 
…, r=compiler-errors

Revert style guide rhs break

This reverts rust-lang#132369 and rust-lang#119838. The style-guide change for indentation of rhs was not implemented in time for the 2024 style edition.
See tracking issue rust-lang#132380.

cc rust-lang#134974 for the other style guide change in 2024.

r? `@compiler-errors`
tgross35 added a commit to tgross35/rust that referenced this pull request Dec 31, 2024
@tgross35
Rollup merge of rust-lang#134975 - ehuss:revert-style-guide-rhs-break…
9472d32 
…, r=compiler-errors

Revert style guide rhs break

This reverts rust-lang#132369 and rust-lang#119838. The style-guide change for indentation of rhs was not implemented in time for the 2024 style edition.
See tracking issue rust-lang#132380.

cc rust-lang#134974 for the other style guide change in 2024.

r? ``@compiler-errors``
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 1, 2025
@rust-timer
Unrolled build for rust-lang#134975
49e97f2 
Rollup merge of rust-lang#134975 - ehuss:revert-style-guide-rhs-break, r=compiler-errors

Revert style guide rhs break

This reverts rust-lang#132369 and rust-lang#119838. The style-guide change for indentation of rhs was not implemented in time for the 2024 style edition.
See tracking issue rust-lang#132380.

cc rust-lang#134974 for the other style guide change in 2024.

r? ``@compiler-errors``
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@calebcartwright calebcartwright calebcartwright left review comments

@compiler-errors compiler-errors compiler-errors 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.80.0
Development

Successfully merging this pull request may close these issues.

Multi-line expressions on both sides of an assignment shouldn't wrap to the same indent level
7 participants
@joshtriplett @rustbot @rfcbot @calebcartwright @bors @compiler-errors @apiraino