Skip to content

Commit d20509c

Browse files
committed
Auto merge of #145749 - flip1995:clippy-subtree-update, r=Manishearth
Clippy subtree update r? `@Manishearth`
2 parents f5703d5 + 9a348e8 commit d20509c

File tree

142 files changed

+1823
-1050
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+1823
-1050
lines changed

src/tools/clippy/.github/workflows/clippy_dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
# Setup
1818
- name: Checkout
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020
with:
2121
# Unsetting this would make so that any malicious package could get our Github Token
2222
persist-credentials: false

src/tools/clippy/.github/workflows/clippy_mq.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
# Setup
3838
- name: Checkout
39-
uses: actions/checkout@v4
39+
uses: actions/checkout@v5
4040
with:
4141
persist-credentials: false
4242

@@ -96,7 +96,7 @@ jobs:
9696
steps:
9797
# Setup
9898
- name: Checkout
99-
uses: actions/checkout@v4
99+
uses: actions/checkout@v5
100100
with:
101101
persist-credentials: false
102102

@@ -114,7 +114,7 @@ jobs:
114114
steps:
115115
# Setup
116116
- name: Checkout
117-
uses: actions/checkout@v4
117+
uses: actions/checkout@v5
118118
with:
119119
persist-credentials: false
120120

@@ -170,7 +170,7 @@ jobs:
170170
steps:
171171
# Setup
172172
- name: Checkout
173-
uses: actions/checkout@v4
173+
uses: actions/checkout@v5
174174
with:
175175
persist-credentials: false
176176

src/tools/clippy/.github/workflows/clippy_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
# Setup
2626
- name: Checkout
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2828
with:
2929
# Unsetting this would make so that any malicious package could get our Github Token
3030
persist-credentials: false

src/tools/clippy/.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ jobs:
2525
steps:
2626
# Setup
2727
- name: Checkout
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v5
2929
with:
3030
# Unsetting this would make so that any malicious package could get our Github Token
3131
persist-credentials: false
3232

3333
- name: Checkout
34-
uses: actions/checkout@v4
34+
uses: actions/checkout@v5
3535
with:
3636
ref: ${{ env.TARGET_BRANCH }}
3737
path: 'out'

src/tools/clippy/.github/workflows/feature_freeze.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
permissions:
1717
pull-requests: write
1818

19-
# Do not in any case add code that runs anything coming from the the content
19+
# Do not in any case add code that runs anything coming from the content
2020
# of the pull request, as malicious code would be able to access the private
2121
# GitHub token.
2222
steps:

src/tools/clippy/.github/workflows/lintcheck.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2828
with:
2929
fetch-depth: 2
3030
# Unsetting this would make so that any malicious package could get our Github Token
@@ -80,7 +80,7 @@ jobs:
8080

8181
steps:
8282
- name: Checkout
83-
uses: actions/checkout@v4
83+
uses: actions/checkout@v5
8484
with:
8585
# Unsetting this would make so that any malicious package could get our Github Token
8686
persist-credentials: false
@@ -113,7 +113,7 @@ jobs:
113113

114114
steps:
115115
- name: Checkout
116-
uses: actions/checkout@v4
116+
uses: actions/checkout@v5
117117
with:
118118
# Unsetting this would make so that any malicious package could get our Github Token
119119
persist-credentials: false

src/tools/clippy/.github/workflows/remark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
# Setup
1313
- name: Checkout
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515
with:
1616
# Unsetting this would make so that any malicious package could get our Github Token
1717
persist-credentials: false

src/tools/clippy/CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ All contributors are expected to follow the [Rust Code of Conduct].
1717
- [High level approach](#high-level-approach)
1818
- [Finding something to fix/improve](#finding-something-to-fiximprove)
1919
- [Getting code-completion for rustc internals to work](#getting-code-completion-for-rustc-internals-to-work)
20-
- [IntelliJ Rust](#intellij-rust)
20+
- [RustRover](#rustrover)
2121
- [Rust Analyzer](#rust-analyzer)
2222
- [How Clippy works](#how-clippy-works)
2323
- [Issue and PR triage](#issue-and-pr-triage)
@@ -92,22 +92,22 @@ an AST expression).
9292

9393
## Getting code-completion for rustc internals to work
9494

95-
### IntelliJ Rust
96-
Unfortunately, [`IntelliJ Rust`][IntelliJ_rust_homepage] does not (yet?) understand how Clippy uses compiler-internals
95+
### RustRover
96+
Unfortunately, [`RustRover`][RustRover_homepage] does not (yet?) understand how Clippy uses compiler-internals
9797
using `extern crate` and it also needs to be able to read the source files of the rustc-compiler which are not
9898
available via a `rustup` component at the time of writing.
9999
To work around this, you need to have a copy of the [rustc-repo][rustc_repo] available which can be obtained via
100100
`git clone https://github.com/rust-lang/rust/`.
101101
Then you can run a `cargo dev` command to automatically make Clippy use the rustc-repo via path-dependencies
102-
which `IntelliJ Rust` will be able to understand.
102+
which `RustRover` will be able to understand.
103103
Run `cargo dev setup intellij --repo-path <repo-path>` where `<repo-path>` is a path to the rustc repo
104104
you just cloned.
105105
The command will add path-dependencies pointing towards rustc-crates inside the rustc repo to
106-
Clippy's `Cargo.toml`s and should allow `IntelliJ Rust` to understand most of the types that Clippy uses.
106+
Clippy's `Cargo.toml`s and should allow `RustRover` to understand most of the types that Clippy uses.
107107
Just make sure to remove the dependencies again before finally making a pull request!
108108

109109
[rustc_repo]: https://github.com/rust-lang/rust/
110-
[IntelliJ_rust_homepage]: https://intellij-rust.github.io/
110+
[RustRover_homepage]: https://www.jetbrains.com/rust/
111111

112112
### Rust Analyzer
113113
For [`rust-analyzer`][ra_homepage] to work correctly make sure that in the `rust-analyzer` configuration you set

src/tools/clippy/Cargo.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,14 @@ harness = false
6464
[[test]]
6565
name = "dogfood"
6666
harness = false
67+
68+
# quine-mc_cluskey makes up a significant part of the runtime in dogfood
69+
# due to the number of conditions in the clippy_lints crate
70+
# and enabling optimizations for that specific dependency helps a bit
71+
# without increasing total build times.
72+
[profile.dev.package.quine-mc_cluskey]
73+
opt-level = 3
74+
75+
[lints.rust.unexpected_cfgs]
76+
level = "warn"
77+
check-cfg = ['cfg(bootstrap)']

src/tools/clippy/book/src/continuous_integration/github_actions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
clippy_check:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
- name: Run Clippy
2020
run: cargo clippy --all-targets --all-features
2121
```

0 commit comments

Comments
 (0)