Sync rustfmt subtree #107275

calebcartwright · 2023-01-24T20:21:24Z

No description provided.

…tfmt

There are some tests in the rustfmt test suite that are ignored by default. I believe these tests are ignored because they have caused issues with the the `rust-lang/rust` test suite. However, we recently experienced an issue (5395) that would have been avoided had these tests been running. With the introduction of the new `#[rustfmt_only_ci_test]` attribute macro we can run these tests when the `RUSTFMT_CI` environment variable is set, which will presumably only be set during rustfmts CI runs. When the environment variable is not set the `#[rustfmt_only_ci_test]` will be replaced with an `#[ignore]`.

Closes 1306 It's unclear when the issue was fixed, but it cannot be reproduced.

* feat: add skip_macro_names option * [review] update configuration documentation * [review] fix docstring * [feat] implement wildcard macro invocation skip * commit missed files * [review] test override skip macro names * [review] skip_macro_names -> skip_macro_invocations * [review] expand doc configuration * [review] add lots more tests * [review] add use alias test examples * [review] add link to standard macro behaviour

fn_args_layout is now deprecated. This option was renamed to better communicate that it affects the layout of parameters in function signatures and not the layout of arguments in function calls. Because the `fn_args_layout` is a stable option the renamed option is also stable, however users who set `fn_args_layout` will get a warning message letting them know that the option has been renamed.

* Bugfix: Now slash/start comments aren't duplicated on trait parameters. * Removing unnecesary comment. * Improvements: Improving the BytePos offset. * Improvements: Improving the description of the test cases.

Closes 3033 The issue is no longer reproducible.

Closes 2534 The behavior described in the original issue can no longer be reproduced. The tests show that to be the case regardless of if `format_macro_matchers` is `true` or `false`.

Closes 3245 Closes 3561 These issues were originally linked in issue 3672 and as was mentioned in PR 3706, it's unclear which commit resolved the issue but the issue can no longer be reproduced.

Closes 3164 Show that when `error_on_line_overflow=true` is set in the rustfmt.toml that an error message is written to stderr.

Closes 4350 Its unclear which commit resolved this, but the original issue is no longer reproducible.

Closes 3987 It's unclear which commit resolved this issue, but it can no longer be reproduced.

A `TokenStream` contains a `Lrc<Vec<(TokenTree, Spacing)>>`. But this is not quite right. `Spacing` makes sense for `TokenTree::Token`, but does not make sense for `TokenTree::Delimited`, because a `TokenTree::Delimited` cannot be joined with another `TokenTree`. This commit fixes this problem, by adding `Spacing` to `TokenTree::Token`, changing `TokenStream` to contain a `Lrc<Vec<TokenTree>>`, and removing the `TreeAndSpacing` typedef. The commit removes these two impls: - `impl From<TokenTree> for TokenStream` - `impl From<TokenTree> for TreeAndSpacing` These were useful, but also resulted in code with many `.into()` calls that was hard to read, particularly for anyone not highly familiar with the relevant types. This commit makes some other changes to compensate: - `TokenTree::token()` becomes `TokenTree::token_{alone,joint}()`. - `TokenStream::token_{alone,joint}()` are added. - `TokenStream::delimited` is added. This results in things like this: ```rust TokenTree::token(token::Semi, stmt.span).into() ``` changing to this: ```rust TokenStream::token_alone(token::Semi, stmt.span) ``` This makes the type of the result, and its spacing, clearer. These changes also simplifies `Cursor` and `CursorRef`, because they no longer need to distinguish between `next` and `next_with_spacing`.

* Fix typos * Fix typos

…-08-06

Fix rust-lang#58497.

…-01-24

…023-01-24 Subtree sync 2023-01-24

…m-rustfmt

rustbot · 2023-01-24T20:21:30Z

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2023-01-24T20:21:33Z

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

calebcartwright · 2023-01-24T20:29:33Z

r? calebcartwright

Going to wait for CI checks to pass and then try to get bors to move this up a few spots towards the middle of the current queue

calebcartwright · 2023-01-24T21:26:58Z

@bors r+ p=6 rollup=never

Want to jump ahead of some rollups because we haven't done a sync in a very long time and there's various PRs open in this repo that also modify the rustfmt subtree. Those factors increase the odds of a merge conflict that would force us to abandon this sync and start over if we're unable to get this landed reasonably quickly

bors · 2023-01-24T21:27:00Z

📌 Commit 6bf1a87 has been approved by calebcartwright

It is now in the queue for this repository.

bors · 2023-01-25T04:49:11Z

⌛ Testing commit 6bf1a87 with merge c048326...

bors · 2023-01-25T07:29:53Z

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

rust-timer · 2023-01-25T08:48:02Z

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

Results

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)	2.3%	[2.3%, 2.3%]	1
Improvements ✅ (primary)	-2.2%	[-2.2%, -2.2%]	1
Improvements ✅ (secondary)	-1.1%	[-1.1%, -1.1%]	1
All ❌✅ (primary)	-2.2%	[-2.2%, -2.2%]	1

Cycles

Results

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)	1.9%	[1.7%, 2.1%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

calebcartwright and others added 30 commits June 22, 2022 22:14

Merge commit 'c4416f20dcaec5d93077f72470e83e150fb923b1' into sync-rus…

ac595dd

…tfmt

config_type: add unstable_variant attribute

2ae63f0

ast: Add span to Extern

45f4f6c

refactor: remove some unnecessary clones

35f4c55

Add test case for issue 1306 which was resolved

2403f82

Closes 1306 It's unclear when the issue was fixed, but it cannot be reproduced.

implement rustfmt formatting for for<> closure binders

2964d0a

Add rustfmt test for formatting for<> before closures

f026688

docs: fix duplicated names example

dde2831

Remove useless conditional compilation - 2

85fdf8e

Fix/comments inside trait generics gets duplicated (rust-lang#5446)

a7bf009

* Bugfix: Now slash/start comments aren't duplicated on trait parameters. * Removing unnecesary comment. * Improvements: Improving the BytePos offset. * Improvements: Improving the description of the test cases.

Add test for issue 3033

05332b8

Closes 3033 The issue is no longer reproducible.

Add tests for issue 2534

f2c31ba

Closes 2534 The behavior described in the original issue can no longer be reproduced. The tests show that to be the case regardless of if `format_macro_matchers` is `true` or `false`.

Add tests for 3245 and 3561

4c78c73

Closes 3245 Closes 3561 These issues were originally linked in issue 3672 and as was mentioned in PR 3706, it's unclear which commit resolved the issue but the issue can no longer be reproduced.

test for issue 3164

c19b145

Closes 3164 Show that when `error_on_line_overflow=true` is set in the rustfmt.toml that an error message is written to stderr.

Add test for issue 4350

a451a39

Closes 4350 Its unclear which commit resolved this, but the original issue is no longer reproducible.

Improvements: Adding tests for the issue-4643.

ed77962

Update Configurations.md to point to dirs 4.0 docs

7432422

Add test for issue 3987

a7801aa

Closes 3987 It's unclear which commit resolved this issue, but it can no longer be reproduced.

feat: nicer skip context for macro/attribute

7cc1261

[review] use extend trait, enum for skip context

3fa81c6

refactor(chains): encapsulate shared code, prep for overflows

23ef4b7

Fix typos (rust-lang#5486)

662702e

* Fix typos * Fix typos

Merge remote-tracking branch 'upstream/master' into subtree-sync-2022…

a392dd1

…-08-06

chore: bump toolchain

5a1ef3c

chore: disable unreachable pub lint on config items

437de8d

chore: fix another config unreachable-pub

c78ef92

estebank and others added 11 commits January 5, 2023 21:29

Detect closures assigned to binding in block

664c60a

Fix rust-lang#58497.

Change src/test to tests in source files, fix tidy and tests

8c8aa38

parse const closures

19c2286

fix: correct span for structs with const generics

aae222c

Merge remote-tracking branch 'upstream/master' into subtree-sync-2023…

e7d87ad

…-01-24

chore: bump toolchain

18dd075

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

6eeb4fd

…023-01-24 Subtree sync 2023-01-24

fix: version gate changes for multiline single generic bound

5139b14

chore: prep v1.5.2 release

1d8491b

Merge commit '1d8491b120223272b13451fc81265aa64f7f4d5b' into sync-fro…

8e1e67d

…m-rustfmt

update rustfmt subtree version in lockfile

6bf1a87

rustbot assigned Mark-Simulacrum Jan 24, 2023

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

rustbot assigned calebcartwright and unassigned Mark-Simulacrum Jan 24, 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 Jan 24, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 25, 2023

bors merged commit c048326 into rust-lang:master Jan 25, 2023

rustbot added this to the 1.69.0 milestone Jan 25, 2023

Urgau mentioned this pull request Jan 25, 2023

bootstrap: cleanup the list of extra check cfgs #107080

Merged

calebcartwright deleted the sync-from-rustfmt branch January 25, 2023 14:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync rustfmt subtree #107275

Sync rustfmt subtree #107275

calebcartwright commented Jan 24, 2023

rustbot commented Jan 24, 2023

rustbot commented Jan 24, 2023

calebcartwright commented Jan 24, 2023

calebcartwright commented Jan 24, 2023

bors commented Jan 24, 2023

bors commented Jan 25, 2023

bors commented Jan 25, 2023

rust-timer commented Jan 25, 2023

Sync rustfmt subtree #107275

Sync rustfmt subtree #107275

Conversation

calebcartwright commented Jan 24, 2023

rustbot commented Jan 24, 2023

rustbot commented Jan 24, 2023

calebcartwright commented Jan 24, 2023

calebcartwright commented Jan 24, 2023

bors commented Jan 24, 2023

bors commented Jan 25, 2023

bors commented Jan 25, 2023

rust-timer commented Jan 25, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles