diff --git a/Cargo.toml b/Cargo.toml
index f9028196215..ed2056809ea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -93,7 +93,6 @@ hashql-syntax-jexpr.path            = "libs/@local/hashql/syntax-jexpr"
 type-system.path                    = "libs/@blockprotocol/type-system/rust"
 
 # External dependencies
-allocator-api2                     = { version = "0.2.8", default-features = false }
 annotate-snippets                  = { version = "0.12.8", default-features = false }
 ansi-to-html                       = { version = "0.2.2", default-features = false }
 anstream                           = { version = "0.6.21", default-features = false }
diff --git a/libs/@local/graph/authorization/tests/policies/main.rs b/libs/@local/graph/authorization/tests/policies/main.rs
index 83f647b9b64..68c86e07689 100644
--- a/libs/@local/graph/authorization/tests/policies/main.rs
+++ b/libs/@local/graph/authorization/tests/policies/main.rs
@@ -8,7 +8,7 @@ extern crate alloc;
 mod definitions;
 
 use alloc::borrow::Cow;
-use core::{assert_matches::assert_matches, error::Error, str::FromStr as _};
+use core::{assert_matches, error::Error, str::FromStr as _};
 use std::{collections::HashSet, sync::LazyLock};
 
 use hash_graph_authorization::policies::{
diff --git a/libs/@local/graph/postgres-store/tests/principals/actions.rs b/libs/@local/graph/postgres-store/tests/principals/actions.rs
index 980d283cde8..1a52b1156ba 100644
--- a/libs/@local/graph/postgres-store/tests/principals/actions.rs
+++ b/libs/@local/graph/postgres-store/tests/principals/actions.rs
@@ -1,4 +1,4 @@
-use core::{assert_matches::assert_matches, error::Error};
+use core::{assert_matches, error::Error};
 
 use hash_graph_authorization::policies::action::ActionName;
 use hash_graph_postgres_store::permissions::ActionError;
diff --git a/libs/@local/graph/postgres-store/tests/principals/ai.rs b/libs/@local/graph/postgres-store/tests/principals/ai.rs
index 9eaa3972ee9..4c1b4ea4e11 100644
--- a/libs/@local/graph/postgres-store/tests/principals/ai.rs
+++ b/libs/@local/graph/postgres-store/tests/principals/ai.rs
@@ -1,4 +1,4 @@
-use core::{assert_matches::assert_matches, error::Error};
+use core::{assert_matches, error::Error};
 
 use hash_graph_authorization::policies::store::{CreateWebParameter, PrincipalStore as _};
 use hash_graph_postgres_store::permissions::PrincipalError;
diff --git a/libs/@local/graph/postgres-store/tests/principals/machine.rs b/libs/@local/graph/postgres-store/tests/principals/machine.rs
index 7438142fdfe..bb3482f7b1d 100644
--- a/libs/@local/graph/postgres-store/tests/principals/machine.rs
+++ b/libs/@local/graph/postgres-store/tests/principals/machine.rs
@@ -1,4 +1,4 @@
-use core::{assert_matches::assert_matches, error::Error};
+use core::{assert_matches, error::Error};
 
 use hash_graph_authorization::policies::store::{CreateWebParameter, PrincipalStore as _};
 use hash_graph_postgres_store::permissions::PrincipalError;
diff --git a/libs/@local/graph/postgres-store/tests/principals/main.rs b/libs/@local/graph/postgres-store/tests/principals/main.rs
index 6e7c23126fc..c920a5f232a 100644
--- a/libs/@local/graph/postgres-store/tests/principals/main.rs
+++ b/libs/@local/graph/postgres-store/tests/principals/main.rs
@@ -60,9 +60,9 @@ impl DatabaseTestWrapper {
         let password =
             std::env::var("HASH_GRAPH_PG_PASSWORD").unwrap_or_else(|_| "graph".to_owned());
         let host = std::env::var("HASH_GRAPH_PG_HOST").unwrap_or_else(|_| "localhost".to_owned());
-        let port = std::env::var("HASH_GRAPH_PG_PORT")
-            .map(|port| port.parse::<u16>().expect("could not parse port"))
-            .unwrap_or(5432);
+        let port = std::env::var("HASH_GRAPH_PG_PORT").map_or(5432, |port| {
+            port.parse::<u16>().expect("could not parse port")
+        });
         let database =
             std::env::var("HASH_GRAPH_PG_DATABASE").unwrap_or_else(|_| "graph".to_owned());
 
diff --git a/libs/@local/graph/postgres-store/tests/principals/role.rs b/libs/@local/graph/postgres-store/tests/principals/role.rs
index 7d7da7177ff..3d8033e7811 100644
--- a/libs/@local/graph/postgres-store/tests/principals/role.rs
+++ b/libs/@local/graph/postgres-store/tests/principals/role.rs
@@ -1,4 +1,4 @@
-use core::{assert_matches::assert_matches, error::Error};
+use core::{assert_matches, error::Error};
 
 use hash_graph_authorization::policies::{
     principal::PrincipalConstraint,
diff --git a/libs/@local/graph/postgres-store/tests/principals/team.rs b/libs/@local/graph/postgres-store/tests/principals/team.rs
index 8ae6f88777f..aec7595da73 100644
--- a/libs/@local/graph/postgres-store/tests/principals/team.rs
+++ b/libs/@local/graph/postgres-store/tests/principals/team.rs
@@ -1,4 +1,4 @@
-use core::{assert_matches::assert_matches, error::Error};
+use core::{assert_matches, error::Error};
 
 use hash_graph_authorization::policies::store::{CreateWebParameter, PrincipalStore as _};
 use hash_graph_postgres_store::permissions::PrincipalError;
diff --git a/libs/@local/graph/postgres-store/tests/principals/user.rs b/libs/@local/graph/postgres-store/tests/principals/user.rs
index 3511d6eb11e..e51fb320746 100644
--- a/libs/@local/graph/postgres-store/tests/principals/user.rs
+++ b/libs/@local/graph/postgres-store/tests/principals/user.rs
@@ -1,4 +1,4 @@
-use core::{assert_matches::assert_matches, error::Error};
+use core::{assert_matches, error::Error};
 
 use hash_graph_postgres_store::permissions::PrincipalError;
 use hash_graph_store::account::AccountStore as _;
diff --git a/libs/@local/graph/postgres-store/tests/principals/web.rs b/libs/@local/graph/postgres-store/tests/principals/web.rs
index b42d4727366..411d64008a4 100644
--- a/libs/@local/graph/postgres-store/tests/principals/web.rs
+++ b/libs/@local/graph/postgres-store/tests/principals/web.rs
@@ -1,4 +1,4 @@
-use core::{assert_matches::assert_matches, error::Error};
+use core::{assert_matches, error::Error};
 
 use hash_graph_authorization::policies::store::{
     CreateWebParameter, PrincipalStore as _, error::WebCreationError,
diff --git a/libs/@local/harpc/net/src/session/client/connection/test.rs b/libs/@local/harpc/net/src/session/client/connection/test.rs
index 3cb2d51a6bc..053842011db 100644
--- a/libs/@local/harpc/net/src/session/client/connection/test.rs
+++ b/libs/@local/harpc/net/src/session/client/connection/test.rs
@@ -1,6 +1,6 @@
 use alloc::sync::Arc;
 use core::{
-    assert_matches::assert_matches,
+    assert_matches,
     sync::atomic::{AtomicUsize, Ordering},
     time::Duration,
 };
diff --git a/libs/@local/harpc/net/src/session/client/transaction/test.rs b/libs/@local/harpc/net/src/session/client/transaction/test.rs
index 2c2bc63c3ee..4256ef7a437 100644
--- a/libs/@local/harpc/net/src/session/client/transaction/test.rs
+++ b/libs/@local/harpc/net/src/session/client/transaction/test.rs
@@ -1,5 +1,5 @@
 use alloc::sync::Arc;
-use core::{assert_matches::assert_matches, num::NonZero, time::Duration};
+use core::{assert_matches, num::NonZero, time::Duration};
 
 use bytes::{Bytes, BytesMut};
 use futures::StreamExt as _;
diff --git a/libs/@local/harpc/net/src/session/server/connection/test.rs b/libs/@local/harpc/net/src/session/server/connection/test.rs
index 464c95c62c7..ca9f1a29557 100644
--- a/libs/@local/harpc/net/src/session/server/connection/test.rs
+++ b/libs/@local/harpc/net/src/session/server/connection/test.rs
@@ -1,6 +1,6 @@
 #![expect(clippy::significant_drop_tightening, reason = "this is test code")]
 use alloc::sync::Arc;
-use core::{assert_matches::assert_matches, num::NonZero, time::Duration};
+use core::{assert_matches, num::NonZero, time::Duration};
 use std::io;
 
 use bytes::Bytes;
diff --git a/libs/@local/harpc/net/src/transport/test.rs b/libs/@local/harpc/net/src/transport/test.rs
index 8187df56a02..988563f6fc6 100644
--- a/libs/@local/harpc/net/src/transport/test.rs
+++ b/libs/@local/harpc/net/src/transport/test.rs
@@ -1,6 +1,5 @@
 use core::{
-    assert_matches::assert_matches,
-    iter,
+    assert_matches, iter,
     net::Ipv4Addr,
     sync::atomic::{AtomicU64, Ordering},
     time::Duration,
diff --git a/libs/@local/harpc/server/src/session.rs b/libs/@local/harpc/server/src/session.rs
index 0a892d7dcf9..3f10221bcc6 100644
--- a/libs/@local/harpc/server/src/session.rs
+++ b/libs/@local/harpc/server/src/session.rs
@@ -289,7 +289,7 @@ impl<T, S> Task<T, S> {
             stream,
             // Default values
             cancel: CancellationToken::new(),
-            sweep_interval: Duration::from_secs(60),
+            sweep_interval: Duration::from_mins(1),
         }
     }
 
diff --git a/libs/@local/harpc/tower/src/body/encode_error.rs b/libs/@local/harpc/tower/src/body/encode_error.rs
index ebc35eeeae3..dafe234fc49 100644
--- a/libs/@local/harpc/tower/src/body/encode_error.rs
+++ b/libs/@local/harpc/tower/src/body/encode_error.rs
@@ -133,7 +133,7 @@ where
 
 #[cfg(test)]
 mod test {
-    use core::assert_matches::assert_matches;
+    use core::assert_matches;
 
     use bytes::Bytes;
     use harpc_types::{error_code::ErrorCode, response_kind::ResponseKind};
diff --git a/libs/@local/harpc/tower/src/body/encode_report.rs b/libs/@local/harpc/tower/src/body/encode_report.rs
index a189f379521..f80a90386df 100644
--- a/libs/@local/harpc/tower/src/body/encode_report.rs
+++ b/libs/@local/harpc/tower/src/body/encode_report.rs
@@ -136,7 +136,7 @@ where
 
 #[cfg(test)]
 mod test {
-    use core::assert_matches::assert_matches;
+    use core::assert_matches;
 
     use bytes::Bytes;
     use error_stack::Report;
diff --git a/libs/@local/harpc/tower/src/body/limited.rs b/libs/@local/harpc/tower/src/body/limited.rs
index ed29ab09924..b5b7da057cc 100644
--- a/libs/@local/harpc/tower/src/body/limited.rs
+++ b/libs/@local/harpc/tower/src/body/limited.rs
@@ -114,7 +114,7 @@ where
 #[cfg(test)]
 mod test {
 
-    use core::{assert_matches::assert_matches, task::Poll};
+    use core::{assert_matches, task::Poll};
 
     use bytes::Bytes;
     use error_stack::Report;
diff --git a/libs/@local/harpc/tower/src/body/timeout.rs b/libs/@local/harpc/tower/src/body/timeout.rs
index f5e449109ca..feae49c3524 100644
--- a/libs/@local/harpc/tower/src/body/timeout.rs
+++ b/libs/@local/harpc/tower/src/body/timeout.rs
@@ -105,7 +105,7 @@ where
 
 #[cfg(test)]
 mod test {
-    use core::{assert_matches::assert_matches, time::Duration};
+    use core::{assert_matches, time::Duration};
 
     use bytes::Bytes;
     use error_stack::Report;
diff --git a/libs/@local/hashql/compiletest/src/annotation/diagnostic.rs b/libs/@local/hashql/compiletest/src/annotation/diagnostic.rs
index e0f8cf3d4da..ccdc92f6913 100644
--- a/libs/@local/hashql/compiletest/src/annotation/diagnostic.rs
+++ b/libs/@local/hashql/compiletest/src/annotation/diagnostic.rs
@@ -136,7 +136,7 @@ impl DiagnosticAnnotation {
 
 #[cfg(test)]
 mod tests {
-    use core::assert_matches::assert_matches;
+    use core::assert_matches;
 
     use super::*;
 
diff --git a/libs/@local/hashql/compiletest/src/annotation/directive.rs b/libs/@local/hashql/compiletest/src/annotation/directive.rs
index bc680a2bf06..0919970667b 100644
--- a/libs/@local/hashql/compiletest/src/annotation/directive.rs
+++ b/libs/@local/hashql/compiletest/src/annotation/directive.rs
@@ -127,7 +127,7 @@ impl Directive {
 
 #[cfg(test)]
 mod tests {
-    use core::assert_matches::assert_matches;
+    use core::assert_matches;
 
     use crate::annotation::directive::{Directive, DirectiveParseError, RunMode};
 
diff --git a/libs/@local/hashql/compiletest/src/annotation/file.rs b/libs/@local/hashql/compiletest/src/annotation/file.rs
index 0531aa3e5ca..21c315bf1fb 100644
--- a/libs/@local/hashql/compiletest/src/annotation/file.rs
+++ b/libs/@local/hashql/compiletest/src/annotation/file.rs
@@ -170,7 +170,7 @@ fn process_line_for_diagnostics(
 
 #[cfg(test)]
 mod tests {
-    use core::assert_matches::assert_matches;
+    use core::assert_matches;
     use std::io::Cursor;
 
     use crate::annotation::{
diff --git a/libs/@local/hashql/compiletest/src/executor/annotations.rs b/libs/@local/hashql/compiletest/src/executor/annotations.rs
index 5e81d6aba7a..85a3db27f7c 100644
--- a/libs/@local/hashql/compiletest/src/executor/annotations.rs
+++ b/libs/@local/hashql/compiletest/src/executor/annotations.rs
@@ -142,7 +142,7 @@ pub(crate) fn verify_annotations<S, R>(
 #[cfg(test)]
 mod tests {
     use core::{
-        assert_matches::assert_matches,
+        assert_matches,
         fmt::{self, Debug, Display},
     };
 
diff --git a/libs/@local/hashql/core/Cargo.toml b/libs/@local/hashql/core/Cargo.toml
index 038725456eb..72fc20456e6 100644
--- a/libs/@local/hashql/core/Cargo.toml
+++ b/libs/@local/hashql/core/Cargo.toml
@@ -30,7 +30,7 @@ ena                  = { workspace = true }
 lexical              = { workspace = true, features = ["parse-integers", "parse-floats", "format"] }
 memchr               = { workspace = true }
 rapidfuzz            = { workspace = true }
-roaring              = { workspace = true, features = ["std", "simd"] }
+roaring              = { workspace = true, features = ["std"] }
 rpds                 = { workspace = true, features = ["std"] }
 serde                = { workspace = true, optional = true, features = ["alloc", "derive"] }
 simple-mermaid       = { workspace = true }
diff --git a/libs/@local/hashql/core/src/module/namespace.rs b/libs/@local/hashql/core/src/module/namespace.rs
index a4ac10bf867..f2570859aad 100644
--- a/libs/@local/hashql/core/src/module/namespace.rs
+++ b/libs/@local/hashql/core/src/module/namespace.rs
@@ -454,7 +454,7 @@ impl<'env, 'heap> ModuleNamespace<'env, 'heap> {
 #[cfg(test)]
 mod tests {
     #![coverage(off)]
-    use core::assert_matches::assert_matches;
+    use core::assert_matches;
 
     use super::ModuleNamespace;
     use crate::{
diff --git a/libs/@local/hashql/core/src/module/resolver.rs b/libs/@local/hashql/core/src/module/resolver.rs
index d301c720127..c2edc6827b1 100644
--- a/libs/@local/hashql/core/src/module/resolver.rs
+++ b/libs/@local/hashql/core/src/module/resolver.rs
@@ -469,7 +469,7 @@ impl<'heap> Resolver<'_, 'heap> {
 #[cfg(test)]
 mod test {
     #![coverage(off)]
-    use core::assert_matches::assert_matches;
+    use core::assert_matches;
 
     use super::{Reference, ResolutionError};
     use crate::{
diff --git a/libs/@local/hashql/core/src/type/kind/tests/closure.rs b/libs/@local/hashql/core/src/type/kind/tests/closure.rs
index c93ff1a2c99..47f776a3e8e 100644
--- a/libs/@local/hashql/core/src/type/kind/tests/closure.rs
+++ b/libs/@local/hashql/core/src/type/kind/tests/closure.rs
@@ -1,4 +1,4 @@
-use core::assert_matches::assert_matches;
+use core::assert_matches;
 
 use rstest::rstest;
 
diff --git a/libs/@local/hashql/core/src/type/kind/tests/intersection.rs b/libs/@local/hashql/core/src/type/kind/tests/intersection.rs
index 800dac4deb2..496ce0f6b08 100644
--- a/libs/@local/hashql/core/src/type/kind/tests/intersection.rs
+++ b/libs/@local/hashql/core/src/type/kind/tests/intersection.rs
@@ -1,4 +1,4 @@
-use core::assert_matches::assert_matches;
+use core::assert_matches;
 
 use crate::{
     heap::Heap,
diff --git a/libs/@local/hashql/core/src/type/kind/tests/intrinsic.rs b/libs/@local/hashql/core/src/type/kind/tests/intrinsic.rs
index 75f0fc30717..894cc11bda7 100644
--- a/libs/@local/hashql/core/src/type/kind/tests/intrinsic.rs
+++ b/libs/@local/hashql/core/src/type/kind/tests/intrinsic.rs
@@ -1,4 +1,4 @@
-use core::assert_matches::assert_matches;
+use core::assert_matches;
 
 use hashql_diagnostics::Success;
 
diff --git a/libs/@local/hashql/core/src/type/kind/tests/opaque.rs b/libs/@local/hashql/core/src/type/kind/tests/opaque.rs
index 24ab6b80bde..6a4b4d63744 100644
--- a/libs/@local/hashql/core/src/type/kind/tests/opaque.rs
+++ b/libs/@local/hashql/core/src/type/kind/tests/opaque.rs
@@ -1,5 +1,5 @@
 #![expect(clippy::min_ident_chars)]
-use core::assert_matches::assert_matches;
+use core::assert_matches;
 
 use crate::{
     heap::Heap,
diff --git a/libs/@local/hashql/core/src/type/kind/tests/struct.rs b/libs/@local/hashql/core/src/type/kind/tests/struct.rs
index 4683bc0a9a7..0f57fe33e03 100644
--- a/libs/@local/hashql/core/src/type/kind/tests/struct.rs
+++ b/libs/@local/hashql/core/src/type/kind/tests/struct.rs
@@ -1,4 +1,4 @@
-use core::assert_matches::assert_matches;
+use core::assert_matches;
 
 use crate::{
     heap::Heap,
diff --git a/libs/@local/hashql/core/src/type/kind/tests/tuple.rs b/libs/@local/hashql/core/src/type/kind/tests/tuple.rs
index 33d395c060d..66087f921b7 100644
--- a/libs/@local/hashql/core/src/type/kind/tests/tuple.rs
+++ b/libs/@local/hashql/core/src/type/kind/tests/tuple.rs
@@ -1,4 +1,4 @@
-use core::assert_matches::assert_matches;
+use core::assert_matches;
 
 use crate::{
     heap::Heap,
diff --git a/libs/@local/hashql/core/src/type/kind/tests/union.rs b/libs/@local/hashql/core/src/type/kind/tests/union.rs
index b3e06ad81c7..f98643a0a51 100644
--- a/libs/@local/hashql/core/src/type/kind/tests/union.rs
+++ b/libs/@local/hashql/core/src/type/kind/tests/union.rs
@@ -1,4 +1,4 @@
-use core::assert_matches::assert_matches;
+use core::assert_matches;
 
 use crate::{
     heap::Heap,
diff --git a/libs/@local/hashql/core/src/type/kind/union.rs b/libs/@local/hashql/core/src/type/kind/union.rs
index 419cfe8628d..dbdb42d7f8a 100644
--- a/libs/@local/hashql/core/src/type/kind/union.rs
+++ b/libs/@local/hashql/core/src/type/kind/union.rs
@@ -1,4 +1,4 @@
-use core::{assert_matches::debug_assert_matches, ops::ControlFlow};
+use core::{debug_assert_matches, ops::ControlFlow};
 
 use bitvec::bitvec;
 use smallvec::SmallVec;
diff --git a/libs/@local/hashql/core/src/type/tests.rs b/libs/@local/hashql/core/src/type/tests.rs
index d42849012a9..7cb7f00d460 100644
--- a/libs/@local/hashql/core/src/type/tests.rs
+++ b/libs/@local/hashql/core/src/type/tests.rs
@@ -1,5 +1,5 @@
 #![expect(clippy::min_ident_chars, clippy::unwrap_used)]
-use core::{assert_matches::assert_matches, fmt::Debug, iter};
+use core::{assert_matches, fmt::Debug, iter};
 
 use super::{
     PartialType, TypeId, TypeKind,
diff --git a/libs/@local/hashql/eval/src/lib.rs b/libs/@local/hashql/eval/src/lib.rs
index 4ec8b2a08cd..7ecc2466f40 100644
--- a/libs/@local/hashql/eval/src/lib.rs
+++ b/libs/@local/hashql/eval/src/lib.rs
@@ -12,7 +12,6 @@
 
     // Library Features
     iterator_try_collect,
-    push_mut
 )]
 
 extern crate alloc;
diff --git a/libs/@local/hashql/mir/src/interpret/locals.rs b/libs/@local/hashql/mir/src/interpret/locals.rs
index 26079cefa07..13fcf958c13 100644
--- a/libs/@local/hashql/mir/src/interpret/locals.rs
+++ b/libs/@local/hashql/mir/src/interpret/locals.rs
@@ -396,7 +396,7 @@ mod tests {
     #![expect(unsafe_code)]
     use alloc::{alloc::Global, vec::Vec};
     use core::mem::MaybeUninit;
-    use std::assert_matches::assert_matches;
+    use std::assert_matches;
 
     use hashql_core::{
         heap::Heap,
diff --git a/libs/@local/hashql/mir/src/interpret/runtime.rs b/libs/@local/hashql/mir/src/interpret/runtime.rs
index 5fe8ce923b0..aad3cb82061 100644
--- a/libs/@local/hashql/mir/src/interpret/runtime.rs
+++ b/libs/@local/hashql/mir/src/interpret/runtime.rs
@@ -21,9 +21,7 @@
 //! 5. Returning the final value when the entry function returns
 
 use alloc::{alloc::Global, borrow::Cow};
-use core::{
-    alloc::Allocator, assert_matches::debug_assert_matches, hint::cold_path, ops::ControlFlow,
-};
+use core::{alloc::Allocator, debug_assert_matches, hint::cold_path, ops::ControlFlow};
 
 use hashql_core::{collections::FastHashMap, span::SpanId, symbol::Symbol};
 use hashql_hir::node::operation::{InputOp, UnOp};
diff --git a/libs/@local/hashql/mir/src/pass/transform/inst_simplify/tests.rs b/libs/@local/hashql/mir/src/pass/transform/inst_simplify/tests.rs
index 40bd831ed4b..de60807e6bc 100644
--- a/libs/@local/hashql/mir/src/pass/transform/inst_simplify/tests.rs
+++ b/libs/@local/hashql/mir/src/pass/transform/inst_simplify/tests.rs
@@ -1,5 +1,5 @@
 #![expect(clippy::min_ident_chars, reason = "tests")]
-use std::{assert_matches::assert_matches, io::Write as _, path::PathBuf};
+use std::{assert_matches, io::Write as _, path::PathBuf};
 
 use bstr::ByteVec as _;
 use hashql_core::{
diff --git a/libs/@local/hashql/mir/src/reify/mod.rs b/libs/@local/hashql/mir/src/reify/mod.rs
index 2561add3950..885f22c16b2 100644
--- a/libs/@local/hashql/mir/src/reify/mod.rs
+++ b/libs/@local/hashql/mir/src/reify/mod.rs
@@ -6,7 +6,7 @@ mod terminator;
 mod transform;
 mod types;
 
-use std::assert_matches::debug_assert_matches;
+use core::debug_assert_matches;
 
 use hashql_core::{
     collections::{
diff --git a/libs/@local/hashql/syntax-jexpr/src/parser/state.rs b/libs/@local/hashql/syntax-jexpr/src/parser/state.rs
index df37fbbe507..cd917bd0886 100644
--- a/libs/@local/hashql/syntax-jexpr/src/parser/state.rs
+++ b/libs/@local/hashql/syntax-jexpr/src/parser/state.rs
@@ -341,7 +341,7 @@ impl<'heap, 'source, 'spans> ParserState<'heap, 'source, 'spans> {
 #[cfg(test)]
 mod tests {
     use alloc::borrow::Cow;
-    use core::assert_matches::assert_matches;
+    use core::assert_matches;
 
     use crate::{
         lexer::{
diff --git a/libs/antsi/Cargo.toml b/libs/antsi/Cargo.toml
index 90678edb894..aecaaf65a15 100644
--- a/libs/antsi/Cargo.toml
+++ b/libs/antsi/Cargo.toml
@@ -7,7 +7,6 @@ rust-version  = "1.63.0"
 license       = "MIT OR Apache-2.0"
 description   = "A no-std mini-crate that provides support ANSI escape sequences"
 documentation = "https://docs.rs/antsi"
-readme        = "README.md"
 repository    = "https://github.com/hashintel/hash/tree/main/libs/antsi"
 keywords      = ["no_std", "ansi", "color", "term", "terminal"]
 categories    = ["no-std", "command-line-interface", "no-std::no-alloc"]
diff --git a/libs/error-stack/Cargo.toml b/libs/error-stack/Cargo.toml
index 7aad775706e..3c2ba403dd1 100644
--- a/libs/error-stack/Cargo.toml
+++ b/libs/error-stack/Cargo.toml
@@ -7,7 +7,6 @@ rust-version  = "1.83.0"
 license       = "MIT OR Apache-2.0"
 description   = "A context-aware error-handling library that supports arbitrary attached user data"
 documentation = "https://docs.rs/error-stack"
-readme        = "README.md"
 repository    = "https://github.com/hashintel/hash/tree/main/libs/error-stack"
 keywords      = ["error", "errorstack", "error-handling", "report", "no_std"]
 categories    = ["rust-patterns", "no-std"]
diff --git a/libs/error-stack/README.md b/libs/error-stack/README.md
index c77039adc16..f596ba84c96 100644
--- a/libs/error-stack/README.md
+++ b/libs/error-stack/README.md
@@ -7,7 +7,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/error-stack)][crates.io]
 [![libs.rs](https://img.shields.io/badge/libs.rs-error--stack-orange)][libs.rs]
-[![rust-version](https://img.shields.io/static/v1?label=Rust&message=1.83.0/nightly-2026-01-19&color=blue)][rust-version]
+[![rust-version](https://img.shields.io/static/v1?label=Rust&message=1.83.0/nightly-2026-02-02&color=blue)][rust-version]
 [![documentation](https://img.shields.io/docsrs/error-stack)][documentation]
 [![license](https://img.shields.io/crates/l/error-stack)][license]
 
diff --git a/libs/error-stack/macros/README.md b/libs/error-stack/macros/README.md
index 95834957792..eeae141af27 100644
--- a/libs/error-stack/macros/README.md
+++ b/libs/error-stack/macros/README.md
@@ -6,7 +6,7 @@
 
 [![crates.io](https://img.shields.io/crates/v/error-stack-macros)][crates.io]
 [![libs.rs](https://img.shields.io/badge/libs.rs-error--stack--macros-orange)][libs.rs]
-[![rust-version](https://img.shields.io/static/v1?label=Rust&message=1.83.0/nightly-2026-01-19&color=blue)][rust-version]
+[![rust-version](https://img.shields.io/static/v1?label=Rust&message=1.83.0/nightly-2026-02-02&color=blue)][rust-version]
 [![documentation](https://img.shields.io/docsrs/error-stack-macros)][documentation]
 [![license](https://img.shields.io/crates/l/error-stack)][license]
 
diff --git a/libs/error-stack/src/lib.rs b/libs/error-stack/src/lib.rs
index 54198f3d8af..f1a47bf57c4 100644
--- a/libs/error-stack/src/lib.rs
+++ b/libs/error-stack/src/lib.rs
@@ -2,7 +2,7 @@
 //!
 //! [![crates.io](https://img.shields.io/crates/v/error-stack)][crates.io]
 //! [![libs.rs](https://img.shields.io/badge/libs.rs-error--stack-orange)][libs.rs]
-//! [![rust-version](https://img.shields.io/static/v1?label=Rust&message=1.83.0/nightly-2026-01-19&color=blue)][rust-version]
+//! [![rust-version](https://img.shields.io/static/v1?label=Rust&message=1.83.0/nightly-2026-02-02&color=blue)][rust-version]
 //!
 //! [crates.io]: https://crates.io/crates/error-stack
 //! [libs.rs]: https://lib.rs/crates/error-stack
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 21dfb9bf559..b0f57584f8a 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel    = "nightly-2026-01-19"
+channel    = "nightly-2026-02-02"
 components = ['rustfmt', 'clippy', 'llvm-tools-preview', 'miri', 'rust-src', 'rust-analyzer', 'rustc-codegen-cranelift-preview']
diff --git a/tests/graph/benches/manual_queries/entity_queries/mod.rs b/tests/graph/benches/manual_queries/entity_queries/mod.rs
index 8a824e16350..72aa91f2225 100644
--- a/tests/graph/benches/manual_queries/entity_queries/mod.rs
+++ b/tests/graph/benches/manual_queries/entity_queries/mod.rs
@@ -393,12 +393,10 @@ fn bench_json_queries(crit: &mut Criterion) {
                 env::var("HASH_GRAPH_PG_USER").unwrap_or_else(|_| "graph".to_owned()),
                 env::var("HASH_GRAPH_PG_PASSWORD").unwrap_or_else(|_| "graph".to_owned()),
                 env::var("HASH_GRAPH_PG_HOST").unwrap_or_else(|_| "localhost".to_owned()),
-                env::var("HASH_GRAPH_PG_PORT")
-                    .map(|port| {
-                        port.parse::<u16>()
-                            .unwrap_or_else(|_| panic!("{port} is not a valid port"))
-                    })
-                    .unwrap_or(5432),
+                env::var("HASH_GRAPH_PG_PORT").map_or(5432, |port| {
+                    port.parse::<u16>()
+                        .unwrap_or_else(|_| panic!("{port} is not a valid port"))
+                }),
                 env::var("HASH_GRAPH_PG_DATABASE").unwrap_or_else(|_| "graph".to_owned()),
             ),
             &DatabasePoolConfig::default(),
diff --git a/tests/graph/benches/util.rs b/tests/graph/benches/util.rs
index 5d5aea2fcdd..a2e84b66534 100644
--- a/tests/graph/benches/util.rs
+++ b/tests/graph/benches/util.rs
@@ -83,12 +83,10 @@ impl StoreWrapper {
         let password =
             std::env::var("HASH_GRAPH_PG_PASSWORD").unwrap_or_else(|_| "graph".to_owned());
         let host = std::env::var("HASH_GRAPH_PG_HOST").unwrap_or_else(|_| "localhost".to_owned());
-        let port = std::env::var("HASH_GRAPH_PG_PORT")
-            .map(|port| {
-                port.parse::<u16>()
-                    .unwrap_or_else(|_| panic!("{port} is not a valid port"))
-            })
-            .unwrap_or(5432);
+        let port = std::env::var("HASH_GRAPH_PG_PORT").map_or(5432, |port| {
+            port.parse::<u16>()
+                .unwrap_or_else(|_| panic!("{port} is not a valid port"))
+        });
         let database =
             std::env::var("HASH_GRAPH_PG_DATABASE").unwrap_or_else(|_| "graph".to_owned());
 
diff --git a/tests/graph/integration/postgres/lib.rs b/tests/graph/integration/postgres/lib.rs
index e733851fbce..592bdd8f1df 100644
--- a/tests/graph/integration/postgres/lib.rs
+++ b/tests/graph/integration/postgres/lib.rs
@@ -120,9 +120,8 @@ impl DatabaseTestWrapper {
         let password =
             std::env::var("HASH_GRAPH_PG_PASSWORD").unwrap_or_else(|_| "graph".to_owned());
         let host = std::env::var("HASH_GRAPH_PG_HOST").unwrap_or_else(|_| "localhost".to_owned());
-        let port = std::env::var("HASH_GRAPH_PG_PORT")
-            .map(|port| port.parse::<u16>().unwrap())
-            .unwrap_or(5432);
+        let port =
+            std::env::var("HASH_GRAPH_PG_PORT").map_or(5432, |port| port.parse::<u16>().unwrap());
         let database =
             std::env::var("HASH_GRAPH_PG_DATABASE").unwrap_or_else(|_| "graph".to_owned());
 
diff --git a/tests/graph/integration/postgres/multi_type.rs b/tests/graph/integration/postgres/multi_type.rs
index d9195e54b7a..18affdf9cd2 100644
--- a/tests/graph/integration/postgres/multi_type.rs
+++ b/tests/graph/integration/postgres/multi_type.rs
@@ -1,4 +1,4 @@
-use core::{assert_matches::assert_matches, str::FromStr as _};
+use core::{assert_matches, str::FromStr as _};
 use std::collections::HashSet;
 
 use hash_graph_store::{