rustfmt subtree update #117066

calebcartwright · 2023-10-23T01:44:06Z

Includes let chain formatting amongst a few other smaller changes and fixes

…sync

…trieb Syntactically accept `become` expressions (explicit tail calls experiment) This adds `ast::ExprKind::Become`, implements parsing and properly gates the feature. cc `@scottmcm`

…tfmt

… have a `ProjectionCandidate`

There were some upstream changes made a while back that requires this to be set when building rustfmt from source like we do in the `check_diff.sh` script. See issue 5675 for more details.

The `set -e` option is used to immediately exit if any command exits with a non zero exit status. This will help us catch errors in the script, for example, needing the `LD_LIBRARY_PATH` to be set.

There was an issue with the script when passing optional rustfmt configs without specifying a commit hash. Because these optional values are passed via positional arguments the configs ($4) would be used in place of the commit hash ($3). Now that we set a default value for the optional commit hash we avoid this problem.

* Use matches!() macro to improve readability 1. Use `matches!()` macro in `is_line_comment` and `is_block_comment` to improve readability. 2. Very sightly improve the wording of the doc comment for these two functions. * Update wording on doc comment on is_line_comment()

Fixes 5730 Previously rustfmt was attempting to slice a string with an invalid range (`start > end`), leading to the ICE. When formatting a macro transcriber snippet consisting of a lone semicolon, the snippet was being formatted into the empty string, leading the enclosing `fn main() {\n}` added by `format_code_block` to be formatted into `fn main() {}`. However, rustfmt was assuming that the enclosing function string's length had been left unchanged. This was leading to an invalid range being constructed when attempting to trim off the enclosing function. The fix is to just clamp the range's start to be less than or equal to the range's end, since if `end < start` there's nothing to iterate over anyway.

Implement rust-lang/compiler-team#578. When an ICE is encountered on nightly releases, the new rustc panic handler will also write the contents of the backtrace to disk. If any `delay_span_bug`s are encountered, their backtrace is also added to the file. The platform and rustc version will also be collected.

…g#5838) Update docs to include an example of running `rustfmt` built from src, and show how users can set the `RUSTFMT` environment variable to test `cargo-fmt` using the `rustfmt` they built from src.

…ly built in-tree version

Currently, Clippy, Miri, Rustfmt, and rustc all use an environment variable to indicate that output should be blessed, but they use different variable names. In order to improve consistency, this patch applies the following changes: - Emit `RUSTC_BLESS` within `prepare_cargo_test` so it is always available - Change usage of `MIRI_BLESS` in the Miri subtree to use `RUSTC_BLESS` - Change usage of `BLESS` in the Clippy subtree to `RUSTC_BLESS` - Change usage of `BLESS` in the Rustfmt subtree to `RUSTC_BLESS` - Adjust the blessable test in `rustc_errors` to use this same convention - Update documentation where applicable Any tools that uses `RUSTC_BLESS` should check that it is set to any value other than `"0"`.

Token tree cloning is only needed in one place.

Resolves 5542 Prior to rust-lang#101212 the `ast::TraitObjectSyntax` enum only had two variants `Dyn` and `None`. The PR that introduced the `dyn*` syntax added a new variant `DynStar`, but did not update the formatting rules to account for the new variant. Now the new `DynStar` variant is properly handled and is no longer removed by rustfmt.

… r=petrochenkov Less `TokenTree` cloning `TokenTreeCursor` has this comment on it: ``` // FIXME: Many uses of this can be replaced with by-reference iterator to avoid clones. ``` This PR completes that FIXME. It doesn't have much perf effect, but at least we now know that. r? `@petrochenkov`

…023-10-22 sync subtree

bumping from v1.6.0 -> v1.7.0 since we added support for let-chains

…sync

rustbot · 2023-10-23T01:44:11Z

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

calebcartwright · 2023-10-23T02:31:52Z

@bors r+ p=2 rollup=never

bors · 2023-10-23T02:31:54Z

📌 Commit 35400e8 has been approved by calebcartwright

It is now in the queue for this repository.

bors · 2023-10-23T02:48:13Z

⌛ Testing commit 35400e8 with merge 62fae23...

bors · 2023-10-23T04:46:12Z

☀️ Test successful - checks-actions
Approved by: calebcartwright
Pushing 62fae23 to master...

rust-timer · 2023-10-23T05:55:46Z

Finished benchmarking commit (62fae23): 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

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

Binary size

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

Bootstrap: missing data
Artifact size: 304.28 MiB -> 304.26 MiB (-0.01%)

WaffleLapkin and others added 30 commits June 19, 2023 12:54

Implement become expression formatting in rustfmt

dc7dc3e

Merge commit '3f7c366fc0464e01ddcaefbd70647cb3da4202be' into rustfmt-…

ed3e96e

…sync

Rollup merge of rust-lang#112790 - WaffleLapkin:syntactically, r=Nils…

80bf3ea

…trieb Syntactically accept `become` expressions (explicit tail calls experiment) This adds `ast::ExprKind::Become`, implements parsing and properly gates the feature. cc `@scottmcm`

Merge commit 'dca1cf90ad6b8e45afbed2061803befbb2d159e9' into sync-rus…

78331ee

…tfmt

docs: fix a few links

9a86da9

Switch to tracing for logging

326af2b

Rewrite float literals ending in dots with parens in method calls

bb87a1b

Add failing test

3c3cf61

Don't skip semicolon if exprs follow

8850854

Switch ast::Stmt rewriting use to stmt::Stmt::from_simple_block

d9a0992

fix: handle skip_macro_invocations from config file

f2bad9c

always emit consider AutoImplCandidates for them if they don't also…

d0762f0

… have a `ProjectionCandidate`

Actually use tracing for logging

5ed7f74

Add LD_LIBRARY_PATH in check_diff.sh

89500fa

There were some upstream changes made a while back that requires this to be set when building rustfmt from source like we do in the `check_diff.sh` script. See issue 5675 for more details.

Improve error discovery in check_diff.sh

e5c212b

The `set -e` option is used to immediately exit if any command exits with a non zero exit status. This will help us catch errors in the script, for example, needing the `LD_LIBRARY_PATH` to be set.

fix link in CHANGELOG.md

e9dfb6f

automatically add pr-not-reviewed to new PRs (rust-lang#5843)

1842967

doc: fix instruction about running Rustfmt from source code (rust-lan…

c6d39a2

…g#5838) Update docs to include an example of running `rustfmt` built from src, and show how users can set the `RUSTFMT` environment variable to test `cargo-fmt` using the `rustfmt` they built from src.

Support non-lifetime binders

2db13f4

misc code cleanup

a9ae746

Use a builder instead of boolean/option arguments

a3dfd82

Make x test src/tools/rustfmt --bless format rustfmt with the fresh…

c0ee8f5

…ly built in-tree version

Avoid into_trees usage in rustfmt.

e60a9e2

Token tree cloning is only needed in one place.

calebcartwright and others added 9 commits October 22, 2023 12:59

chore: bump toolchain and apply minor updates

746bf48

deps: bump bytecount version

75d8497

tests: fix let chain tests

c2515df

Merge pull request rust-lang#5944 from calebcartwright/subtree-sync-2…

0bb2acf

…023-10-22 sync subtree

Add outstanding changelog entries for the next release

75c7d1d

Fix typos and remove merge conflict artifacts from the changelog

ff3ce6b

chore: prep v1.7.0 release

81fe905

bumping from v1.6.0 -> v1.7.0 since we added support for let-chains

Merge commit '81fe905ca83cffe84322f27ca43950b617861ff7' into rustfmt-…

7650a75

…sync

bump rustfmt version

35400e8

calebcartwright added the subtree-sync PR updates a subtree (miri, clippy, etc). Ignored by no-merges check label Oct 23, 2023

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 23, 2023

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 Oct 23, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 23, 2023

bors merged commit 62fae23 into rust-lang:master Oct 23, 2023
22 checks passed

rustbot added this to the 1.75.0 milestone Oct 23, 2023

bors mentioned this pull request Oct 23, 2023

Implement gen blocks in the 2024 edition #116447

Merged

ytmimi mentioned this pull request Oct 23, 2023

Strange linebreaks introduced in if-let expressions with let_chains rust-lang/rustfmt#5946

Closed

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

ytmimi mentioned this pull request Nov 21, 2023

rustfmt 1.7.0-nightly inconsistent output across targets rust-lang/rustfmt#5964

Closed

ytmimi mentioned this pull request Jan 21, 2024

rustfmt stopped formatting const items in macros rust-lang/rustfmt#6035

Open

matthiaskrgr mentioned this pull request Apr 16, 2024

ICE: node HirId ... cannot be placed in TypeckResults with hir_owner DefId... #124022

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rustfmt subtree update #117066

rustfmt subtree update #117066

calebcartwright commented Oct 23, 2023

rustbot commented Oct 23, 2023

calebcartwright commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 23, 2023

rust-timer commented Oct 23, 2023

rustfmt subtree update #117066

rustfmt subtree update #117066

Conversation

calebcartwright commented Oct 23, 2023

rustbot commented Oct 23, 2023

calebcartwright commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 23, 2023

bors commented Oct 23, 2023

rust-timer commented Oct 23, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size