Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

desugar_doc_comments cleanups #114081

Merged
merged 4 commits into from
Jul 27, 2023
Merged

desugar_doc_comments cleanups #114081

merged 4 commits into from
Jul 27, 2023

Conversation

nnethercote
Copy link
Contributor

@nnethercote
Remove Parser::desugar_doc_comments.
39d51bd 
It's currently stored twice: once in `Parser`, once in the `TokenStream`
within `Parser`. We only need the latter.
@nnethercote
Tweak Parser::look_ahead.
395e95c 
It doesn't really matter what the `desugar_doc_comments` argument is
here, because in practice we never look ahead through doc comments.
Changing it to `cursor.desugar_doc_comments` will allow some follow-up
simplifications.
@nnethercote
Remove desugar_doc_comments arguments from `TokenCursor::{inlined_,…
8bfc692 
…}next`.

Because it's now always `self.desugar_doc_comments`.
@nnethercote
Add a comment to TokenCursor::desugar_doc_comments.
34b218e 
Useful information that took me some time to discern.
@rustbot 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 Jul 26, 2023
@nnethercote
Copy link
Contributor Author

Best reviewed one commit at a time.

Local measurements suggest some tiny instruction count wins, let's double check on CI:
@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 26, 2023
@bors
Copy link
Contributor

bors commented Jul 26, 2023

⌛ Trying commit 34b218e with merge 4f6c0a8e42fced09d45fabcde7b8bfb351e7eebe...

@bors
Copy link
Contributor

bors commented Jul 26, 2023

☀️ Try build successful - checks-actions
Build commit: 4f6c0a8e42fced09d45fabcde7b8bfb351e7eebe (4f6c0a8e42fced09d45fabcde7b8bfb351e7eebe)

@rust-timer

This comment has been minimized.

Sign in to view
@petrochenkov
Copy link
Contributor

r=me after perf run completes.
@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 26, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4f6c0a8e42fced09d45fabcde7b8bfb351e7eebe): comparison URL.

Overall result: ✅ improvements - no 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.

@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
Improvements ✅
(primary)		 -0.5% [-0.5%, -0.5%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.5% [-0.5%, -0.5%] 1

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.6% [2.6%, 2.6%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

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: 650.255s -> 648.846s (-0.22%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 27, 2023
@nnethercote
Copy link
Contributor Author

Perf effects are negligible on CI, and this makes the code nicer.

@bors r=petrochenkov rollup

@bors
Copy link
Contributor

bors commented Jul 27, 2023

📌 Commit 34b218e has been approved by petrochenkov

It is now in the queue for this repository.

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 27, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 27, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 27, 2023
@bors
Auto merge of rust-lang#114116 - matthiaskrgr:rollup-dtdfk76, r=matth…
3e11b22 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#113872 (Tweak CGU sorting in a couple of places.)
 - rust-lang#114053 (CI: fix CMake installation for 32/64 bit `dist` Linux)
 - rust-lang#114075 (inline format!() args from rustc_codegen_llvm to the end (4))
 - rust-lang#114081 (`desugar_doc_comments` cleanups)
 - rust-lang#114082 (add stable NullaryOp)
 - rust-lang#114098 (replace atty crate with std's IsTerminal)
 - rust-lang#114102 (Dont pass `-Zwrite-long-types-to-disk=no` for `ui-fulldeps --stage=1`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a926c73 into rust-lang:master Jul 27, 2023
11 checks passed
@rustbot rustbot added this to the 1.73.0 milestone Jul 27, 2023
@nnethercote nnethercote deleted the desugar_doc_comments-cleanups branch July 27, 2023 23:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.73.0
Development

Successfully merging this pull request may close these issues.
5 participants
@nnethercote @rust-timer @bors @petrochenkov @rustbot