Skip to content

Commit 10e3130

Browse files
author
Lea Fairbanks
authored
Merge branch 'rust-lang:master' into self-uninstall-remove-toolchains
2 parents 600e57b + fe90448 commit 10e3130

File tree

191 files changed

+10036
-7146
lines changed

Some content is hidden

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

191 files changed

+10036
-7146
lines changed

Diff for: ‎.cirrus.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# This is ci/actions-templates/linux-builds-template.yaml
2+
# Do not edit this file in .cirrus.yml
3+
4+
task:
5+
name: FreeBSD
6+
freebsd_instance:
7+
image: freebsd-13-0-release-amd64
8+
setup_script: |
9+
pkg install -y git gmake bash
10+
echo "========="
11+
echo "create non-root user and log into it"
12+
pw group add -n tester
13+
pw user add -n tester -g tester -s `which bash`
14+
pw user mod tester -d `pwd`
15+
chown -R tester .
16+
sudo -u tester bash ci/cirrus-templates/script.bash

Diff for: ‎.envrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
use flake

Diff for: ‎.github/ISSUE_TEMPLATE/bug_report.md

-26
This file was deleted.

Diff for: ‎.github/ISSUE_TEMPLATE/bug_report.yml

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: Bug report
2+
description: Create a report to help us improve
3+
labels: [bug]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: >
8+
**Thanks for filing a 🐛 bug report 😄!**
9+
10+
- type: textarea
11+
id: problem
12+
attributes:
13+
label: Problem
14+
description: >
15+
A clear and concise description of what the bug is,
16+
including what currently happens and what you expected to happen.
17+
validations:
18+
required: true
19+
20+
- type: textarea
21+
id: steps
22+
attributes:
23+
label: Steps
24+
description: The steps to reproduce the bug.
25+
placeholder: |
26+
1.
27+
2.
28+
3.
29+
validations:
30+
required: true
31+
32+
- type: textarea
33+
id: solutions
34+
attributes:
35+
label: Possible Solution(s)
36+
description: >
37+
Not obligatory, but suggest a fix/reason for the bug,
38+
or ideas how to implement the addition or change.
39+
40+
- type: textarea
41+
id: notes
42+
attributes:
43+
label: Notes
44+
45+
- type: textarea
46+
id: version
47+
attributes:
48+
label: Rustup version
49+
description: Output of `rustup --version`
50+
render: console
51+
validations:
52+
required: true
53+
54+
- type: textarea
55+
id: toolchains
56+
attributes:
57+
label: Installed toolchains
58+
description: Output of `rustup show`
59+
render: console
60+
validations:
61+
required: true

Diff for: ‎.github/ISSUE_TEMPLATE/enhancement_request.md

-16
This file was deleted.

Diff for: ‎.github/ISSUE_TEMPLATE/enhancement_request.yml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Enhancement request
2+
description: Suggest an enhancement for this project
3+
labels: [enhancement]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: >
8+
**Thanks for filing an 🙋 enhancement request 😄!**
9+
10+
- type: textarea
11+
id: problem
12+
attributes:
13+
label: Problem you are trying to solve
14+
description: >
15+
A clear and concise description of the problem this enhancement request is trying to solve.
16+
validations:
17+
required: true
18+
19+
- type: textarea
20+
id: solution
21+
attributes:
22+
label: Solution you'd like
23+
description: >
24+
A clear and concise description of what you want to happen.
25+
validations:
26+
required: true
27+
28+
- type: textarea
29+
id: notes
30+
attributes:
31+
label: Notes
32+
description: >
33+
Any additional context or information you feel may be relevant to the issue.

Diff for: ‎.github/ISSUE_TEMPLATE/wsl_panic.md

-55
This file was deleted.

Diff for: ‎.github/ISSUE_TEMPLATE/wsl_panic.yml

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
name: I am experiencing a panic on WSL
2+
description: Report a panic when using Rustup on WSL
3+
labels: [bug]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: >
8+
Please read the following very carefully and decide if you
9+
actually need to file this bug...
10+
11+
WSL, specifically WSL 1, has a limitation where glibc 2.31 and
12+
newer will panic, fundamentally the panic will look something
13+
like the following:
14+
15+
thread 'main' panicked at 'assertion failed: `(left == right)`
16+
left: `22`,
17+
right: `4`', src/libstd/sys/unix/thread.rs:166:21
18+
19+
This is a bug, but it's a bug in WSL, not in Rust/Rustup and will
20+
affect other programs built with Rust too. Working around it
21+
with Rustup will not help you until WSL (or glibc) is fixed.
22+
23+
This is known to affect:
24+
25+
* Ubuntu 20.04
26+
* Arch Linux
27+
28+
But it may affect other versions of Linux on WSL1.
29+
30+
You can find more information on the WSL bug report
31+
[here](https://github.com/microsoft/WSL/issues/4898).
32+
33+
If you're CERTAIN that you're not reporting yet another duplicate
34+
of the above issue, then...
35+
36+
**Thanks for filing a 🐛 bug report 😄!**
37+
38+
- type: textarea
39+
id: problem
40+
attributes:
41+
label: Problem
42+
description: >
43+
A clear and concise description of what the bug is,
44+
including what currently happens and what you expected to happen.
45+
validations:
46+
required: true
47+
48+
- type: textarea
49+
id: steps
50+
attributes:
51+
label: Steps
52+
description: The steps to reproduce the bug.
53+
placeholder: |
54+
1.
55+
2.
56+
3.
57+
validations:
58+
required: true
59+
60+
- type: textarea
61+
id: solutions
62+
attributes:
63+
label: Possible Solution(s)
64+
description: >
65+
Not obligatory, but suggest a fix/reason for the bug,
66+
or ideas how to implement the addition or change.
67+
68+
- type: textarea
69+
id: notes
70+
attributes:
71+
label: Notes
72+
73+
- type: textarea
74+
id: version
75+
attributes:
76+
label: Rustup version
77+
description: Output of `rustup --version`
78+
render: console
79+
validations:
80+
required: true
81+
82+
- type: textarea
83+
id: toolchains
84+
attributes:
85+
label: Installed toolchains
86+
description: Output of `rustup show`
87+
render: console
88+
validations:
89+
required: true

Diff for: ‎.github/renovate.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:base"
5+
],
6+
"labels": [
7+
"dependencies"
8+
],
9+
"lockFileMaintenance": {
10+
"enabled": true
11+
},
12+
"prCreation": "not-pending",
13+
"rangeStrategy": "replace",
14+
"stabilityDays": 3,
15+
"github-actions": {
16+
"fileMatch": [
17+
"^ci\\/.*/[^/]+\\.ya?ml$"
18+
]
19+
}
20+
}

Diff for: ‎.github/workflows/centos-fmt-clippy-on-all.yaml

+10-9
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
branches:
1212
- master
1313
- stable
14+
- renovate/*
1415
schedule:
1516
- cron: "30 0 * * 1" # Every Monday at half past midnight
1617

@@ -21,7 +22,7 @@ jobs:
2122
strategy:
2223
fail-fast: false
2324
steps:
24-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v3
2526
with:
2627
# v2 defaults to a shallow checkout, but we need at least to the previous tag
2728
fetch-depth: 0
@@ -39,7 +40,7 @@ jobs:
3940
run: |
4041
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
4142
- name: Cache cargo registry and git trees
42-
uses: actions/cache@v2
43+
uses: actions/cache@v3
4344
with:
4445
path: |
4546
~/.cargo/registry
@@ -48,10 +49,10 @@ jobs:
4849
- name: Get rustc commit hash
4950
id: cargo-target-cache
5051
run: |
51-
echo "::set-output name=rust_hash::$(rustc -Vv | grep commit-hash | awk '{print $2}')"
52+
echo "{rust_hash}={$(rustc -Vv | grep commit-hash | awk '{print $2}')}" >> $GITHUB_OUTPUT
5253
shell: bash
5354
- name: Cache cargo build
54-
uses: actions/cache@v2
55+
uses: actions/cache@v3
5556
with:
5657
path: target
5758
key: ${{ github.base_ref }}-${{ github.head_ref }}-${{ runner.os }}-cargo-clippy-target-dir-${{ steps.cargo-target-cache.outputs.rust_hash }}-${{ hashFiles('**/Cargo.lock') }}
@@ -78,16 +79,16 @@ jobs:
7879
--tty \
7980
--init \
8081
--rm \
81-
centos:6 \
82+
centos:7 \
8283
sh ./ci/raw_init.sh
8384
- name: Run shell checks
8485
run: |
85-
shellcheck -s dash -- rustup-init.sh
86-
git ls-files -- '*.sh' | xargs shellcheck -s dash -e SC1090
87-
git ls-files -- '*.bash' | xargs shellcheck -s bash -e SC1090
86+
shellcheck -x -s dash -- rustup-init.sh
87+
git ls-files -- '*.sh' | xargs shellcheck -x -s dash
88+
git ls-files -- '*.bash' | xargs shellcheck -x -s bash
8889
- name: Run formatting checks
8990
run: |
90-
cargo fmt --all -- --check
91+
cargo fmt --all --check
9192
- name: Run cargo check and clippy
9293
run: |
9394
cargo check --all --all-targets

Diff for: ‎.github/workflows/deploy-docs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Documentation
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515
with:
1616
fetch-depth: 0
1717
- name: Install mdbook

0 commit comments

Comments
 (0)