Lexer tweaks #133070

nnethercote · 2024-11-15T11:58:46Z

Some cleanups and small performance improvements.

r? @chenyukang

nnethercote · 2024-11-15T11:58:55Z

@bors try @rust-timer queue

Lexer tweaks r? `@ghost`

bors · 2024-11-15T12:00:10Z

⌛ Trying commit ac1311b with merge 3b55679...

bors · 2024-11-15T13:43:38Z

☀️ Try build successful - checks-actions
Build commit: 3b55679 (3b5567919664e9283903559336c92c070a13f4b4)

clubby789 · 2024-11-16T00:38:40Z

Doesn't seem to have triggered perf
@rust-timer build 3b55679

rust-timer · 2024-11-16T01:56:04Z

Finished benchmarking commit (3b55679): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

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 the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	0.1%	[0.1%, 0.1%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.2%	[-0.3%, -0.1%]	5
Improvements ✅ (secondary)	-0.3%	[-0.5%, -0.1%]	26
All ❌✅ (primary)	-0.2%	[-0.3%, 0.1%]	6

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: 788.822s -> 788.155s (-0.08%)
Artifact size: 335.37 MiB -> 335.36 MiB (-0.00%)

There is a not-very-useful layering in the lexer, where `TokenTreesReader` contains a `StringReader`. This commit combines them and names the result `Lexer`, which is a more obvious name for it. The methods of `Lexer` are now split across `mod.rs` and `tokentrees.rs` which isn't ideal, but it doesn't seem worth moving a bunch of code to avoid it.

It has two different ways of being called.

Must be one of those cases where the function is too long and rustfmt bails out.

It's currently a bit ad hoc. This commit makes it more methodical, with pairs of match/no-match tests for all the relevant cases.

- Rename a misleading local `mk_kind` as `single_quoted`. - Use `fn` for all three arguments, for consistency.

- Use iterators instead of `for` loops. - Use `if`/`else` instead of `match`.

chenyukang · 2024-11-25T08:38:33Z

@bors r+ rollup

bors · 2024-11-25T08:38:37Z

📌 Commit 16a39bb has been approved by chenyukang

It is now in the queue for this repository.

…kang Lexer tweaks Some cleanups and small performance improvements. r? `@chenyukang`

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#132605 (CI: increase timeout from 4h to 6h) - rust-lang#133042 (btree: add `{Entry,VacantEntry}::insert_entry`) - rust-lang#133070 (Lexer tweaks) - rust-lang#133134 (Don't use a SyntheticProvider for literally every type) - rust-lang#133411 (the emscripten OS no longer exists on non-wasm targets) - rust-lang#133419 (Added a doc test for std::path::strip_prefix) - rust-lang#133430 (Tweak parameter mismatch explanation to not say `{unknown}`) - rust-lang#133435 (miri: disable test_downgrade_observe test on macOS) r? `@ghost` `@rustbot` modify labels: rollup

…kang Lexer tweaks Some cleanups and small performance improvements. r? ``@chenyukang``

Rollup of 28 pull requests Successful merges: - rust-lang#132605 (CI: increase timeout from 4h to 6h) - rust-lang#133042 (btree: add `{Entry,VacantEntry}::insert_entry`) - rust-lang#133070 (Lexer tweaks) - rust-lang#133136 (Support ranges in `<[T]>::get_many_mut()`) - rust-lang#133140 (Inline ExprPrecedence::order into Expr::precedence) - rust-lang#133248 (CI: split x86_64-msvc-ext job) - rust-lang#133282 (Shorten the `MaybeUninit` `Debug` implementation) - rust-lang#133304 (Revert diagnostics hack to fix ICE 132920) - rust-lang#133326 (Remove the `DefinitelyInitializedPlaces` analysis.) - rust-lang#133362 (No need to re-sort existential preds in relate impl) - rust-lang#133367 (Simplify array length mismatch error reporting (to not try to turn consts into target usizes)) - rust-lang#133394 (Bail on more errors in dyn ty lowering) - rust-lang#133410 (target check_consistency: ensure target feature string makes some basic sense) - rust-lang#133411 (the emscripten OS no longer exists on non-wasm targets) - rust-lang#133419 (Added a doc test for std::path::strip_prefix) - rust-lang#133430 (Tweak parameter mismatch explanation to not say `{unknown}`) - rust-lang#133435 (miri: disable test_downgrade_observe test on macOS) - rust-lang#133443 (Remove dead code stemming from the old effects desugaring (II)) - rust-lang#133449 (std: expose `const_io_error!` as `const_error!`) - rust-lang#133450 (remove "onur-ozkan" from users_on_vacation) - rust-lang#133454 (Update test expectations to accept LLVM 'initializes' attribute) - rust-lang#133458 (Fix `Result` and `Option` not getting a jump to def link generated) - rust-lang#133462 (Use ReadCache for archive reading in bootstrap) - rust-lang#133464 (std::thread: avoid leading whitespace in some panic messages) - rust-lang#133467 (tests: Add recursive associated type bound regression tests) - rust-lang#133470 (Cleanup: delete `//@ pretty-expanded` directive) - rust-lang#133473 (tests: Add regression test for recursive enum with Cow and Clone) - rust-lang#133481 (Disable `avr-rjmp-offset` on Windows for now) r? `@ghost` `@rustbot` modify labels: rollup

…mpiler-errors Rollup of 12 pull requests Successful merges: - rust-lang#133042 (btree: add `{Entry,VacantEntry}::insert_entry`) - rust-lang#133070 (Lexer tweaks) - rust-lang#133136 (Support ranges in `<[T]>::get_many_mut()`) - rust-lang#133140 (Inline ExprPrecedence::order into Expr::precedence) - rust-lang#133155 (Yet more `rustc_mir_dataflow` cleanups) - rust-lang#133282 (Shorten the `MaybeUninit` `Debug` implementation) - rust-lang#133326 (Remove the `DefinitelyInitializedPlaces` analysis.) - rust-lang#133362 (No need to re-sort existential preds in relate impl) - rust-lang#133367 (Simplify array length mismatch error reporting (to not try to turn consts into target usizes)) - rust-lang#133394 (Bail on more errors in dyn ty lowering) - rust-lang#133410 (target check_consistency: ensure target feature string makes some basic sense) - rust-lang#133435 (miri: disable test_downgrade_observe test on macOS) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#133070 - nnethercote:lexer-tweaks, r=chenyukang Lexer tweaks Some cleanups and small performance improvements. r? ```@chenyukang```

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 Nov 15, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 15, 2024

Auto merge of rust-lang#133070 - nnethercote:lexer-tweaks, r=<try>

3b55679

Lexer tweaks r? `@ghost`

This comment has been minimized.

Sign in to view

rustbot added the perf-regression Performance regression. label Nov 16, 2024

nnethercote added 6 commits November 25, 2024 16:10

Split Lexer::bump.

593cf68

It has two different ways of being called.

Fix some formatting.

ba1a1dd

Must be one of those cases where the function is too long and rustfmt bails out.

Improve strip_shebang testing.

11c96cf

It's currently a bit ad hoc. This commit makes it more methodical, with pairs of match/no-match tests for all the relevant cases.

Clean up c_or_byte_string.

4cd2840

- Rename a misleading local `mk_kind` as `single_quoted`. - Use `fn` for all three arguments, for consistency.

Streamline lex_token_trees error handling.

16a39bb

- Use iterators instead of `for` loops. - Use `if`/`else` instead of `match`.

nnethercote force-pushed the lexer-tweaks branch from ac1311b to 16a39bb Compare November 25, 2024 05:30

nnethercote marked this pull request as ready for review November 25, 2024 08:11

rustbot assigned chenyukang Nov 25, 2024

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 Nov 25, 2024

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 25, 2024

Rollup merge of rust-lang#133070 - nnethercote:lexer-tweaks, r=chenyu…

d7aa5ae

…kang Lexer tweaks Some cleanups and small performance improvements. r? `@chenyukang`

matthiaskrgr mentioned this pull request Nov 25, 2024

Rollup of 8 pull requests #133442

Closed

jhpratt added a commit to jhpratt/rust that referenced this pull request Nov 26, 2024

Rollup merge of rust-lang#133070 - nnethercote:lexer-tweaks, r=chenyu…

3ff0332

…kang Lexer tweaks Some cleanups and small performance improvements. r? ``@chenyukang``

jhpratt mentioned this pull request Nov 26, 2024

Rollup of 28 pull requests #133490

Closed

compiler-errors mentioned this pull request Nov 26, 2024

Rollup of 12 pull requests #133505

Merged

bors merged commit 9d6a11a into rust-lang:master Nov 27, 2024
6 checks passed

rustbot added this to the 1.85.0 milestone Nov 27, 2024

nnethercote deleted the lexer-tweaks branch November 27, 2024 03:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Lexer tweaks #133070

Lexer tweaks #133070

nnethercote commented Nov 15, 2024 •

edited

Loading

nnethercote commented Nov 15, 2024

bors commented Nov 15, 2024

bors commented Nov 15, 2024

clubby789 commented Nov 16, 2024

This comment has been minimized.

rust-timer commented Nov 16, 2024

chenyukang commented Nov 25, 2024

bors commented Nov 25, 2024

Lexer tweaks #133070

Lexer tweaks #133070

Conversation

nnethercote commented Nov 15, 2024 • edited Loading

nnethercote commented Nov 15, 2024

bors commented Nov 15, 2024

bors commented Nov 15, 2024

clubby789 commented Nov 16, 2024

This comment has been minimized.

rust-timer commented Nov 16, 2024

Overall result: ❌✅ regressions and improvements - please read the text below

Instruction count

Max RSS (memory usage)

Cycles

Binary size

chenyukang commented Nov 25, 2024

bors commented Nov 25, 2024

nnethercote commented Nov 15, 2024 •

edited

Loading