Skip to content

Commit 5d35e44

Browse files
committed
Merge branch 'master' into mo-order
2 parents f4e64bd + a616c4d commit 5d35e44

File tree

350 files changed

+12436
-7776
lines changed

Some content is hidden

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

350 files changed

+12436
-7776
lines changed

.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xtask = "run --package xtask --bin xtask --"
33
tq = "test -- -q"
44
qt = "tq"
5-
lint = "clippy --all-targets -- -Aclippy::collapsible_if -Aclippy::needless_pass_by_value -Aclippy::nonminimal_bool -Aclippy::redundant_pattern_matching --cap-lints warn"
5+
lint = "clippy --all-targets -- --cap-lints warn"
66

77
[target.x86_64-pc-windows-msvc]
88
linker = "rust-lld"

.github/workflows/ci.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ jobs:
3838
- 'crates/proc-macro-api/**'
3939
- 'crates/proc-macro-srv/**'
4040
- 'crates/proc-macro-srv-cli/**'
41-
- 'crates/proc-macro-test/**'
4241
4342
rust:
4443
needs: changes

.github/workflows/metrics.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
other_metrics:
6868
strategy:
6969
matrix:
70-
names: [self, ripgrep-13.0.0, webrender-2022, diesel-1.4.8, hyper-0.14.18]
70+
names: [self, rustc_tests, ripgrep-13.0.0, webrender-2022, diesel-1.4.8, hyper-0.14.18]
7171
runs-on: ubuntu-latest
7272
needs: [setup_cargo, build_metrics]
7373

@@ -118,6 +118,11 @@ jobs:
118118
with:
119119
name: self-${{ github.sha }}
120120

121+
- name: Download rustc_tests metrics
122+
uses: actions/download-artifact@v3
123+
with:
124+
name: rustc_tests-${{ github.sha }}
125+
121126
- name: Download ripgrep-13.0.0 metrics
122127
uses: actions/download-artifact@v3
123128
with:
@@ -146,7 +151,7 @@ jobs:
146151
chmod 700 ~/.ssh
147152
148153
git clone --depth 1 git@github.com:rust-analyzer/metrics.git
149-
jq -s ".[0] * .[1] * .[2] * .[3] * .[4] * .[5]" build.json self.json ripgrep-13.0.0.json webrender-2022.json diesel-1.4.8.json hyper-0.14.18.json -c >> metrics/metrics.json
154+
jq -s ".[0] * .[1] * .[2] * .[3] * .[4] * .[5] * .[6]" build.json self.json rustc_tests.json ripgrep-13.0.0.json webrender-2022.json diesel-1.4.8.json hyper-0.14.18.json -c >> metrics/metrics.json
150155
cd metrics
151156
git add .
152157
git -c user.name=Bot -c user.email=dummy@example.com commit --message 📈

0 commit comments

Comments
 (0)