Update Rust toolchains to nightly-2024-12-02 (#5768)

Co-authored-by: hash-worker[bot] <180894564+hash-worker[bot]@users.noreply.github.com> Co-authored-by: Tim Diekmann <[email protected]>
hashintel · Dec 2, 2024 · 6b9055d · 6b9055d
1 parent 49c64cb
commit 6b9055d
Show file tree

Hide file tree

Showing 59 changed files with 46 additions and 117 deletions.
diff --git a/.github/scripts/rust/sync-turborepo.rs b/.github/scripts/rust/sync-turborepo.rs
@@ -1,7 +1,5 @@
 #!/usr/bin/env -S cargo +nightly -Zscript
 ---
-cargo-features = ["edition2024"]
-
 [package]
 edition = "2024"
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [workspace]
 default-members = [
     "apps/hash-graph",

diff --git a/apps/hash-graph/Cargo.toml b/apps/hash-graph/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-graph"
 version.workspace = true

diff --git a/libs/@blockprotocol/type-system/rust/Cargo.toml b/libs/@blockprotocol/type-system/rust/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "type-system"
 description       = "Definitions of types within the Block Protocol Type System"

diff --git a/libs/@blockprotocol/type-system/rust/src/schema/data_type/constraint/array.rs b/libs/@blockprotocol/type-system/rust/src/schema/data_type/constraint/array.rs
@@ -266,9 +266,9 @@ impl ConstraintValidator<[JsonValue]> for ArrayConstraints {
     type Error = [ArrayValidationError];
 
     fn is_valid(&self, value: &[JsonValue]) -> bool {
-        self.items.as_ref().map_or(true, |items| {
-            value.iter().all(|value| items.constraints.is_valid(value))
-        })
+        self.items
+            .as_ref()
+            .is_none_or(|items| value.iter().all(|value| items.constraints.is_valid(value)))
     }
 
     fn validate_value(&self, value: &[JsonValue]) -> Result<(), Report<[ArrayValidationError]>> {

diff --git a/libs/@local/codec/Cargo.toml b/libs/@local/codec/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-codec"
 version.workspace = true

diff --git a/libs/@local/graph/api/Cargo.toml b/libs/@local/graph/api/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-graph-api"
 version.workspace = true

diff --git a/libs/@local/graph/authorization/Cargo.toml b/libs/@local/graph/authorization/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-graph-authorization"
 version.workspace = true

diff --git a/libs/@local/graph/migrations-macros/Cargo.toml b/libs/@local/graph/migrations-macros/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-graph-migrations-macros"
 version.workspace = true

diff --git a/libs/@local/graph/migrations/Cargo.toml b/libs/@local/graph/migrations/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-graph-migrations"
 version.workspace = true

diff --git a/libs/@local/graph/postgres-store/Cargo.toml b/libs/@local/graph/postgres-store/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-graph-postgres-store"
 version.workspace = true

diff --git a/libs/@local/graph/store/Cargo.toml b/libs/@local/graph/store/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-graph-store"
 version.workspace = true

diff --git a/libs/@local/graph/temporal-versioning/Cargo.toml b/libs/@local/graph/temporal-versioning/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-graph-temporal-versioning"
 version.workspace = true

diff --git a/libs/@local/graph/test-server/Cargo.toml b/libs/@local/graph/test-server/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-graph-test-server"
 description       = "HASH Graph test server"

diff --git a/libs/@local/graph/type-defs/Cargo.toml b/libs/@local/graph/type-defs/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-graph-type-defs"
 description       = "HASH Graph type definitions"

diff --git a/libs/@local/graph/type-fetcher/Cargo.toml b/libs/@local/graph/type-fetcher/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-graph-type-fetcher"
 description       = "RPC service definition to fetch external BP types"

diff --git a/libs/@local/graph/type-fetcher/src/fetcher.rs b/libs/@local/graph/type-fetcher/src/fetcher.rs
@@ -1,5 +1,3 @@
-#![expect(clippy::future_not_send)]
-
 use core::{error::Error, fmt};
 
 use serde::{Deserialize, Serialize};

diff --git a/libs/@local/graph/types/rust/Cargo.toml b/libs/@local/graph/types/rust/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-graph-types"
 version.workspace = true

diff --git a/libs/@local/graph/validation/Cargo.toml b/libs/@local/graph/validation/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-graph-validation"
 version.workspace = true

diff --git a/libs/@local/harpc/client/rust/Cargo.toml b/libs/@local/harpc/client/rust/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "harpc-client"
 authors.workspace = true

diff --git a/libs/@local/harpc/codec/Cargo.toml b/libs/@local/harpc/codec/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "harpc-codec"
 authors.workspace = true

diff --git a/libs/@local/harpc/net/Cargo.toml b/libs/@local/harpc/net/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "harpc-net"
 version.workspace = true

diff --git a/libs/@local/harpc/server/Cargo.toml b/libs/@local/harpc/server/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "harpc-server"
 authors.workspace = true

diff --git a/libs/@local/harpc/system/Cargo.toml b/libs/@local/harpc/system/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "harpc-system"
 authors.workspace = true

diff --git a/libs/@local/harpc/tower/Cargo.toml b/libs/@local/harpc/tower/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "harpc-tower"
 version.workspace = true

diff --git a/libs/@local/harpc/tower/src/extensions.rs b/libs/@local/harpc/tower/src/extensions.rs
@@ -225,7 +225,7 @@ impl Extensions {
     #[inline]
     #[must_use]
     pub fn is_empty(&self) -> bool {
-        self.map.as_ref().map_or(true, |map| map.is_empty())
+        self.map.as_ref().is_none_or(|map| map.is_empty())
     }
 
     /// Get the numer of extensions available.

diff --git a/libs/@local/harpc/types/Cargo.toml b/libs/@local/harpc/types/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "harpc-types"
 version.workspace = true

diff --git a/libs/@local/harpc/wire-protocol/Cargo.toml b/libs/@local/harpc/wire-protocol/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "harpc-wire-protocol"
 version.workspace = true

diff --git a/libs/@local/hql/cst/Cargo.toml b/libs/@local/hql/cst/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hql-cst"
 version.workspace = true

diff --git a/libs/@local/hql/diagnostics/Cargo.toml b/libs/@local/hql/diagnostics/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hql-diagnostics"
 version.workspace = true

diff --git a/libs/@local/hql/span/Cargo.toml b/libs/@local/hql/span/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hql-span"
 version.workspace = true

diff --git a/libs/@local/hql/syntax-jexpr/Cargo.toml b/libs/@local/hql/syntax-jexpr/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hql-syntax-jexpr"
 authors.workspace = true

diff --git a/libs/@local/repo-chores/rust/Cargo.toml b/libs/@local/repo-chores/rust/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-repo-chores"
 version.workspace = true

diff --git a/libs/@local/status/rust/Cargo.toml b/libs/@local/status/rust/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-status"
 description       = "The HASH Status and Error Model."

diff --git a/libs/@local/temporal-client/Cargo.toml b/libs/@local/temporal-client/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-temporal-client"
 version.workspace = true

diff --git a/libs/@local/tracing/Cargo.toml b/libs/@local/tracing/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "hash-tracing"
 version.workspace = true

diff --git a/libs/antsi/rust-toolchain.toml b/libs/antsi/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2024-11-25"
+channel = "nightly-2024-12-02"
 components = ['rustfmt', 'clippy', 'llvm-tools-preview', 'rust-analyzer', 'rustc-codegen-cranelift-preview']
diff --git a/libs/chonky/Cargo.toml b/libs/chonky/Cargo.toml
@@ -1,5 +1,3 @@
-cargo-features = ["edition2024"]
-
 [package]
 name              = "chonky"
 description       = "General-purpose tooling for segmenting, chunking and embedding files"

diff --git a/libs/chonky/src/lib.rs b/libs/chonky/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc = include_str!("../README.md")]
+#![cfg_attr(doc, doc = include_str!("../README.md"))]
 
 extern crate alloc;
 

diff --git a/libs/deer/rust-toolchain.toml b/libs/deer/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2024-11-25"
+channel = "nightly-2024-12-02"
 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-11-25&color=blue)][rust-version]
+[![rust-version](https://img.shields.io/static/v1?label=Rust&message=1.83.0/nightly-2024-12-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
@@ -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-11-25&color=blue)][rust-version]
+[![rust-version](https://img.shields.io/static/v1?label=Rust&message=1.83.0/nightly-2024-12-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/macros/src/lib.rs b/libs/error-stack/macros/src/lib.rs
@@ -1 +1 @@
-#![doc = include_str!("../README.md")]
+#![cfg_attr(doc, doc = include_str!("../README.md"))]
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-11-25"
+channel = "nightly-2024-12-02"
 components = ['rustfmt', 'clippy', 'llvm-tools-preview', 'miri', 'rust-src', 'rust-analyzer', 'rustc-codegen-cranelift-preview']
diff --git a/libs/error-stack/src/fmt/charset.rs b/libs/error-stack/src/fmt/charset.rs
@@ -102,11 +102,11 @@ impl Report<()> {
     /// Which will result in something like:
     ///
     /// <pre>
-    #[doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__charset_utf8.snap"))]
+    #[cfg_attr(doc, doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__charset_utf8.snap")))]
     /// </pre>
     ///
     /// <pre>
-    #[doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__charset_ascii.snap"))]
+    #[cfg_attr(doc, doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__charset_ascii.snap")))]
     /// </pre>
     pub fn set_charset(charset: Charset) {
         CHARSET_OVERRIDE.store(charset);

diff --git a/libs/error-stack/src/fmt/color.rs b/libs/error-stack/src/fmt/color.rs
@@ -119,15 +119,15 @@ impl Report<()> {
     /// Which will result in something like:
     ///
     /// <pre>
-    #[doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__preference_none.snap"))]
+    #[cfg_attr(doc, doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__preference_none.snap")))]
     /// </pre>
     ///
     /// <pre>
-    #[doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__preference_emphasis.snap"))]
+    #[cfg_attr(doc, doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__preference_emphasis.snap")))]
     /// </pre>
     ///
     /// <pre>
-    #[doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__preference_color.snap"))]
+    #[cfg_attr(doc, doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__preference_color.snap")))]
     /// </pre>
     pub fn set_color_mode(mode: ColorMode) {
         COLOR_OVERRIDE.store(mode);

diff --git a/libs/error-stack/src/fmt/hook.rs b/libs/error-stack/src/fmt/hook.rs
@@ -304,7 +304,7 @@ impl<T> HookContext<T> {
     /// ```
     ///
     /// <pre>
-    #[doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__hookcontext_emit.snap"))]
+    #[cfg_attr(doc, doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__hookcontext_emit.snap")))]
     /// </pre>
     pub fn push_appendix(&mut self, content: impl Into<String>) {
         self.inner_mut().extra_mut().appendix.push(content.into());
@@ -351,7 +351,7 @@ impl<T> HookContext<T> {
     /// ```
     ///
     /// <pre>
-    #[doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__diagnostics_add.snap"))]
+    #[cfg_attr(doc, doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__diagnostics_add.snap")))]
     /// </pre>
     pub fn push_body(&mut self, content: impl Into<String>) {
         self.inner_mut().extra_mut().body.push(content.into());

diff --git a/libs/error-stack/src/fmt/mod.rs b/libs/error-stack/src/fmt/mod.rs
@@ -126,13 +126,13 @@
 //! The output of `println!("{report:?}")`:
 //!
 //! <pre>
-#![doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__doc.snap"))]
+#![cfg_attr(doc, doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt__doc.snap")))]
 //! </pre>
 //!
 //! The output of `println!("{report:#?}")`:
 //!
 //! <pre>
-#![doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt_doc_alt.snap"))]
+#![cfg_attr(doc, doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/fmt_doc_alt.snap")))]
 //! </pre>
 //!
 //! ## Implementation Details

diff --git a/libs/error-stack/src/hook/mod.rs b/libs/error-stack/src/hook/mod.rs
@@ -65,7 +65,7 @@ impl Report<()> {
     /// Which will result in something like:
     ///
     /// <pre>
-    #[doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/hook__debug_hook.snap"))]
+    #[cfg_attr(doc, doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/hook__debug_hook.snap")))]
     /// </pre>
     ///
     /// This example showcases the ability of hooks to be invoked for values provided via the
@@ -144,7 +144,7 @@ impl Report<()> {
     /// Which will result in something like:
     ///
     /// <pre>
-    #[doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/hook__debug_hook_provide.snap"))]
+    #[cfg_attr(doc, doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/hook__debug_hook_provide.snap")))]
     /// </pre>
     ///
     /// `error-stack` comes with some built-in hooks which can be overwritten. This is useful if you
@@ -186,7 +186,7 @@ impl Report<()> {
     /// Which will result in something like:
     ///
     /// <pre>
-    #[doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/hook__location_hook.snap"))]
+    #[cfg_attr(doc, doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/snapshots/doc/hook__location_hook.snap")))]
     /// </pre>
     ///
     /// [`Location`]: std::panic::Location
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#![doc = include_str!("../README.md")]
		#![cfg_attr(doc, doc = include_str!("../README.md"))]