Skip to content

Commit fbad4e6

Browse files
authored
Merge pull request #19448 from Veykril/push-lkmyospxqrzz
ci: Require miri step
2 parents d3aeddf + 7a1e9c4 commit fbad4e6

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ env:
1515
CARGO_NET_RETRY: 10
1616
CI: 1
1717
RUST_BACKTRACE: short
18-
RUSTFLAGS: "-D warnings"
1918
RUSTUP_MAX_RETRIES: 10
2019

2120
jobs:
@@ -45,6 +44,9 @@ jobs:
4544
if: github.repository == 'rust-lang/rust-analyzer' && needs.changes.outputs.proc_macros == 'true'
4645
name: proc-macro-srv
4746
runs-on: ubuntu-latest
47+
env:
48+
RUSTFLAGS: "-D warnings"
49+
4850
steps:
4951
- name: Checkout repository
5052
uses: actions/checkout@v4
@@ -73,6 +75,7 @@ jobs:
7375
name: Rust
7476
runs-on: ${{ matrix.os }}
7577
env:
78+
RUSTFLAGS: "-D warnings"
7679
CC: deny_c
7780

7881
strategy:
@@ -168,7 +171,7 @@ jobs:
168171
- name: Cache Dependencies
169172
uses: Swatinem/rust-cache@9bdad043e88c75890e36ad3bbc8d27f0090dd609
170173

171-
- run: cargo +nightly miri test --locked
174+
- run: cargo +nightly miri test -p intern --locked
172175

173176
# Weird targets to catch non-portable code
174177
rust-cross:
@@ -181,6 +184,7 @@ jobs:
181184
# The rust-analyzer binary is not expected to compile on WASM, but the IDE
182185
# crate should
183186
targets_ide: "wasm32-unknown-unknown"
187+
RUSTFLAGS: "-D warnings"
184188

185189
steps:
186190
- name: Checkout repository
@@ -283,7 +287,7 @@ jobs:
283287
run: typos
284288

285289
conclusion:
286-
needs: [rust, rust-cross, typescript, typo-check, proc-macro-srv]
290+
needs: [rust, rust-cross, typescript, typo-check, proc-macro-srv, miri]
287291
# We need to ensure this job does *not* get skipped if its dependencies fail,
288292
# because a skipped job is considered a success by GitHub. So we have to
289293
# overwrite `if:`. We use `!cancelled()` to ensure the job does still not get run

crates/hir-ty/src/infer/closure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ impl HirPlace {
223223
kind: MutBorrowKind::Default | MutBorrowKind::TwoPhasedBorrow,
224224
}) = current_capture
225225
{
226-
if self.projections[len..].iter().any(|it| *it == ProjectionElem::Deref) {
226+
if self.projections[len..].contains(&ProjectionElem::Deref) {
227227
current_capture =
228228
CaptureKind::ByRef(BorrowKind::Mut { kind: MutBorrowKind::ClosureCapture });
229229
}

crates/project-model/src/build_dependencies.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -343,11 +343,7 @@ impl WorkspaceBuildScripts {
343343
Message::CompilerArtifact(message) => {
344344
with_output_for(&message.package_id.repr, &mut |name, data| {
345345
progress(format!("building proc-macros: {name}"));
346-
if message
347-
.target
348-
.kind
349-
.iter()
350-
.any(|k| *k == cargo_metadata::TargetKind::ProcMacro)
346+
if message.target.kind.contains(&cargo_metadata::TargetKind::ProcMacro)
351347
{
352348
// Skip rmeta file
353349
if let Some(filename) =

xtask/src/tidy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ impl TidyDocs {
254254
d.file_name()
255255
.unwrap_or_default()
256256
.to_str()
257-
.map(|f_n| file_names.iter().any(|name| *name == f_n))
257+
.map(|f_n| file_names.contains(&f_n))
258258
.unwrap_or(false)
259259
}
260260
}

0 commit comments

Comments
 (0)