Upgrade to rustc nightly-2024-08-01 (#68452)

mischnic · ForsakenHarmony · commit 835760289fe7 · 2024-08-15T20:04:37.000+02:00
1. Upgrade to `nightly-2024-08-01` 2. Fix lints 3. Remove some unused structs 4. Bump `regex` because of rust-lang/regex#1219 Closes PACK-3178
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -184,7 +184,7 @@ proc-macro2 = "1.0.79"
 qstring = "0.7.2"
 quote = "1.0.23"
 rand = "0.8.5"
-regex = "1.7.0"
+regex = "1.10.6"
 rstest = "0.16.0"
 rustc-hash = "1.1.0"
 semver = "1.0.16"
diff --git a/crates/next-core/src/next_config.rs b/crates/next-core/src/next_config.rs
@@ -28,29 +28,12 @@ use crate::{
     next_import_map::mdx_import_source_file, next_shared::transforms::ModularizeImportPackageConfig,
 };
 
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct NextConfigAndCustomRoutesRaw {
-    config: NextConfig,
-    custom_routes: CustomRoutesRaw,
-}
-
 #[turbo_tasks::value]
 struct NextConfigAndCustomRoutes {
     config: Vc<NextConfig>,
     custom_routes: Vc<CustomRoutes>,
 }
 
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-struct CustomRoutesRaw {
-    rewrites: Rewrites,
-
-    // unsupported
-    headers: Vec<Header>,
-    redirects: Vec<Redirect>,
-}
-
 #[turbo_tasks::value]
 struct CustomRoutes {
     rewrites: Vc<Rewrites>,
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2024-05-31"
+channel = "nightly-2024-08-01"
 components = ["rustfmt", "clippy"]
 profile = "minimal"
diff --git a/turbopack/crates/turbo-static/src/call_resolver.rs b/turbopack/crates/turbo-static/src/call_resolver.rs
@@ -41,9 +41,8 @@ impl<'a> CallResolver<'a> {
                 bincode::deserialize_from::<_, HashMap<Identifier, Vec<IdentifierReference>>>(
                     reader,
                 )
-                .map_err(|e| {
+                .inspect_err(|_| {
                     tracing::warn!("failed to load existing cache, restarting");
-                    e
                 })
                 .ok()
             })
diff --git a/turbopack/crates/turbo-tasks-fs/src/lib.rs b/turbopack/crates/turbo-tasks-fs/src/lib.rs
@@ -5,7 +5,6 @@
 #![feature(io_error_more)]
 #![feature(round_char_boundary)]
 #![feature(arbitrary_self_types)]
-#![feature(lint_reasons)]
 #![allow(clippy::mutable_key_type)]
 
 pub mod attach;
diff --git a/turbopack/crates/turbo-tasks-memory/src/aggregation/increase.rs b/turbopack/crates/turbo-tasks-memory/src/aggregation/increase.rs
@@ -331,6 +331,7 @@ pub fn increase_aggregation_number_internal<C: AggregationContext>(
     prepared.apply(ctx, balance_queue);
 }
 
+#[allow(dead_code)]
 /// A prepared `increase_aggregation_number` operation.
 pub struct PreparedIncreaseAggregationNumber<C: AggregationContext>(
     PreparedInternalIncreaseAggregationNumber<C>,
diff --git a/turbopack/crates/turbo-tasks-memory/src/lib.rs b/turbopack/crates/turbo-tasks-memory/src/lib.rs
@@ -1,7 +1,6 @@
 #![feature(hash_extract_if)]
 #![feature(option_get_or_insert_default)]
 #![feature(type_alias_impl_trait)]
-#![feature(lint_reasons)]
 #![feature(box_patterns)]
 #![feature(int_roundings)]
 #![feature(impl_trait_in_assoc_type)]
diff --git a/turbopack/crates/turbo-tasks-memory/src/memory_backend.rs b/turbopack/crates/turbo-tasks-memory/src/memory_backend.rs
@@ -270,10 +270,8 @@ impl MemoryBackend {
             .get(key)
             // Avoid holding the lock for too long
             .map(|task_ref| *task_ref)
-            .map(|task_id| {
+            .inspect(|&task_id| {
                 self.connect_task_child(parent_task, task_id, turbo_tasks);
-
-                task_id
             })
     }
 
diff --git a/turbopack/crates/turbo-tasks-memory/tests/debug.rs b/turbopack/crates/turbo-tasks-memory/tests/debug.rs
@@ -29,7 +29,7 @@ async fn transparent_debug() {
 async fn enum_none_debug() {
     run(&REGISTRATION, async {
         let a: Vc<Enum> = Enum::None.cell();
-        assert_eq!(format!("{:?}", a.dbg().await.unwrap()), "Enum::None");
+        assert_eq!(format!("{:?}", a.dbg().await.unwrap()), "Enum :: None");
     })
     .await
 }
@@ -40,7 +40,7 @@ async fn enum_transparent_debug() {
         let a: Vc<Enum> = Enum::Transparent(Transparent(42).cell()).cell();
         assert_eq!(
             format!("{:?}", a.dbg().await.unwrap()),
-            r#"Enum::Transparent(
+            r#"Enum :: Transparent(
     42,
 )"#
         );
@@ -54,8 +54,8 @@ async fn enum_inner_vc_debug() {
         let a: Vc<Enum> = Enum::Enum(Enum::None.cell()).cell();
         assert_eq!(
             format!("{:?}", a.dbg().await.unwrap()),
-            r#"Enum::Enum(
-    Enum::None,
+            r#"Enum :: Enum(
+    Enum :: None,
 )"#
         );
     })
diff --git a/turbopack/crates/turbo-tasks-signposter/src/log.rs b/turbopack/crates/turbo-tasks-signposter/src/log.rs
@@ -49,6 +49,7 @@ unsafe impl Send for Log {}
 impl Default for Log {
     fn default() -> Self {
         Log {
+            #[allow(unused_unsafe)] // This is a false positive lint.
             os_log: unsafe { addr_of!(_os_log_default) as *const _ as *mut _ },
         }
     }
diff --git a/turbopack/crates/turbo-tasks/src/backend.rs b/turbopack/crates/turbo-tasks/src/backend.rs
@@ -219,12 +219,6 @@ mod ser {
 
     impl<'de> Deserialize<'de> for PersistentTaskType {
         fn deserialize<D: ser::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-            #[derive(Deserialize)]
-            enum VariantKind {
-                Native,
-                ResolveNative,
-                ResolveTrait,
-            }
             struct Visitor;
             impl<'de> serde::de::Visitor<'de> for Visitor {
                 type Value = PersistentTaskType;
diff --git a/turbopack/crates/turbopack-browser/src/lib.rs b/turbopack/crates/turbopack-browser/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(lint_reasons)]
 #![feature(iter_intersperse)]
 #![feature(int_roundings)]
 #![feature(arbitrary_self_types)]
diff --git a/turbopack/crates/turbopack-core/src/lib.rs b/turbopack/crates/turbopack-core/src/lib.rs
@@ -3,7 +3,6 @@
 #![feature(option_get_or_insert_default)]
 #![feature(type_alias_impl_trait)]
 #![feature(assert_matches)]
-#![feature(lint_reasons)]
 #![feature(arbitrary_self_types)]
 #![feature(iter_intersperse)]
 
diff --git a/turbopack/crates/turbopack-core/src/utils.rs b/turbopack/crates/turbopack-core/src/utils.rs
@@ -3,14 +3,14 @@ use std::{collections::HashSet, future::Future, hash::Hash, pin::Pin, task::Poll
 pub fn _race_pop<'a, T: 'a, F: Future<Output = T> + Unpin>(
     futures: &'a mut Vec<F>,
 ) -> impl Future<Output = Option<T>> + 'a {
-    FutureRacePop { futures }
+    _FutureRacePop { futures }
 }
 
-struct FutureRacePop<'a, T, F: Future<Output = T> + Unpin> {
+struct _FutureRacePop<'a, T, F: Future<Output = T> + Unpin> {
     futures: &'a mut Vec<F>,
 }
 
-impl<'a, T, F: Future<Output = T> + Unpin> Future for FutureRacePop<'a, T, F> {
+impl<'a, T, F: Future<Output = T> + Unpin> Future for _FutureRacePop<'a, T, F> {
     type Output = Option<T>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut std::task::Context<'_>) -> Poll<Self::Output> {
diff --git a/turbopack/crates/turbopack-node/src/lib.rs b/turbopack/crates/turbopack-node/src/lib.rs
@@ -1,6 +1,5 @@
 #![feature(async_closure)]
 #![feature(min_specialization)]
-#![feature(lint_reasons)]
 #![feature(arbitrary_self_types)]
 #![feature(extract_if)]
 
diff --git a/turbopack/crates/turbopack-nodejs/src/lib.rs b/turbopack/crates/turbopack-nodejs/src/lib.rs
@@ -1,4 +1,3 @@
-#![feature(lint_reasons)]
 #![feature(iter_intersperse)]
 #![feature(arbitrary_self_types)]
 

Original file line number	Diff line number	Diff line change
`@@ -331,6 +331,7 @@ pub fn increase_aggregation_number_internal<C: AggregationContext>(`
`331`	`331`	`prepared.apply(ctx, balance_queue);`
`332`	`332`	`}`
`333`	`333`
	`334`	`+#[allow(dead_code)]`
`334`	`335`	/// A prepared `increase_aggregation_number` operation.
`335`	`336`	`pub struct PreparedIncreaseAggregationNumber<C: AggregationContext>(`
`336`	`337`	`PreparedInternalIncreaseAggregationNumber<C>,`