Skip to content

Commit 5a10a7c

Browse files
committed
Auto merge of #3291 - rust-lang:rustup-2024-02-06, r=saethlin
Automatic Rustup
2 parents dcae0f7 + ac4d629 commit 5a10a7c

File tree

241 files changed

+4405
-4712
lines changed

Some content is hidden

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

241 files changed

+4405
-4712
lines changed

.github/workflows/ci.yaml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
- name: Switch to stable toolchain
9191
run: |
9292
rustup update --no-self-update stable
93-
rustup component add --toolchain stable rust-src
93+
rustup component add --toolchain stable rust-src clippy
9494
rustup default stable
9595
9696
- name: Run analysis-stats on rust-analyzer
@@ -103,6 +103,10 @@ jobs:
103103
RUSTC_BOOTSTRAP: 1
104104
run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats --with-deps $(rustc --print sysroot)/lib/rustlib/src/rust/library/std
105105

106+
- name: clippy
107+
if: matrix.os == 'ubuntu-latest'
108+
run: cargo clippy --all-targets
109+
106110
# Weird targets to catch non-portable code
107111
rust-cross:
108112
if: github.repository == 'rust-lang/rust-analyzer'
@@ -203,11 +207,25 @@ jobs:
203207
working-directory: ./editors/code
204208
if: needs.changes.outputs.typescript == 'true'
205209

210+
typo-check:
211+
name: Typo Check
212+
runs-on: ubuntu-latest
213+
timeout-minutes: 10
214+
env:
215+
FORCE_COLOR: 1
216+
TYPOS_VERSION: v1.18.0
217+
steps:
218+
- name: download typos
219+
run: curl -LsSf https://github.com/crate-ci/typos/releases/download/$TYPOS_VERSION/typos-$TYPOS_VERSION-x86_64-unknown-linux-musl.tar.gz | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
220+
221+
- name: check for typos
222+
run: typos
223+
206224
end-success:
207225
name: bors build finished
208226
if: github.event.pusher.name == 'bors' && success()
209227
runs-on: ubuntu-latest
210-
needs: [rust, rust-cross, typescript]
228+
needs: [rust, rust-cross, typescript, typo-check]
211229
steps:
212230
- name: Mark the job as successful
213231
run: exit 0
@@ -216,7 +234,7 @@ jobs:
216234
name: bors build finished
217235
if: github.event.pusher.name == 'bors' && !success()
218236
runs-on: ubuntu-latest
219-
needs: [rust, rust-cross, typescript]
237+
needs: [rust, rust-cross, typescript, typo-check]
220238
steps:
221239
- name: Mark the job as a failure
222240
run: exit 1

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ jobs:
4343
- os: ubuntu-20.04
4444
target: arm-unknown-linux-gnueabihf
4545
code-target: linux-armhf
46-
- os: macos-11
46+
- os: macos-12
4747
target: x86_64-apple-darwin
4848
code-target: darwin-x64
49-
- os: macos-11
49+
- os: macos-12
5050
target: aarch64-apple-darwin
5151
code-target: darwin-arm64
5252

.typos.toml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
[default.extend-identifiers]
2+
AnserStyle = "AnserStyle"
3+
datas = "datas"
4+
impl_froms = "impl_froms"
5+
selfs = "selfs"
6+
7+
[default.extend-words]
8+
anser = "anser"
9+
ba = "ba"
10+
fo = "fo"
11+
ket = "ket"
12+
makro = "makro"
13+
raison = "raison"
14+
trivias = "trivias"
15+
TOOD = "TOOD"
16+
17+
[default]
18+
extend-ignore-re = [
19+
# ignore string which contains $x (x is a num), which use widely in test
20+
".*\\$\\d.*",
21+
# ignore generated content like `boxed....nner()`, `Defaul...efault`
22+
"\\w*\\.{3,4}\\w*",
23+
]
24+
25+
[files]
26+
extend-exclude = [
27+
"*.json",
28+
"*.rast",
29+
"crates/parser/test_data/lexer/err/*",
30+
"bench_data/*",
31+
]

0 commit comments

Comments
 (0)