[PERF-EXPERIMENT] Add second span to TokenTree

[petrochenkov]

cc #118517

[rustbot]

r? @davidtwco

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

[petrochenkov]

@bors try @rust-timer queue

[rustbot]

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

[bors]

⌛ Trying commit cca1dd4 with merge 0f071b2...

[rust-log-analyzer]

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

   Compiling rustc-main v0.0.0 (/checkout/compiler/rustc)
    Checking dissimilar v1.0.6
   Compiling coverage_test_macros v0.0.0 (/checkout/compiler/rustc_mir_transform/src/coverage/test_macros)
    Checking expect-test v1.4.1
error: in expressions, `_` can only be used on the left-hand side of an assignment
    |
137 |                 _,
137 |                 _,
    |                 ^ `_` not allowed here

error: in expressions, `_` can only be used on the left-hand side of an assignment
    |
147 |                 _,
147 |                 _,
    |                 ^ `_` not allowed here
error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 3 fields
  --> compiler/rustc_expand/src/parse/tests.rs:77:34
   |
   |
77 |                 TokenTree::Token(Token { kind: token::Ident(name_macro_rules, false), .. }, _),
   |
  ::: /checkout/compiler/rustc_ast/src/tokenstream.rs:47:11
   |
47 |     Token(Token, Spacing, Span),
47 |     Token(Token, Spacing, Span),
   |           -----  -------  ---- tuple variant has 3 fields
   |
help: use `_` to explicitly ignore each field
   |
77 |                 TokenTree::Token(Token { kind: token::Ident(name_macro_rules, false), .. }, _, _),

error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 3 fields
  --> compiler/rustc_expand/src/parse/tests.rs:78:34
   |
   |
78 |                 TokenTree::Token(Token { kind: token::Not, .. }, _),
   |
  ::: /checkout/compiler/rustc_ast/src/tokenstream.rs:47:11
   |
47 |     Token(Token, Spacing, Span),
47 |     Token(Token, Spacing, Span),
   |           -----  -------  ---- tuple variant has 3 fields
   |
help: use `_` to explicitly ignore each field
   |
78 |                 TokenTree::Token(Token { kind: token::Not, .. }, _, _),

error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 3 fields
  --> compiler/rustc_expand/src/parse/tests.rs:79:34
   |
   |
79 |                 TokenTree::Token(Token { kind: token::Ident(name_zip, false), .. }, _),
   |
  ::: /checkout/compiler/rustc_ast/src/tokenstream.rs:47:11
   |
47 |     Token(Token, Spacing, Span),
47 |     Token(Token, Spacing, Span),
   |           -----  -------  ---- tuple variant has 3 fields
   |
help: use `_` to explicitly ignore each field
   |
79 |                 TokenTree::Token(Token { kind: token::Ident(name_zip, false), .. }, _, _),

error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 3 fields
   --> compiler/rustc_expand/src/parse/tests.rs:105:50
    |
    |
105 | ...                   TokenTree::Token(Token { kind: token::Dollar, .. }, _),
    |
   ::: /checkout/compiler/rustc_ast/src/tokenstream.rs:47:11
    |
47  |     Token(Token, Spacing, Span),
47  |     Token(Token, Spacing, Span),
    |           -----  -------  ---- tuple variant has 3 fields
    |
help: use `_` to explicitly ignore each field
    |
105 |                                 TokenTree::Token(Token { kind: token::Dollar, .. }, _, _),

error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 3 fields
   --> compiler/rustc_expand/src/parse/tests.rs:106:50
    |
    |
106 | ...                   TokenTree::Token(Token { kind: token::Ident(name, false), .. }, _),
    |
   ::: /checkout/compiler/rustc_ast/src/tokenstream.rs:47:11
    |
47  |     Token(Token, Spacing, Span),
47  |     Token(Token, Spacing, Span),
    |           -----  -------  ---- tuple variant has 3 fields
    |
help: use `_` to explicitly ignore each field
    |
106 |                                 TokenTree::Token(Token { kind: token::Ident(name, false), .. }, _, _),

For more information about this error, try `rustc --explain E0023`.
error: could not compile `rustc_expand` (lib test) due to 7 previous errors
warning: build failed, waiting for other jobs to finish...

[bors]

☀️ Try build successful - checks-actions
Build commit: 0f071b2 (0f071b2d659e5c2f6caca1f468ced9a679fe80b7)

[rust-timer]

Finished benchmarking commit (0f071b2): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.4%	[0.1%, 1.3%]	56
Regressions ❌ (secondary)	1.5%	[0.3%, 3.4%]	17
Improvements ✅ (primary)	-0.4%	[-1.2%, -0.1%]	6
Improvements ✅ (secondary)	-0.6%	[-1.1%, -0.2%]	7
All ❌✅ (primary)	0.3%	[-1.2%, 1.3%]	62

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)	1.5%	[0.6%, 3.7%]	15
Regressions ❌ (secondary)	4.6%	[0.5%, 12.0%]	25
Improvements ✅ (primary)	-1.5%	[-2.1%, -0.8%]	2
Improvements ✅ (secondary)	-3.7%	[-7.2%, -0.8%]	17
All ❌✅ (primary)	1.2%	[-2.1%, 3.7%]	17

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)	2.0%	[1.0%, 4.4%]	8
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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.7%	[0.0%, 3.8%]	93
Regressions ❌ (secondary)	0.7%	[0.0%, 2.2%]	30
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.7%	[0.0%, 3.8%]	93

Bootstrap: 675.083s -> 675.461s (0.06%)
Artifact size: 314.18 MiB -> 314.25 MiB (0.02%)