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

nits: Cleanups in librustdoc::clean #134799

Merged
merged 1 commit into from
Dec 29, 2024
Merged

nits: Cleanups in librustdoc::clean #134799

merged 1 commit into from
Dec 29, 2024

Conversation

poliorcetics
Copy link
Contributor

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Dec 26, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
Copy link
Member

Apart from my comment (need to check if new condition is valid), looks good to me. Very nice to see less mutability. :)

@poliorcetics poliorcetics force-pushed the ab/push-xuxotrnrtysz branch 2 times, most recently from 3ac793f to c9c044b Compare December 28, 2024 22:36
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-json Area: Rustdoc JSON backend A-testsuite Area: The testsuite used to check the correctness of rustc O-unix Operating system: Unix-like O-windows Operating system: Windows T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Dec 28, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 28, 2024

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to the CTFE machinery

cc @rust-lang/wg-const-eval

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

triagebot.toml has been modified, there may have been changes to the review queue.

cc @davidtwco, @wesleywiser

The Miri subtree was changed

cc @rust-lang/miri

These commits modify the library/Cargo.lock file. Unintentional changes to library/Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes occurred in src/tools/compiletest

cc @jieyouxu

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

These commits modify compiler targets.
(See the Target Tier Policy.)

Some changes occurred in src/tools/cargo

cc @ehuss

Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter
gets adapted for the changes, if necessary.

cc @rust-lang/miri, @rust-lang/wg-const-eval

@rustbot rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 28, 2024
@rustbot

This comment has been minimized.

Sign in to view
@poliorcetics
nits: librustdoc::clean
f5c4975 
- librustdoc::clean::clean_lifetime doesn't need a mut doc context
- librustdoc::clean::normalize doesn't need a mut doc context
- move Some() wrapping up into `clean_predicate()`
- simplify nested if in librustdoc::clean::record_extern_fqn()
@rustbot rustbot removed has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 28, 2024
@poliorcetics
Copy link
Contributor Author

I'm sorry for the mess with the merge commits 😓

@GuillaumeGomez
Copy link
Member

Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 29, 2024

📌 Commit f5c4975 has been approved by GuillaumeGomez

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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 29, 2024
Zalathar added a commit to Zalathar/rust that referenced this pull request Dec 29, 2024
@Zalathar
Rollup merge of rust-lang#134799 - poliorcetics:ab/push-xuxotrnrtysz,…
68d06b4 
… r=GuillaumeGomez

nits: Cleanups in `librustdoc::clean`

r? `@GuillaumeGomez`
@Zalathar Zalathar mentioned this pull request Dec 29, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 29, 2024
@bors
Auto merge of rust-lang#134878 - Zalathar:rollup-ebqmxw7, r=Zalathar
4a7bd52 
Rollup of 4 pull requests

Successful merges:

 - rust-lang#122565 (Try to write the panic message with a single `write_all` call)
 - rust-lang#133460 (Use `check-run-results` for `run-fail` test stderr)
 - rust-lang#134627 (Avoid ICE in borrowck)
 - rust-lang#134799 (nits: Cleanups in `librustdoc::clean`)

r? `@ghost`
`@rustbot` modify labels: rollup
Zalathar added a commit to Zalathar/rust that referenced this pull request Dec 29, 2024
@Zalathar
Rollup merge of rust-lang#134799 - poliorcetics:ab/push-xuxotrnrtysz,…
8dc9921 
… r=GuillaumeGomez

nits: Cleanups in `librustdoc::clean`

r? ``@GuillaumeGomez``
@Zalathar Zalathar mentioned this pull request Dec 29, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 29, 2024
@bors
Auto merge of rust-lang#134879 - Zalathar:rollup-olayokx, r=Zalathar
869b3cc 
Rollup of 3 pull requests

Successful merges:

 - rust-lang#133460 (Use `check-run-results` for `run-fail` test stderr)
 - rust-lang#134627 (Avoid ICE in borrowck)
 - rust-lang#134799 (nits: Cleanups in `librustdoc::clean`)

r? `@ghost`
`@rustbot` modify labels: rollup
Zalathar added a commit to Zalathar/rust that referenced this pull request Dec 29, 2024
@Zalathar
Rollup merge of rust-lang#134799 - poliorcetics:ab/push-xuxotrnrtysz,…
c08e750 
… r=GuillaumeGomez

nits: Cleanups in `librustdoc::clean`

r? ```@GuillaumeGomez```
This was referenced Dec 29, 2024
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 29, 2024
@bors
Auto merge of rust-lang#134887 - Zalathar:rollup-ghpz7oy, r=Zalathar
64feb9b 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#134799 (nits: Cleanups in `librustdoc::clean`)
 - rust-lang#134851 (docs: inline `alloc::ffi::c_str` types to `alloc::ffi`)
 - rust-lang#134869 (Bump compiler cc)
 - rust-lang#134876 (bootstrap: Consolidate the macros for declaring compiletest test suites)
 - rust-lang#134883 (bootstrap: Fix `./x check bootstrap` by moving `shared_helpers::tests`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 42a372f into rust-lang:master Dec 29, 2024
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 29, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 29, 2024
@rust-timer
Unrolled build for rust-lang#134799
33bf783 
Rollup merge of rust-lang#134799 - poliorcetics:ab/push-xuxotrnrtysz, r=GuillaumeGomez

nits: Cleanups in `librustdoc::clean`

r? ````@GuillaumeGomez````
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

Labels
A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-json Area: Rustdoc JSON backend A-testsuite Area: The testsuite used to check the correctness of rustc O-unix Operating system: Unix-like O-windows Operating system: Windows S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.85.0
Development

Successfully merging this pull request may close these issues.
5 participants
@poliorcetics @rust-log-analyzer @GuillaumeGomez @rustbot @bors