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

Disable overflow_delimited_expr in edition 2024 #136312

Merged
merged 2 commits into from
Jan 31, 2025

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Jan 30, 2025

This reverts the style guide changes and sets the default to "false" in rustfmt for style edition 2024.

r? @ytmimi

cc @rust-lang/style @rust-lang/rustfmt

@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 30, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jan 30, 2025

Some changes occurred in src/doc/style-guide

cc @rust-lang/style

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

@compiler-errors

This comment was marked as off-topic.

@bors

This comment was marked as off-topic.

@compiler-errors
Copy link
Member Author

lmao

@bors delegate=ytmimi

@bors
Copy link
Contributor

bors commented Jan 30, 2025

✌️ @ytmimi, you can now approve this pull request!

If @compiler-errors told you to "r=me" after making some further change, please make that change, then do @bors r=@compiler-errors

@compiler-errors compiler-errors added beta-nominated Nominated for backporting to the compiler in the beta channel. T-rustfmt Relevant to the rustfmt team, which will review and decide on the PR/issue. labels Jan 30, 2025
Comment on lines +947 to 949
// FIXME: this test doesn't really exercise anything, since
// `overflow_delimited_expr` is disabled by default in edition 2024.
assert_eq!(config.overflow_delimited_expr(), false);
Copy link
Contributor

Choose a reason for hiding this comment

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

Might make sense to remove this test outright and the style_edition_defaults_overridden_from_cli test below, but I'm fine just adding the FIXME.

Copy link
Contributor

Choose a reason for hiding this comment

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

Let's leave it

@ytmimi
Copy link
Contributor

ytmimi commented Jan 30, 2025

@bors r+

@bors
Copy link
Contributor

bors commented Jan 30, 2025

📌 Commit 346fef4 has been approved by ytmimi

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 Jan 30, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 31, 2025
Rollup of 9 pull requests

Successful merges:

 - rust-lang#132156 (When encountering unexpected closure return type, point at return type/expression)
 - rust-lang#133429 (Autodiff Upstreaming - rustc_codegen_ssa, rustc_middle)
 - rust-lang#136281 (`rustc_hir_analysis` cleanups)
 - rust-lang#136297 (Fix a typo in profile-guided-optimization.md)
 - rust-lang#136300 (atomic: extend compare_and_swap migration docs)
 - rust-lang#136310 (normalize `*.long-type.txt` paths for compare-mode tests)
 - rust-lang#136312 (Disable `overflow_delimited_expr` in edition 2024)
 - rust-lang#136313 (Filter out RPITITs when suggesting unconstrained assoc type on too many generics)
 - rust-lang#136323 (Fix a typo in conventions.md)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 15ef406 into rust-lang:master Jan 31, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 31, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 31, 2025
Rollup merge of rust-lang#136312 - compiler-errors:overflow_delimited_expr-2024, r=ytmimi

Disable `overflow_delimited_expr` in edition 2024

This reverts the style guide changes and sets the default to "false" in rustfmt for style edition 2024.

r? `@ytmimi`

cc `@rust-lang/style` `@rust-lang/rustfmt`
ehuss added a commit to ehuss/edition-guide that referenced this pull request Jan 31, 2025
This has been dropped from the edition via
rust-lang/rust#136312.
@ehuss ehuss added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 31, 2025
ehuss pushed a commit to ehuss/rust that referenced this pull request Feb 1, 2025
…_expr-2024, r=ytmimi

Disable `overflow_delimited_expr` in edition 2024

This reverts the style guide changes and sets the default to "false" in rustfmt for style edition 2024.

r? `@ytmimi`

cc `@rust-lang/style` `@rust-lang/rustfmt`
@ehuss ehuss modified the milestones: 1.86.0, 1.85.0 Feb 1, 2025
@ehuss ehuss removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 1, 2025
@ehuss ehuss mentioned this pull request Feb 1, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 1, 2025
[beta-1.85] backports

* [Add `AsyncFn*` to `core` prelude](rust-lang#135852)
* [Disable `overflow_delimited_expr` in edition 2024](rust-lang#136312)
* [Disable some incorrect rust-analyzer diagnostics on beta](rust-lang#136236)
    * [fix: Fix #[rustc_deprecated_safe_2024]](rust-lang/rust-analyzer#19044)
    * [fix: Fix a bug where enum variants were not considered properly in type ns resolution](rust-lang/rust-analyzer#18976)
* Update edition-guide
    * [Add alternatives for static-mut-refs](rust-lang/edition-guide#354)
    * [Remove rustfmt-overflow-delimited-expr](rust-lang/edition-guide#357)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustfmt Relevant to the rustfmt team, which will review and decide on the PR/issue. 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