Skip to content

[1/2] clean-up / general improvements#126088

Merged
bors merged 10 commits intorust-lang:masterfrom
onur-ozkan:brooming
Jun 14, 2024
Merged

[1/2] clean-up / general improvements#126088
bors merged 10 commits intorust-lang:masterfrom
onur-ozkan:brooming

Conversation

@onur-ozkan
Copy link
Copy Markdown
Contributor

@onur-ozkan onur-ozkan commented Jun 6, 2024

This PR applies various clippy suggestions on the tools. I have only applied the ones that make sense and left out trivial changes (e.g., suggestions like 'remove &' are ignored to keep the original commit history for the lines).

I am planning to do the same for the library and compiler, but those will add too many changes to this PR, so I will handle them in a separate PR later.

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Jun 6, 2024

r? @albertlarsan68

rustbot has assigned @albertlarsan68.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jun 6, 2024
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Jun 6, 2024

Some changes occurred in src/tools/compiletest

cc @jieyouxu

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

Some changes occurred in src/tools/opt-dist

cc @Kobzol

jieyouxu
jieyouxu approved these changes Jun 6, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

compiletest changes LGTM, just one nit

@rust-log-analyzer

This comment has been minimized.

Sign in to view
kadiwa4
kadiwa4 reviewed Jun 7, 2024
View reviewed changes
src/tools/lint-docs/src/lib.rs Outdated
if self.doc_contains("{{produces}}") {
return Err(format!(
return Err(
"the lint example has `ignore`, but also contains the {{{{produces}}}} marker\n\
Copy link
Copy Markdown
Contributor

@kadiwa4 kadiwa4 Jun 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it seems you forgot to unescape the braces in this string

Copy link
Copy Markdown
Contributor Author

@onur-ozkan onur-ozkan Jun 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done https://github.com/rust-lang/rust/compare/a7ab37d0d510da9d9f4a4a93f31aef10c8f277e3..eaa45c8b28468e8ec46bf364eeead996bcc3df8c, thanks!

albertlarsan68
albertlarsan68 reviewed Jun 7, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@albertlarsan68 albertlarsan68 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for the general changes, but let's wait on the maintainers of the tools

@Kobzol
Copy link
Copy Markdown
Member

Kobzol commented Jun 12, 2024

opt-dist change fine by me 👍

@albertlarsan68
Copy link
Copy Markdown
Member

albertlarsan68 commented Jun 13, 2024

I think everyone approved, so @bors r+

@bors
Copy link
Copy Markdown
Collaborator

bors commented Jun 13, 2024

📌 Commit eaa45c8 has been approved by albertlarsan68

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 Jun 13, 2024
fmease added a commit to fmease/rust that referenced this pull request Jun 13, 2024
@fmease
Rollup merge of rust-lang#126088 - onur-ozkan:brooming, r=albertlarsan68
c2399cd 
[1/2] clean-up / general improvements

This PR applies various clippy suggestions on the tools. I have only applied the ones that make sense and left out trivial changes (e.g., suggestions like 'remove &' are ignored to keep the original commit history for the lines).

I am planning to do the same for the library and compiler, but those will add too many changes to this PR, so I will handle them in a separate PR later.
@fmease fmease mentioned this pull request Jun 13, 2024
Closed
@bors
Copy link
Copy Markdown
Collaborator

bors commented Jun 13, 2024

☔ The latest upstream changes (presumably #126396) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 13, 2024
@onur-ozkan
compiletest: apply considerable clippy suggestions
cc65413 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
build_helper: apply considerable clippy suggestions
a5ef43e 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
build-manifest: apply considerable clippy suggestions
4a7c138 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
jsondoclint: apply considerable clippy suggestions
481dcb0 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
remote-test-server: apply considerable clippy suggestions
c755df2 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
remote-test-client: apply considerable clippy suggestions
5aa3fbc 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
lint-docs: apply considerable clippy suggestions
80d96df 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
opt-dist: apply considerable clippy suggestions
a31b1b2 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
tidy: apply considerable clippy suggestions
d12f1a7 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
fix bootstrap CI failure
c8d2b93 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
Copy link
Copy Markdown
Contributor Author

onur-ozkan commented Jun 13, 2024

Rebased.

@bors r=albertlarsan68

@bors
Copy link
Copy Markdown
Collaborator

bors commented Jun 13, 2024

📌 Commit c8d2b93 has been approved by albertlarsan68

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 Jun 13, 2024
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 13, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 13, 2024
@bors
Auto merge of rust-lang#126439 - matthiaskrgr:rollup-856xt18, r=matth…
8ff13a6 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#123726 (Clarify `Command::new` behavior for programs with arguments)
 - rust-lang#126088 ([1/2] clean-up / general improvements)
 - rust-lang#126238 (Fix Miri sysroot for `x run`)
 - rust-lang#126315 (Add pub struct with allow(dead_code) into worklist)
 - rust-lang#126360 (Uplift `structural_traits.rs` into the new trait solver)
 - rust-lang#126371 (Tweak output of import suggestions)
 - rust-lang#126388 (const-eval: make lint scope computation consistent)
 - rust-lang#126390 (Fix wording in {checked_}next_power_of_two)
 - rust-lang#126392 (Small style improvement in `gvn.rs`)
 - rust-lang#126402 (Fix wrong `assert_unsafe_precondition` message for `core::ptr::copy`)

r? `@ghost`
`@rustbot` modify labels: rollup
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 13, 2024
@workingjubilee
Rollup merge of rust-lang#126088 - onur-ozkan:brooming, r=albertlarsan68
b96c7ef 
[1/2] clean-up / general improvements

This PR applies various clippy suggestions on the tools. I have only applied the ones that make sense and left out trivial changes (e.g., suggestions like 'remove &' are ignored to keep the original commit history for the lines).

I am planning to do the same for the library and compiler, but those will add too many changes to this PR, so I will handle them in a separate PR later.
@workingjubilee workingjubilee mentioned this pull request Jun 13, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 13, 2024
@bors
Auto merge of rust-lang#126446 - workingjubilee:rollup-esdbgdw, r=wor…
bdef683 
…kingjubilee

Rollup of 8 pull requests

Successful merges:

 - rust-lang#121216 (Always emit `native-static-libs` note, even if it is empty)
 - rust-lang#123726 (Clarify `Command::new` behavior for programs with arguments)
 - rust-lang#125722 (Indicate in `non_local_defs` lint that the macro needs to change)
 - rust-lang#126088 ([1/2] clean-up / general improvements)
 - rust-lang#126390 (Fix wording in {checked_}next_power_of_two)
 - rust-lang#126392 (Small style improvement in `gvn.rs`)
 - rust-lang#126402 (Fix wrong `assert_unsafe_precondition` message for `core::ptr::copy`)
 - rust-lang#126445 (Remove failing GUI test to stop blocking CI until it is fixed)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 13, 2024
@bors
Auto merge of rust-lang#126446 - workingjubilee:rollup-esdbgdw, r=wor…
2165cf6 
…kingjubilee

Rollup of 8 pull requests

Successful merges:

 - rust-lang#121216 (Always emit `native-static-libs` note, even if it is empty)
 - rust-lang#123726 (Clarify `Command::new` behavior for programs with arguments)
 - rust-lang#125722 (Indicate in `non_local_defs` lint that the macro needs to change)
 - rust-lang#126088 ([1/2] clean-up / general improvements)
 - rust-lang#126390 (Fix wording in {checked_}next_power_of_two)
 - rust-lang#126392 (Small style improvement in `gvn.rs`)
 - rust-lang#126402 (Fix wrong `assert_unsafe_precondition` message for `core::ptr::copy`)
 - rust-lang#126445 (Remove failing GUI test to stop blocking CI until it is fixed)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 14, 2024
@bors
Auto merge of rust-lang#126439 - matthiaskrgr:rollup-856xt18, r=matth…
bfa098e 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#123726 (Clarify `Command::new` behavior for programs with arguments)
 - rust-lang#126088 ([1/2] clean-up / general improvements)
 - rust-lang#126238 (Fix Miri sysroot for `x run`)
 - rust-lang#126315 (Add pub struct with allow(dead_code) into worklist)
 - rust-lang#126360 (Uplift `structural_traits.rs` into the new trait solver)
 - rust-lang#126371 (Tweak output of import suggestions)
 - rust-lang#126388 (const-eval: make lint scope computation consistent)
 - rust-lang#126390 (Fix wording in {checked_}next_power_of_two)
 - rust-lang#126392 (Small style improvement in `gvn.rs`)
 - rust-lang#126402 (Fix wrong `assert_unsafe_precondition` message for `core::ptr::copy`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c22ee45 into rust-lang:master Jun 14, 2024
@rustbot rustbot added this to the 1.81.0 milestone Jun 14, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 14, 2024
@rust-timer
Unrolled build for rust-lang#126088
0d82ff0 
Rollup merge of rust-lang#126088 - onur-ozkan:brooming, r=albertlarsan68

[1/2] clean-up / general improvements

This PR applies various clippy suggestions on the tools. I have only applied the ones that make sense and left out trivial changes (e.g., suggestions like 'remove &' are ignored to keep the original commit history for the lines).

I am planning to do the same for the library and compiler, but those will add too many changes to this PR, so I will handle them in a separate PR later.
@onur-ozkan onur-ozkan deleted the brooming branch June 14, 2024 05:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@albertlarsan68 albertlarsan68 albertlarsan68 left review comments

@jieyouxu jieyouxu jieyouxu approved these changes

+1 more reviewer

@kadiwa4 kadiwa4 kadiwa4 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@albertlarsan68 albertlarsan68

Labels

A-rustdoc-json Area: Rustdoc JSON backend A-testsuite Area: The testsuite used to check the correctness of rustc 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.81.0

Development

Successfully merging this pull request may close these issues.

8 participants

@onur-ozkan @rustbot @rust-log-analyzer @Kobzol @albertlarsan68 @bors @kadiwa4 @jieyouxu