Skip to content

Commit b7b0408

Browse files
chore: update pinned nightly to 2025-04-05, clippy fixes (#1840)
Not going past 2024-04-05 due to rustc linker regression on windows: rust-lang/rust#139821
1 parent 2cb6ee8 commit b7b0408

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

hydro_lang/src/location/cluster/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl<C> Debug for Cluster<'_, C> {
2828
impl<C> Eq for Cluster<'_, C> {}
2929
impl<C> PartialEq for Cluster<'_, C> {
3030
fn eq(&self, other: &Self) -> bool {
31-
self.id == other.id && self.flow_state.as_ptr() == other.flow_state.as_ptr()
31+
self.id == other.id && FlowState::ptr_eq(&self.flow_state, &other.flow_state)
3232
}
3333
}
3434

hydro_lang/src/location/process.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ impl<P> Debug for Process<'_, P> {
2020
impl<P> Eq for Process<'_, P> {}
2121
impl<P> PartialEq for Process<'_, P> {
2222
fn eq(&self, other: &Self) -> bool {
23-
self.id == other.id && self.flow_state.as_ptr() == other.flow_state.as_ptr()
23+
self.id == other.id && FlowState::ptr_eq(&self.flow_state, &other.flow_state)
2424
}
2525
}
2626

precheck.bash

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ if [ "$TEST_HYDRO_CLI" = true ]; then
5959
fi
6060

6161
if [ "$TEST_ALL" = true ]; then
62-
TARGETS="--all-targets"
62+
TARGETS="--workspace"
6363
elif [ "" = "$TARGETS" ]; then
6464
echo "$0: No targets specified.
6565
Try '$0 --help' for more information.
@@ -71,10 +71,11 @@ fi
7171
set -x
7272

7373
cargo +nightly fmt --all
74-
cargo clippy $TARGETS --features python -- -D warnings
74+
cargo clippy $TARGETS --all-targets --features dfir_rs/python -- -D warnings
7575
[ "$TEST_ALL" = false ] || cargo check --all-targets --no-default-features
7676

77-
INSTA_FORCE_PASS=1 INSTA_UPDATE=always TRYBUILD=overwrite cargo test $TARGETS --no-fail-fast --features python
77+
# `--all-targets` is everything except `--doc`: https://github.com/rust-lang/cargo/issues/6669.
78+
INSTA_FORCE_PASS=1 INSTA_UPDATE=always TRYBUILD=overwrite cargo test $TARGETS --all-targets --no-fail-fast --features dfir_rs/python
7879
cargo test $TARGETS --doc
7980

8081
[ "$TEST_DFIR" = false ] || CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=wasm-bindgen-test-runner cargo test -p dfir_rs --target wasm32-unknown-unknown --tests --no-fail-fast

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2-
channel = "nightly-2025-03-10" # Make sure to update `template/*/rust-toolchain.toml` as well.
2+
channel = "nightly-2025-04-05" # Make sure to update `template/*/rust-toolchain.toml` as well.
33
components = [
44
"rustfmt",
55
"clippy",

template/dfir/rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[toolchain]
2-
channel = "nightly-2025-03-10"
2+
channel = "nightly-2025-04-05"

template/hydro/rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
2-
channel = "nightly-2025-03-10"
2+
channel = "nightly-2025-04-05"
33
components = ["rustfmt", "clippy"]
44
targets = ["x86_64-unknown-linux-musl"]

0 commit comments

Comments
 (0)