Update Rust toolchains to nightly-2024-10-21 (#5446)

Co-authored-by: hash-worker[bot] <180894564+hash-worker[bot]@users.noreply.github.com> Co-authored-by: Tim Diekmann <[email protected]>
hashintel · Oct 23, 2024 · 848df74 · 848df74
1 parent 2296f0b
commit 848df74
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 34 deletions.
diff --git a/apps/hash-graph/libs/graph/src/store/postgres/knowledge/entity/read.rs b/apps/hash-graph/libs/graph/src/store/postgres/knowledge/entity/read.rs
@@ -107,7 +107,7 @@ where
             .as_client()
             .query(
                 &format!(
-                    r#"
+                    "
                         SELECT
                              filter.idx,
                              ontology_ids.base_url,
@@ -131,7 +131,7 @@ where
                           ON entity_is_of_type.entity_type_ontology_id = ontology_ids.ontology_id
 
                         {where_statement};
-                    "#
+                    "
                 ),
                 &[
                     &traversal_data.owned_by_ids,
@@ -210,7 +210,7 @@ where
             .as_client()
             .query(
                 &format!(
-                    r#"
+                    "
                         SELECT
                              filter.idx,
                              target.web_id,
@@ -239,7 +239,7 @@ where
                          AND target.{variable_axis} && filter.interval
                          AND target.web_id = {target_1}
                          AND target.entity_uuid = {target_2}
-                    "#
+                    "
                 ),
                 &[
                     &traversal_data.owned_by_ids,

diff --git a/apps/hash-graph/libs/graph/src/store/postgres/ontology/read.rs b/apps/hash-graph/libs/graph/src/store/postgres/ontology/read.rs
@@ -131,7 +131,7 @@ impl<C: AsClient, A: Send + Sync> PostgresStore<C, A> {
             .as_client()
             .query(
                 &format!(
-                    r#"
+                    "
                         SELECT
                             filter.idx         AS idx,
                             source.base_url    AS source_base_url,
@@ -152,7 +152,7 @@ impl<C: AsClient, A: Send + Sync> PostgresStore<C, A> {
                           ON {target} = target.ontology_id
 
                         {where_statement};
-                    "#
+                    "
                 ),
                 &[&record_ids.ontology_ids],
             )

diff --git a/apps/hash-graph/libs/store/src/filter/mod.rs b/apps/hash-graph/libs/store/src/filter/mod.rs
@@ -478,7 +478,7 @@ impl<R: QueryRecord> FilterExpression<'_, R> {
     {
         if let Self::Parameter { parameter, convert } = self {
             if let Some(conversion) = convert.take() {
-                let Parameter::F64(mut number) = parameter else {
+                let &mut Parameter::F64(mut number) = parameter else {
                     bail!(ParameterConversionError::InvalidParameterType {
                         actual: ActualParameterType::Parameter(parameter.to_owned()),
                         expected: ParameterType::F64,

diff --git a/libs/@local/harpc/net/src/session/client/transaction/test.rs b/libs/@local/harpc/net/src/session/client/transaction/test.rs
@@ -848,7 +848,7 @@ async fn send_drop_receiver_delay() {
         .expect("able to send bytes");
     tokio::task::yield_now().await; // the other task needs to react to our message, so we need to yield control
     // force a flush
-    tx.send(Bytes::from_static(&[0; Payload::MAX_SIZE]))
+    tx.send(Bytes::from(vec![0; Payload::MAX_SIZE]))
         .await
         .expect_err("should not be able to send bytes");
 
@@ -948,7 +948,7 @@ async fn send_delay() {
         descriptor,
     );
 
-    tx.send(Bytes::from_static(&[0; Payload::MAX_SIZE - 8]))
+    tx.send(Bytes::from(vec![0; Payload::MAX_SIZE - 8]))
         .await
         .expect("able to send bytes");
 
@@ -1004,7 +1004,7 @@ async fn send_delay_flush_partial() {
         descriptor,
     );
 
-    tx.send(Bytes::from_static(&[0; Payload::MAX_SIZE]))
+    tx.send(Bytes::from(vec![0; Payload::MAX_SIZE]))
         .await
         .expect("able to send bytes");
 

diff --git a/libs/@local/harpc/net/src/session/server/transaction/test.rs b/libs/@local/harpc/net/src/session/server/transaction/test.rs
@@ -156,7 +156,7 @@ async fn send_delay_perfect_buffer() {
 
     // send a message that fits perfectly into the buffer
     // this should not trigger any splitting
-    let payload = Bytes::from_static(&[0; Payload::MAX_SIZE]);
+    let payload = Bytes::from(vec![0; Payload::MAX_SIZE]);
 
     bytes_tx
         .send(Ok(payload.clone()))
@@ -187,7 +187,7 @@ async fn send_delay_split_large() {
     let (bytes_tx, mut response_rx, handle) = setup_send(false);
 
     // send a large message that needs to be split into multiple parts
-    let payload = Bytes::from_static(&[0; Payload::MAX_SIZE + 8]);
+    let payload = Bytes::from(vec![0; Payload::MAX_SIZE + 8]);
 
     bytes_tx
         .send(Ok(payload.clone()))
@@ -223,7 +223,7 @@ async fn send_delay_split_large_multiple() {
     let (bytes_tx, mut response_rx, handle) = setup_send(false);
 
     // send a large message that needs to be split into multiple parts
-    let payload = Bytes::from_static(&[0; (Payload::MAX_SIZE * 2) + 8]);
+    let payload = Bytes::from(vec![0; (Payload::MAX_SIZE * 2) + 8]);
 
     bytes_tx
         .send(Ok(payload.clone()))
@@ -298,7 +298,7 @@ async fn send_delay_flush_remaining() {
     let (bytes_tx, mut response_rx, handle) = setup_send(false);
 
     // send a packet that is to be split into multiple frames
-    let payload = Bytes::from_static(&[0; Payload::MAX_SIZE + 8]);
+    let payload = Bytes::from(vec![0; Payload::MAX_SIZE + 8]);
 
     bytes_tx
         .send(Ok(payload.clone()))
@@ -497,7 +497,7 @@ async fn send_delay_error_delayed() {
 
     // if we send a packet that is too large, we'll split, but when we encounter an error we
     // will discard the remaining messages
-    let payload_ok = Bytes::from_static(&[0; Payload::MAX_SIZE + 8]);
+    let payload_ok = Bytes::from(vec![0; Payload::MAX_SIZE + 8]);
 
     bytes_tx
         .send(Ok(payload_ok.clone()))
@@ -599,7 +599,7 @@ async fn send_delay_error_interspersed() {
     // once we have an error message, we no longer send any more messages
     let (bytes_tx, mut response_rx, handle) = setup_send(false);
 
-    let payload_ok = Bytes::from_static(&[0; Payload::MAX_SIZE + 8]);
+    let payload_ok = Bytes::from(vec![0; Payload::MAX_SIZE + 8]);
 
     let code = ErrorCode::new(NonZero::new(0xFF_FF).expect("infallible"));
 
@@ -748,7 +748,7 @@ async fn send_delay_error_split_large() {
 async fn send_no_delay_split_large() {
     let (bytes_tx, mut response_rx, handle) = setup_send(true);
 
-    let payload_ok = Bytes::from_static(&[0; Payload::MAX_SIZE + 8]);
+    let payload_ok = Bytes::from(vec![0; Payload::MAX_SIZE + 8]);
 
     bytes_tx
         .send(Ok(payload_ok.clone()))
@@ -797,7 +797,7 @@ async fn send_no_delay_split_large() {
 async fn send_no_delay_split_large_multiple() {
     let (bytes_tx, mut response_rx, handle) = setup_send(true);
 
-    let payload_ok = Bytes::from_static(&[0; (Payload::MAX_SIZE * 2) + 8]);
+    let payload_ok = Bytes::from(vec![0; (Payload::MAX_SIZE * 2) + 8]);
 
     bytes_tx
         .send(Ok(payload_ok.clone()))

diff --git a/libs/@local/harpc/net/src/session/writer/test.rs b/libs/@local/harpc/net/src/session/writer/test.rs
@@ -101,7 +101,7 @@ async fn flush_calls_write() {
         },
         &tx,
     );
-    writer.push(Bytes::from_static(&[0; Payload::MAX_SIZE + 8]));
+    writer.push(Bytes::from(vec![0; Payload::MAX_SIZE + 8]));
     writer.flush().await.expect("infallible");
 
     // we should have sent 2 responses
@@ -148,7 +148,7 @@ async fn split_single() {
         &tx,
     );
 
-    let bytes = Bytes::from_static(&[0; Payload::MAX_SIZE + 8]);
+    let bytes = Bytes::from(vec![0; Payload::MAX_SIZE + 8]);
 
     writer.push(bytes.clone());
     assert_eq!(writer.buffer.segments(), 1);
@@ -183,7 +183,7 @@ async fn split_multiple() {
         &tx,
     );
 
-    let bytes = Bytes::from_static(&[0; Payload::MAX_SIZE * 2 + 8]);
+    let bytes = Bytes::from(vec![0; Payload::MAX_SIZE * 2 + 8]);
 
     writer.push(bytes.clone());
     assert_eq!(writer.buffer.segments(), 1);
@@ -228,7 +228,7 @@ async fn delay_push_merge_on_write() {
         &tx,
     );
 
-    let bytes = Bytes::from_static(&[0; Payload::MAX_SIZE]);
+    let bytes = Bytes::from(vec![0; Payload::MAX_SIZE]);
 
     writer.push(bytes.slice(..Payload::MAX_SIZE / 2));
     writer.push(bytes.slice(Payload::MAX_SIZE / 2..));

diff --git a/libs/antsi/rust-toolchain.toml b/libs/antsi/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2024-10-14"
+channel = "nightly-2024-10-21"
 components = ['rustfmt', 'clippy', 'llvm-tools-preview', 'rust-analyzer', 'rustc-codegen-cranelift-preview']
diff --git a/libs/deer/rust-toolchain.toml b/libs/deer/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2024-10-14"
+channel = "nightly-2024-10-21"
 components = ['rustfmt', 'clippy', 'llvm-tools-preview', 'miri', 'rust-analyzer', 'rustc-codegen-cranelift-preview']
diff --git 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-2024-10-14&color=blue)][rust-version]
+[![rust-version](https://img.shields.io/static/v1?label=Rust&message=1.83.0/nightly-2024-10-21&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
@@ -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-2024-10-14&color=blue)][rust-version]
+[![rust-version](https://img.shields.io/static/v1?label=Rust&message=1.83.0/nightly-2024-10-21&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/rust-toolchain.toml b/libs/error-stack/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
 # Please also update the badges in `README.md`s (`error-stack` and `error-stack-macros`), and `src/lib.rs`
-channel = "nightly-2024-10-14"
+channel = "nightly-2024-10-21"
 components = ['rustfmt', 'clippy', 'llvm-tools-preview', 'miri', 'rust-src', 'rust-analyzer', 'rustc-codegen-cranelift-preview']
diff --git 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-2024-10-14&color=blue)][rust-version]
+//! [![rust-version](https://img.shields.io/static/v1?label=Rust&message=1.83.0/nightly-2024-10-21&color=blue)][rust-version]
 //!
 //! [crates.io]: https://crates.io/crates/error-stack
 //! [libs.rs]: https://lib.rs/crates/error-stack

diff --git a/libs/sarif/rust-toolchain.toml b/libs/sarif/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2024-10-14"
+channel = "nightly-2024-10-21"
 components = ['rustfmt', 'clippy', 'llvm-tools-preview', 'rust-analyzer', 'rustc-codegen-cranelift-preview']
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2024-10-14"
+channel = "nightly-2024-10-21"
 components = ['rustfmt', 'clippy', 'llvm-tools-preview', 'miri', 'rust-analyzer', 'rustc-codegen-cranelift-preview']
diff --git a/tests/hash-graph-benches/util.rs b/tests/hash-graph-benches/util.rs
@@ -172,10 +172,10 @@ where
                 client
                     .execute(
                         &format!(
-                            r#"
+                            "
                             /* CLONE DATABASE TO NEW ONE */
                             CREATE DATABASE {bench_db_name} WITH TEMPLATE {} OWNER {};
-                            "#,
+                            ",
                             source_db_connection_info.database(),
                             bench_db_connection_info.user()
                         ),
@@ -263,9 +263,9 @@ where
                 .as_client()
                 .execute(
                     &format!(
-                        r#"
+                        "
                         DROP DATABASE IF EXISTS {};
-                        "#,
+                        ",
                         self.bench_db_name
                     ),
                     &[],