Sync from rustfmt #130593

ytmimi · 2024-09-20T01:52:13Z

This paves the way for tracking more state (e.g. error tainting) in the diagnostic context handle

…m-rustfmt-24-06

Merge `PatParam`/`PatWithOr`, and `Expr`/`Expr2021`, for a few reasons. - It's conceptually nice, because the two pattern kinds and the two expression kinds are very similar. - With expressions in particular, there are several places where both expression kinds get the same treatment. - It removes one unreachable match arm. - Most importantly, for rust-lang#124141 I will need to introduce a new type `MetaVarKind` that is very similar to `NonterminalKind`, but records a couple of extra fields for expression metavars. It's nicer to have a single `MetaVarKind::Expr` expression variant to hold those extra fields instead of duplicating them across two variants `MetaVarKind::{Expr,Expr2021}`. And then it makes sense for patterns to be treated the same way, and for `NonterminalKind` to also be treated the same way. I also clarified the comments, because I have long found them a little hard to understand.

…r=compiler-errors Rework pattern and expression nonterminal kinds. Some tweaks to `NonterminalKind` that will assist with rust-lang#124141. Details in the individual commits. r? compiler-errors cc ```@eholk```

…ebcartwright Implement `use<>` formatting in rustfmt This PR implements formatting for precise-capturing `use<>` syntax as proposed in rust-lang#126753. The syntax is implemented as-if the `use<>` bound were a trait bound but with the `use` keyword as its path segment identifier. I opted to develop this in the rust-lang/rust tree since I'm not certain when the next rustfmt subtree sync is going to be, and I'd rather not block landing nightly support for `use<>` on something I have no control over. If ``@rust-lang/rustfmt`` would rather I move this PR over to that repository, then I would at least like to know when the next rustfmt->rust subtree sync is going to be, since stabilizing `precise_capturing` without formatting will be disruptive. This implementation is otherwise rather straightforward. Tracking: - rust-lang#123432

…g, r=dtolnay Remove stray println from rustfmt's `rewrite_static` r? `@calebcartwright` `@ytmimi` -- though anyone should probably r+ this so it gets into nightly sooner than later, since it's obviously wrong. This can just be fixed in-tree, since I don't think we want to wait until the next sync to fix this. Fix rust-lang/rustfmt#6210 Fix rust-lang#126887

…-06-24

…-2024-06-24 subtree-push 2024-06-24

impl rewrite_result for ast::Local, ast::FieldDef, ast::Param, ast::FnRetTy

…ound, Ty

…-lang#6232) This adds a test case to validate behavior when using `format_code_in_doc_comments=true`

Makes internal changes to define each configuration in terms of the `StyleEditionDefault` trait, and hard codes `StyleEdition::Edition2015` anywhere the new `style_edition` is needed. **Note** users are still unable to configure `style edition`.

…m-rustfmt

rustbot · 2024-09-20T01:52:17Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

rustbot · 2024-09-20T01:52:19Z

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git pull --rebase https://github.com/rust-lang/rust.git master
$ git push --force-with-lease

The following commits are merge commits:

compiler-errors · 2024-09-20T02:11:41Z

@bors delegate+

bors · 2024-09-20T02:11:44Z

✌️ @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

ytmimi · 2024-09-20T03:01:03Z

@bors r+ p=1 rollup=never

bors · 2024-09-20T03:01:06Z

📌 Commit eeda9dd has been approved by ytmimi

It is now in the queue for this repository.

bors · 2024-09-20T03:31:09Z

⌛ Testing commit eeda9dd with merge 2e45ec3...

bors · 2024-09-20T06:02:12Z

☀️ Test successful - checks-actions
Approved by: ytmimi
Pushing 2e45ec3 to master...

rust-timer · 2024-09-20T07:21:05Z

Finished benchmarking commit (2e45ec3): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results (secondary -4.4%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.4%	[-6.0%, -2.6%]	5
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 768.735s -> 768.024s (-0.09%)
Artifact size: 341.28 MiB -> 341.30 MiB (0.01%)

Changes required due to: - rust-lang/rust#130593 Sync from rustfmt With the exception of changes to `rust-toolchain.toml` and `rustfmt.toml` all changes were automatically created by running `scripts/kani-fmt.sh`.

Changes required due to: - rust-lang/rust#130593 Sync from rustfmt - rust-lang/rust#124895 Disallow hidden references to mutable static With the exception of changes to `rust-toolchain.toml`, `rustfmt.toml`, and `library/kani/src/futures.rs` all changes were automatically created by running `scripts/kani-fmt.sh`. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

compiler-errors and others added 30 commits June 17, 2024 22:35

Fix rustfmt

1d1989f

Use a dedicated type instead of a reference for the diagnostic context

0c5a75a

This paves the way for tracking more state (e.g. error tainting) in the diagnostic context handle

Merge commit 'e4944185ae09c99f59b460e358909f329010ea9c' into sync-fro…

ebce054

…m-rustfmt-24-06

Fix rustfmt

8b36bc0

fix bad merge conflict resolution

081ae53

Implement use<> formatting in rustfmt

10277c9

Rollup merge of rust-lang#126851 - nnethercote:NtExprKind-NtPatKind, …

8f8a463

…r=compiler-errors Rework pattern and expression nonterminal kinds. Some tweaks to `NonterminalKind` that will assist with rust-lang#124141. Details in the individual commits. r? compiler-errors cc ```@eholk```

Remove stray println from rustfmt

22aac49

Merge remote-tracking branch 'origin/master' into sync-from-rust-2024…

b5fa338

…-06-24

Bump toolchain to nightly-2024-06-24

a3a84e5

Remove stray println from rustfmt

c528496

Tighten spans for async blocks

51df533

Implement RTN support in rustfmt

88f98c2

Merge pull request rust-lang#6217 from compiler-errors/sync-from-rust…

6093d48

…-2024-06-24 subtree-push 2024-06-24

fix link syntax

f65d04a

remove duplicate word

533b760

add rewrite_result method to Rewrite trait

905ca54

impl rewrite_result for ast::Local, ast::FieldDef, ast::Param, ast::FnRetTy

add Ext trait for converting Option->RewriteResult

21afdb8

impl rewrite_result for AssocItemConstraintKind, GenericArg, GenericB…

f62d730

…ound, Ty

rewrite_result for GenericBounds, GenericParam, SegmentParam

eed7e23

ensure parse errors aren't emitted when formatting doc comments (rust…

c8290a5

…-lang#6232) This adds a test case to validate behavior when using `format_code_in_doc_comments=true`

add release date for v1.7.1

add0459

Remove rustdoc tests which no longer parse

163d26e

refactor rewrite_block

bb56224

refactor rewrite_closure

071ca7d

modify rewrite_path and impl rewrite_result for related AST nodes

3cbc91e

compiler-errors and others added 8 commits September 12, 2024 10:27

Add tests showing how comments are handled

d6d9e76

Non-panicking Display for Path

5230e8f

Use usize::MAX instead of deprecated usize::max_value

019578f

Avoid allocating Vec in light_rewrite_comment

008b3df

Avoid an allocation in rewrite_int_lit

b552eb9

Document changes for the next release

31e799f

chore: prep v1.8.0 release

b23b699

Merge commit 'b23b69900eab1260be510b2bd8922f4b6de6cf1e' into sync-fro…

eeda9dd

…m-rustfmt

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 20, 2024

rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 20, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 20, 2024

bors merged commit 2e45ec3 into rust-lang:master Sep 20, 2024
7 checks passed

rustbot added this to the 1.83.0 milestone Sep 20, 2024

ytmimi deleted the sync-from-rustfmt branch September 20, 2024 06:18

tautschnig mentioned this pull request Sep 24, 2024

Update toolchain to 2024-09-23 model-checking/kani#3544

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync from rustfmt #130593

Sync from rustfmt #130593

ytmimi commented Sep 20, 2024

rustbot commented Sep 20, 2024

rustbot commented Sep 20, 2024

compiler-errors commented Sep 20, 2024

bors commented Sep 20, 2024

ytmimi commented Sep 20, 2024

bors commented Sep 20, 2024

bors commented Sep 20, 2024

bors commented Sep 20, 2024

rust-timer commented Sep 20, 2024

Sync from rustfmt #130593

Sync from rustfmt #130593

Conversation

ytmimi commented Sep 20, 2024

rustbot commented Sep 20, 2024

rustbot commented Sep 20, 2024

compiler-errors commented Sep 20, 2024

bors commented Sep 20, 2024

ytmimi commented Sep 20, 2024

bors commented Sep 20, 2024

bors commented Sep 20, 2024

bors commented Sep 20, 2024

rust-timer commented Sep 20, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size