Skip to content

Commit 68fda4b

Browse files
committed
Merge branch 'master' into binary-heap-ta
2 parents b105bb1 + 89d08df commit 68fda4b

File tree

2,224 files changed

+77534
-26859
lines changed

Some content is hidden

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

2,224 files changed

+77534
-26859
lines changed

.cargo/config.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ target-dir = "target"
1111

1212
[unstable]
1313
binary-dep-depinfo = true
14+
15+
[profile.dev]
16+
split-debuginfo = "unpacked"

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ trim_trailing_whitespace = true
1111
insert_final_newline = true
1212
indent_style = space
1313
indent_size = 4
14+
max_line_length = 120
1415

1516
[*.md]
1617
# double whitespace at end of line

.github/ISSUE_TEMPLATE/new_lint.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,6 @@ body:
1212
description: What does this lint do?
1313
validations:
1414
required: true
15-
- type: input
16-
id: lint-name
17-
attributes:
18-
label: Lint Name
19-
description: Please provide the lint name.
20-
- type: dropdown
21-
id: category
22-
attributes:
23-
label: Category
24-
description: >
25-
What category should this lint go into? If you're unsure you can select
26-
multiple categories. You can find a category description in the
27-
`README`.
28-
multiple: true
29-
options:
30-
- correctness
31-
- suspicious
32-
- style
33-
- complexity
34-
- perf
35-
- pedantic
36-
- restriction
37-
- cargo
3815
- type: textarea
3916
id: advantage
4017
attributes:

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@ Thank you for making Clippy better!
33
We're collecting our changelog from pull request descriptions.
44
If your PR only includes internal changes, you can just write
55
`changelog: none`. Otherwise, please write a short comment
6-
explaining your change. Also, it's helpful for us that
7-
the lint name is put into brackets `[]` and backticks `` ` ` ``,
8-
e.g. ``[`lint_name`]``.
6+
explaining your change.
97

10-
If your PR fixes an issue, you can add "fixes #issue_number" into this
8+
It's also helpful for us that the lint name is put within backticks (`` ` ` ``),
9+
and then encapsulated by square brackets (`[]`), for example:
10+
```
11+
changelog: [`lint_name`]: your change
12+
```
13+
14+
If your PR fixes an issue, you can add `fixes #issue_number` into this
1115
PR description. This way the issue will be automatically closed when
1216
your PR is merged.
1317

.github/driver.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ test "$sysroot" = $desired_sysroot
1717
sysroot=$(SYSROOT=$desired_sysroot ./target/debug/clippy-driver --print sysroot)
1818
test "$sysroot" = $desired_sysroot
1919

20+
# Check that the --sysroot argument is only passed once (SYSROOT is ignored)
21+
(
22+
cd rustc_tools_util
23+
touch src/lib.rs
24+
SYSROOT=/tmp RUSTFLAGS="--sysroot=$(rustc --print sysroot)" ../target/debug/cargo-clippy clippy --verbose
25+
)
26+
2027
# Make sure this isn't set - clippy-driver should cope without it
2128
unset CARGO_MANIFEST_DIR
2229

.github/workflows/clippy.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ env:
2424
RUST_BACKTRACE: 1
2525
CARGO_TARGET_DIR: '${{ github.workspace }}/target'
2626
NO_FMT_TEST: 1
27+
CARGO_INCREMENTAL: 0
28+
CARGO_UNSTABLE_SPARSE_REGISTRY: true
2729

2830
jobs:
2931
base:
@@ -37,7 +39,7 @@ jobs:
3739
github_token: "${{ secrets.github_token }}"
3840

3941
- name: Checkout
40-
uses: actions/checkout@v3.0.2
42+
uses: actions/checkout@v3
4143

4244
- name: Install toolchain
4345
run: rustup show active-toolchain

.github/workflows/clippy_bors.yml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ env:
1010
RUST_BACKTRACE: 1
1111
CARGO_TARGET_DIR: '${{ github.workspace }}/target'
1212
NO_FMT_TEST: 1
13+
CARGO_INCREMENTAL: 0
14+
CARGO_UNSTABLE_SPARSE_REGISTRY: true
1315

1416
defaults:
1517
run:
@@ -25,7 +27,7 @@ jobs:
2527
github_token: "${{ secrets.github_token }}"
2628

2729
- name: Checkout
28-
uses: actions/checkout@v3.0.2
30+
uses: actions/checkout@v3
2931
with:
3032
ref: ${{ github.ref }}
3133

@@ -80,15 +82,8 @@ jobs:
8082
with:
8183
github_token: "${{ secrets.github_token }}"
8284

83-
- name: Install dependencies (Linux-i686)
84-
run: |
85-
sudo dpkg --add-architecture i386
86-
sudo apt-get update
87-
sudo apt-get install gcc-multilib libssl-dev:i386 libgit2-dev:i386
88-
if: matrix.host == 'i686-unknown-linux-gnu'
89-
9085
- name: Checkout
91-
uses: actions/checkout@v3.0.2
86+
uses: actions/checkout@v3
9287

9388
- name: Install toolchain
9489
run: rustup show active-toolchain
@@ -144,7 +139,7 @@ jobs:
144139
OS: ${{ runner.os }}
145140

146141
metadata_collection:
147-
needs: base
142+
needs: changelog
148143
runs-on: ubuntu-latest
149144

150145
steps:
@@ -154,14 +149,19 @@ jobs:
154149
github_token: "${{ secrets.github_token }}"
155150

156151
- name: Checkout
157-
uses: actions/checkout@v3.0.2
152+
uses: actions/checkout@v3
158153

159154
- name: Install toolchain
160155
run: rustup show active-toolchain
161156

162157
- name: Test metadata collection
163158
run: cargo collect-metadata
164159

160+
- name: Test lint_configuration.md is up-to-date
161+
run: |
162+
echo "run \`cargo collect-metadata\` if this fails"
163+
git update-index --refresh
164+
165165
integration_build:
166166
needs: changelog
167167
runs-on: ubuntu-latest
@@ -173,13 +173,15 @@ jobs:
173173
github_token: "${{ secrets.github_token }}"
174174

175175
- name: Checkout
176-
uses: actions/checkout@v3.0.2
176+
uses: actions/checkout@v3
177177

178178
- name: Install toolchain
179179
run: rustup show active-toolchain
180180

181181
# Run
182182
- name: Build Integration Test
183+
env:
184+
CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: off
183185
run: cargo test --test integration --features integration --no-run
184186

185187
# Upload
@@ -231,7 +233,7 @@ jobs:
231233
github_token: "${{ secrets.github_token }}"
232234

233235
- name: Checkout
234-
uses: actions/checkout@v3.0.2
236+
uses: actions/checkout@v3
235237

236238
- name: Install toolchain
237239
run: rustup show active-toolchain
@@ -264,7 +266,7 @@ jobs:
264266
name: bors test finished
265267
if: github.event.pusher.name == 'bors' && success()
266268
runs-on: ubuntu-latest
267-
needs: [changelog, base, integration_build, integration]
269+
needs: [changelog, base, metadata_collection, integration_build, integration]
268270

269271
steps:
270272
- name: Mark the job as successful
@@ -274,7 +276,7 @@ jobs:
274276
name: bors test finished
275277
if: github.event.pusher.name == 'bors' && (failure() || cancelled())
276278
runs-on: ubuntu-latest
277-
needs: [changelog, base, integration_build, integration]
279+
needs: [changelog, base, metadata_collection, integration_build, integration]
278280

279281
steps:
280282
- name: Mark the job as a failure

.github/workflows/clippy_dev.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ on:
1515

1616
env:
1717
RUST_BACKTRACE: 1
18+
CARGO_INCREMENTAL: 0
19+
CARGO_UNSTABLE_SPARSE_REGISTRY: true
1820

1921
jobs:
2022
clippy_dev:
@@ -23,7 +25,7 @@ jobs:
2325
steps:
2426
# Setup
2527
- name: Checkout
26-
uses: actions/checkout@v3.0.2
28+
uses: actions/checkout@v3
2729

2830
# Run
2931
- name: Build

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
steps:
2222
# Setup
2323
- name: Checkout
24-
uses: actions/checkout@v3.0.2
24+
uses: actions/checkout@v3
2525

2626
- name: Checkout
27-
uses: actions/checkout@v3.0.2
27+
uses: actions/checkout@v3
2828
with:
2929
ref: ${{ env.TARGET_BRANCH }}
3030
path: 'out'

.github/workflows/remark.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
steps:
1717
# Setup
1818
- name: Checkout
19-
uses: actions/checkout@v3.0.2
19+
uses: actions/checkout@v3
2020

2121
- name: Setup Node.js
22-
uses: actions/setup-node@v1.4.4
22+
uses: actions/setup-node@v3
2323
with:
2424
node-version: '14.x'
2525

@@ -29,13 +29,19 @@ jobs:
2929
- name: Install mdbook
3030
run: |
3131
mkdir mdbook
32-
curl -Lf https://github.com/rust-lang/mdBook/releases/download/v0.4.18/mdbook-v0.4.18-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
32+
curl -Lf https://github.com/rust-lang/mdBook/releases/download/v0.4.28/mdbook-v0.4.28-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=./mdbook
3333
echo `pwd`/mdbook >> $GITHUB_PATH
3434
3535
# Run
3636
- name: Check *.md files
3737
run: git ls-files -z '*.md' | xargs -0 -n 1 -I {} ./node_modules/.bin/remark {} -u lint -f > /dev/null
3838

39+
- name: Linkcheck book
40+
run: |
41+
rustup toolchain install nightly --component rust-docs
42+
curl https://raw.githubusercontent.com/rust-lang/rust/master/src/tools/linkchecker/linkcheck.sh -o linkcheck.sh
43+
sh linkcheck.sh clippy --path ./book
44+
3945
- name: Build mdbook
4046
run: mdbook build book
4147

0 commit comments

Comments
 (0)