macro_rules: Less hacky heuristic for using `tt` metavariable spans #119204

petrochenkov · 2023-12-21T23:20:07Z

See the big comment on fn maybe_use_metavar_location for a more detailed description.

rustbot · 2023-12-21T23:20:16Z

r? @WaffleLapkin

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

compiler/rustc_expand/src/mbe/transcribe.rs

petrochenkov · 2023-12-21T23:25:54Z

@bors try @rust-timer queue

bors · 2023-12-21T23:27:04Z

⌛ Trying commit a7e8629 with merge 682ee30...

macro_rules: Less hacky heuristic for using `tt` metavariable spans See the big comment on `fn maybe_use_metavar_location` for a more detailed description.

bors · 2023-12-22T00:54:06Z

☀️ Try build successful - checks-actions
Build commit: 682ee30 (682ee307de2eebc3b5a9034414c4df915e793e92)

rust-timer · 2023-12-22T02:15:35Z

Finished benchmarking commit (682ee30): 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
Regressions ❌ (secondary)	0.2%	[0.2%, 0.2%]	1
Improvements ✅ (primary)	-0.2%	[-0.3%, -0.1%]	9
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.2%	[-0.3%, -0.1%]	9

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%	[1.3%, 1.6%]	2
Regressions ❌ (secondary)	1.9%	[1.4%, 2.4%]	2
Improvements ✅ (primary)	-1.1%	[-1.1%, -1.0%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.2%	[-1.1%, 1.6%]	4

Cycles

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

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.0%	[0.0%, 0.0%]	3
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.1%	[-0.1%, -0.1%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.0%	[-0.1%, 0.0%]	4

Bootstrap: 674.232s -> 671.95s (-0.34%)
Artifact size: 312.80 MiB -> 312.74 MiB (-0.02%)

compiler/rustc_expand/src/mbe.rs

petrochenkov · 2023-12-22T18:49:47Z

@bors rollup=maybe

WaffleLapkin · 2023-12-28T08:25:37Z

@bors r+

bors · 2023-12-28T08:25:39Z

📌 Commit 3530295 has been approved by WaffleLapkin

It is now in the queue for this repository.

bors · 2023-12-28T09:10:09Z

⌛ Testing commit 3530295 with merge c112817...

macro_rules: Less hacky heuristic for using `tt` metavariable spans See the big comment on `fn maybe_use_metavar_location` for a more detailed description.

petrochenkov · 2023-12-29T14:09:01Z

~~Blocked on rust-lang/cargo#13218.~~
Blocked on cargo update (maybe #119485, maybe other).
@rustbot blocked

Fix fix::fix_in_dependency to not rely on rustc This changes the `fix::fix_in_dependency` test so that it does not rely on the behavior of rustc. This test is checking the behavior when rustc includes a suggestion diagnostic that modifies a file in CARGO_HOME from a dependency. rustc should not be emitting suggestions that point outside of the current crate, but there are some known bugs where it does this. #9938 added a workaround for this to avoid writing to CARGO_HOME. However, the current test was relying on one of those bugs in rustc to exhibit its behavior. rust-lang/rust#119204 is fixing that particular behavior. Instead of relying on issues in rustc, this PR changes the test so that the test creates a fake `rustc` executable that will emit a hard-coded JSON message that tells `cargo fix` to modify a file in CARGO_HOME. This should be stable as it is no longer relying on rustc. Testing or validating this change is a little tricky. You have to essentially comment out [these three lines](https://github.com/rust-lang/cargo/blob/4f70d1781a2b2d3611087e1ee6e8096903c9b73a/src/cargo/ops/fix.rs#L654-L656) from the original #9938 change, and verify that the test fails (it says "Fixed" in the output). With those three lines in place, it should pass.

petrochenkov · 2024-01-04T00:30:20Z

@bors r=WaffleLapkin

bors · 2024-01-04T00:30:23Z

📌 Commit 1761eab has been approved by WaffleLapkin

It is now in the queue for this repository.

petrochenkov · 2024-01-04T00:55:32Z

@bors r=WaffleLapkin

bors · 2024-01-04T00:55:35Z

📌 Commit e1d12c8 has been approved by WaffleLapkin

It is now in the queue for this repository.

macro_rules: Less hacky heuristic for using `tt` metavariable spans See the big comment on `fn maybe_use_metavar_location` for a more detailed description.

…mpiler-errors Rollup of 10 pull requests Successful merges: - rust-lang#118521 (Enable address sanitizer for MSVC targets using INFERASANLIBS linker flag) - rust-lang#119026 (std::net::bind using -1 for openbsd which in turn sets it to somaxconn.) - rust-lang#119195 (Make named_asm_labels lint not trigger on unicode and trigger on format args) - rust-lang#119204 (macro_rules: Less hacky heuristic for using `tt` metavariable spans) - rust-lang#119362 (Make `derive(Trait)` suggestion more accurate) - rust-lang#119397 (Recover parentheses in range patterns) - rust-lang#119414 (bootstrap: Move -Clto= setting from Rustc::run to rustc_cargo) - rust-lang#119417 (Uplift some miscellaneous coroutine-specific machinery into `check_closure`) - rust-lang#119540 (Don't synthesize host effect args inside trait object types) - rust-lang#119555 (Add codegen test for RVO on MaybeUninit) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#118521 (Enable address sanitizer for MSVC targets using INFERASANLIBS linker flag) - rust-lang#119026 (std::net::bind using -1 for openbsd which in turn sets it to somaxconn.) - rust-lang#119195 (Make named_asm_labels lint not trigger on unicode and trigger on format args) - rust-lang#119204 (macro_rules: Less hacky heuristic for using `tt` metavariable spans) - rust-lang#119362 (Make `derive(Trait)` suggestion more accurate) - rust-lang#119397 (Recover parentheses in range patterns) - rust-lang#119417 (Uplift some miscellaneous coroutine-specific machinery into `check_closure`) - rust-lang#119539 (Fix typos) - rust-lang#119540 (Don't synthesize host effect args inside trait object types) - rust-lang#119555 (Add codegen test for RVO on MaybeUninit) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#119204 - petrochenkov:dialoc2, r=WaffleLapkin macro_rules: Less hacky heuristic for using `tt` metavariable spans See the big comment on `fn maybe_use_metavar_location` for a more detailed description.

rustbot assigned WaffleLapkin Dec 21, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 21, 2023

petrochenkov commented Dec 21, 2023

View reviewed changes

compiler/rustc_expand/src/mbe/transcribe.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Dec 21, 2023

petrochenkov changed the title ~~macro_rules: Less hacky heuristic for tt macro parameter spans~~ macro_rules: Less hacky heuristic for using tt metavariable spans Dec 21, 2023

petrochenkov mentioned this pull request Dec 21, 2023

fix: Overlapping spans in delimited meta-vars #118928

Merged

This comment has been minimized.

Sign in to view

rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Dec 22, 2023

nnethercote reviewed Dec 22, 2023

View reviewed changes

compiler/rustc_expand/src/mbe.rs Outdated Show resolved Hide resolved

petrochenkov force-pushed the dialoc2 branch from a7e8629 to 3530295 Compare December 22, 2023 18:46

WaffleLapkin approved these changes Dec 28, 2023

View reviewed changes

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 Dec 28, 2023

This comment has been minimized.

Sign in to view

This comment was marked as resolved.

Sign in to view

petrochenkov added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Dec 28, 2023

petrochenkov mentioned this pull request Dec 29, 2023

Ignore test fix_in_dependency to make a change in rustc rust-lang/cargo#13218

Closed

rustbot added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 29, 2023

petrochenkov mentioned this pull request Dec 29, 2023

macro_rules: Remove NtIdent nonterminal token #119412

Open

ehuss mentioned this pull request Dec 29, 2023

Fix fix::fix_in_dependency to not rely on rustc rust-lang/cargo#13220

Merged

petrochenkov mentioned this pull request Jan 2, 2024

Update cargo #119485

Merged

petrochenkov force-pushed the dialoc2 branch from 45df887 to 1761eab Compare January 4, 2024 00:29

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-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Jan 4, 2024

This comment has been minimized.

Sign in to view

macro_rules: Less hacky heuristic for using tt metavariable spans

e1d12c8

petrochenkov force-pushed the dialoc2 branch from 1761eab to e1d12c8 Compare January 4, 2024 00:55

compiler-errors mentioned this pull request Jan 4, 2024

Rollup of 10 pull requests #119565

Closed

matthiaskrgr mentioned this pull request Jan 4, 2024

Rollup of 10 pull requests #119569

Merged

bors merged commit 3fb61ce into rust-lang:master Jan 4, 2024
11 checks passed

rustbot added this to the 1.77.0 milestone Jan 4, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

macro_rules: Less hacky heuristic for using `tt` metavariable spans #119204

macro_rules: Less hacky heuristic for using `tt` metavariable spans #119204

petrochenkov commented Dec 21, 2023

rustbot commented Dec 21, 2023

petrochenkov commented Dec 21, 2023

This comment has been minimized.

bors commented Dec 21, 2023

This comment has been minimized.

bors commented Dec 22, 2023

This comment has been minimized.

rust-timer commented Dec 22, 2023

petrochenkov commented Dec 22, 2023

WaffleLapkin commented Dec 28, 2023

bors commented Dec 28, 2023

bors commented Dec 28, 2023

This comment has been minimized.

This comment was marked as resolved.

petrochenkov commented Dec 29, 2023 •

edited

petrochenkov commented Jan 4, 2024

bors commented Jan 4, 2024

This comment has been minimized.

petrochenkov commented Jan 4, 2024

bors commented Jan 4, 2024

macro_rules: Less hacky heuristic for using tt metavariable spans #119204

macro_rules: Less hacky heuristic for using tt metavariable spans #119204

Conversation

petrochenkov commented Dec 21, 2023

rustbot commented Dec 21, 2023

petrochenkov commented Dec 21, 2023

This comment has been minimized.

bors commented Dec 21, 2023

This comment has been minimized.

bors commented Dec 22, 2023

This comment has been minimized.

rust-timer commented Dec 22, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Binary size

petrochenkov commented Dec 22, 2023

WaffleLapkin commented Dec 28, 2023

bors commented Dec 28, 2023

bors commented Dec 28, 2023

This comment has been minimized.

This comment was marked as resolved.

petrochenkov commented Dec 29, 2023 • edited

petrochenkov commented Jan 4, 2024

bors commented Jan 4, 2024

This comment has been minimized.

petrochenkov commented Jan 4, 2024

bors commented Jan 4, 2024

macro_rules: Less hacky heuristic for using `tt` metavariable spans #119204

macro_rules: Less hacky heuristic for using `tt` metavariable spans #119204

petrochenkov commented Dec 29, 2023 •

edited