diff --git a/Cargo.lock b/Cargo.lock
index ae99bc0901..72dc48380e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -321,7 +321,7 @@ dependencies = [
 [[package]]
 name = "auto-hash-map"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "serde",
  "smallvec",
@@ -3092,7 +3092,7 @@ dependencies = [
 [[package]]
 name = "node-file-trace"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "serde",
@@ -3487,7 +3487,7 @@ dependencies = [
 [[package]]
 name = "pathfinder_simd"
 version = "0.5.3"
-source = "git+https://github.com/servo/pathfinder?rev=30419d#30419d07660dc11a21e42ef4a7fa329600cff152"
+source = "git+https://github.com/vercel/pathfinder?branch=rm-stdarch_arm_crc32#ddc0696d4c8b7d0f7af8de1a271c62aec016d45f"
 dependencies = [
  "rustc_version 0.4.0",
 ]
@@ -6968,7 +6968,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7000,7 +7000,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-build"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "cargo-lock",
@@ -7012,7 +7012,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-bytes"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "bytes",
@@ -7026,7 +7026,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "dotenvs",
@@ -7040,7 +7040,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fetch"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -7056,7 +7056,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-fs"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7088,7 +7088,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-hash"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "md4",
  "turbo-tasks-macros",
@@ -7098,7 +7098,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "proc-macro-error",
@@ -7112,7 +7112,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-macros-shared"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7122,7 +7122,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-malloc"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "mimalloc",
 ]
@@ -7130,7 +7130,7 @@ dependencies = [
 [[package]]
 name = "turbo-tasks-memory"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "auto-hash-map",
@@ -7156,7 +7156,7 @@ dependencies = [
 [[package]]
 name = "turbopack"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -7186,7 +7186,7 @@ dependencies = [
 [[package]]
 name = "turbopack-binding"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "auto-hash-map",
  "mdxjs",
@@ -7227,7 +7227,7 @@ dependencies = [
 [[package]]
 name = "turbopack-browser"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7250,7 +7250,7 @@ dependencies = [
 [[package]]
 name = "turbopack-cli-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "clap",
@@ -7267,7 +7267,7 @@ dependencies = [
 [[package]]
 name = "turbopack-core"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -7296,7 +7296,7 @@ dependencies = [
 [[package]]
 name = "turbopack-css"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7323,7 +7323,7 @@ dependencies = [
 [[package]]
 name = "turbopack-dev-server"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -7359,7 +7359,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7394,7 +7394,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-hmr-protocol"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "serde",
  "serde_json",
@@ -7405,7 +7405,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-plugins"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7429,7 +7429,7 @@ dependencies = [
 [[package]]
 name = "turbopack-ecmascript-runtime"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "indoc",
@@ -7445,7 +7445,7 @@ dependencies = [
 [[package]]
 name = "turbopack-env"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7461,7 +7461,7 @@ dependencies = [
 [[package]]
 name = "turbopack-image"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "base64 0.21.4",
@@ -7480,7 +7480,7 @@ dependencies = [
 [[package]]
 name = "turbopack-json"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "serde",
@@ -7495,7 +7495,7 @@ dependencies = [
 [[package]]
 name = "turbopack-mdx"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "mdxjs",
@@ -7510,7 +7510,7 @@ dependencies = [
 [[package]]
 name = "turbopack-node"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -7544,7 +7544,7 @@ dependencies = [
 [[package]]
 name = "turbopack-nodejs"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7564,7 +7564,7 @@ dependencies = [
 [[package]]
 name = "turbopack-resolve"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
@@ -7582,7 +7582,7 @@ dependencies = [
 [[package]]
 name = "turbopack-static"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "serde",
@@ -7598,7 +7598,7 @@ dependencies = [
 [[package]]
 name = "turbopack-swc-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "swc_core",
  "turbo-tasks",
@@ -7609,7 +7609,7 @@ dependencies = [
 [[package]]
 name = "turbopack-trace-server"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "either",
@@ -7629,7 +7629,7 @@ dependencies = [
 [[package]]
 name = "turbopack-trace-utils"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
@@ -7645,7 +7645,7 @@ dependencies = [
 [[package]]
 name = "turbopack-wasm"
 version = "0.1.0"
-source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240528.2#4a365477e8a030b91f10bfe54ccb341269136b7a"
+source = "git+https://github.com/vercel/turbo.git?tag=turbopack-240531.2#d4fd4fbbffc829fb78b8cc57f2bbd036b869a5a4"
 dependencies = [
  "anyhow",
  "indexmap 1.9.3",
diff --git a/Cargo.toml b/Cargo.toml
index a9e3dcacf2..30564a3083 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,11 +37,11 @@ swc_core = { version = "0.92.5", features = [
 testing = { version = "0.35.25" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240528.2" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240531.2" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240528.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240531.2" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240528.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240531.2" }
 
 # General Deps
 
@@ -59,7 +59,7 @@ chromiumoxide = { version = "0.5.0", features = [
 tungstenite = "0.18.0"
 
 # flate2_zlib requires zlib, use flate2_rust
-allsorts = { version = "0.14.0", default_features = false, features = [
+allsorts = { version = "0.14.0", default-features = false, features = [
   "outline",
   "flate2_rust",
 ] }
@@ -141,4 +141,5 @@ dhat = { version = "0.3.2" }
 
 # Sync with the entries in turbo's Cargo.toml
 [patch.crates-io]
-pathfinder_simd = { git = "https://github.com/servo/pathfinder", rev = "30419d" }
+# TODO: Use upstream when https://github.com/servo/pathfinder/pull/566 lands
+pathfinder_simd = { git = "https://github.com/vercel/pathfinder", branch = "rm-stdarch_arm_crc32"}
diff --git a/packages/next-swc/crates/next-core/src/next_font/util.rs b/packages/next-swc/crates/next-core/src/next_font/util.rs
index 3338d33b07..2c0186707c 100644
--- a/packages/next-swc/crates/next-core/src/next_font/util.rs
+++ b/packages/next-swc/crates/next-core/src/next_font/util.rs
@@ -60,7 +60,7 @@ pub(crate) async fn get_scoped_font_family(
         FontFamilyType::Fallback => format!("{} Fallback", font_family_base),
     };
 
-    Ok(Vc::cell(format!("{}", font_family_name)))
+    Ok(Vc::cell(font_family_name))
 }
 
 /// Returns a [Vc] for [String] uniquely identifying the request for the font.
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 59c3a03ab6..ec33a6d0a9 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2024-04-03"
+channel = "nightly-2024-05-31"
 components = ["rustfmt", "clippy"]
 profile = "minimal"