Bump Rust version (vercel#73169)

mischnic · web-flow · commit 477e1e4becde · 2024-12-12T11:35:26.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2024-10-04"
+channel = "nightly-2024-12-10"
 components = ["rustfmt", "clippy", "rust-analyzer"]
 profile = "minimal"
diff --git a/turbopack/crates/turbo-tasks-backend/src/backend/mod.rs b/turbopack/crates/turbo-tasks-backend/src/backend/mod.rs
@@ -1272,7 +1272,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
                             CachedDataItemValue::InProgressCell { value },
                         ) if cell_counters
                             .get(&cell.type_id)
-                            .map_or(true, |start_index| cell.index >= *start_index) =>
+                            .is_none_or(|start_index| cell.index >= *start_index) =>
                         {
                             value.event.notify(usize::MAX);
                             true
@@ -1283,8 +1283,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
             ));
             removed_data.extend(task.extract_if(CachedDataItemIndex::CellData, |key, _| {
                 matches!(key, &CachedDataItemKey::CellData { cell } if cell_counters
-                        .get(&cell.type_id)
-                        .map_or(true, |start_index| cell.index >= *start_index))
+                        .get(&cell.type_id).is_none_or(|start_index| cell.index >= *start_index))
             }));
             if self.should_track_children() {
                 old_edges.extend(task.iter(CachedDataItemIndex::Children).filter_map(
@@ -1323,7 +1322,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
                             CachedDataItemKey::CellDependent { cell, task }
                                 if cell_counters
                                     .get(&cell.type_id)
-                                    .map_or(true, |start_index| cell.index >= *start_index) =>
+                                    .is_none_or(|start_index| cell.index >= *start_index) =>
                             {
                                 Some(OutdatedEdge::RemovedCellDependent(task, cell.type_id))
                             }
@@ -1340,15 +1339,15 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
                         CachedDataItemValue::InProgressCell { value },
                     ) if cell_counters
                         .get(&cell.type_id)
-                        .map_or(true, |start_index| cell.index >= *start_index) =>
+                        .is_none_or(|start_index| cell.index >= *start_index) =>
                     {
                         value.event.notify(usize::MAX);
                         return true;
                     }
                     (&CachedDataItemKey::CellData { cell }, _)
                         if cell_counters
                             .get(&cell.type_id)
-                            .map_or(true, |start_index| cell.index >= *start_index) =>
+                            .is_none_or(|start_index| cell.index >= *start_index) =>
                     {
                         return true;
                     }
@@ -1371,7 +1370,7 @@ impl<B: BackingStorage> TurboTasksBackendInner<B> {
                     (&CachedDataItemKey::CellDependent { cell, task }, _)
                         if cell_counters
                             .get(&cell.type_id)
-                            .map_or(true, |start_index| cell.index >= *start_index) =>
+                            .is_none_or(|start_index| cell.index >= *start_index) =>
                     {
                         old_edges.push(OutdatedEdge::RemovedCellDependent(task, cell.type_id));
                     }
diff --git a/turbopack/crates/turbo-tasks-backend/src/backend/operation/aggregation_update.rs b/turbopack/crates/turbo-tasks-backend/src/backend/operation/aggregation_update.rs
@@ -576,7 +576,7 @@ impl AggregationUpdateQueue {
                                     if update.base_aggregation_number < base_aggregation_number {
                                         true
                                     } else if let Some(distance) = distance {
-                                        update.distance.map_or(true, |d| d < distance)
+                                        update.distance.is_none_or(|d| d < distance)
                                     } else {
                                         false
                                     };
diff --git a/turbopack/crates/turbo-tasks-backend/src/database/fresh_db_optimization.rs b/turbopack/crates/turbo-tasks-backend/src/database/fresh_db_optimization.rs
@@ -13,7 +13,7 @@ use crate::database::{
 };
 
 pub fn is_fresh(path: &Path) -> bool {
-    fs::exists(path).map_or(false, |exists| !exists)
+    fs::exists(path).is_ok_and(|exists| !exists)
 }
 
 pub struct FreshDbOptimization<T: KeyValueDatabase> {
diff --git a/turbopack/crates/turbo-tasks-backend/src/utils/chunked_vec.rs b/turbopack/crates/turbo-tasks-backend/src/utils/chunked_vec.rs
@@ -49,7 +49,7 @@ impl<T> ChunkedVec<T> {
     }
 
     pub fn is_empty(&self) -> bool {
-        self.chunks.first().map_or(true, |chunk| chunk.is_empty())
+        self.chunks.first().is_none_or(|chunk| chunk.is_empty())
     }
 }
 
diff --git a/turbopack/crates/turbo-tasks-macros-tests/tests/derive_non_local_value/fail_contains_vc_inside_generic.stderr b/turbopack/crates/turbo-tasks-macros-tests/tests/derive_non_local_value/fail_contains_vc_inside_generic.stderr
diff --git a/turbopack/crates/turbo-tasks-macros-tests/tests/derive_non_local_value/fail_underconstrained_generic.stderr b/turbopack/crates/turbo-tasks-macros-tests/tests/derive_non_local_value/fail_underconstrained_generic.stderr
diff --git a/turbopack/crates/turbo-tasks-memory/src/task/aggregation.rs b/turbopack/crates/turbo-tasks-memory/src/task/aggregation.rs
@@ -482,7 +482,7 @@ impl DerefMut for TaskGuard<'_> {
     }
 }
 
-impl<'l> AggregationNodeGuard for TaskGuard<'l> {
+impl AggregationNodeGuard for TaskGuard<'_> {
     type Data = Aggregated;
     type NodeRef = TaskId;
     type DataChange = TaskChange;
diff --git a/turbopack/crates/turbo-tasks/src/debug/mod.rs b/turbopack/crates/turbo-tasks/src/debug/mod.rs
@@ -379,7 +379,7 @@ pub enum ValueDebugFormatString<'a> {
     ),
 }
 
-impl<'a> ValueDebugFormatString<'a> {
+impl ValueDebugFormatString<'_> {
     /// Convert the `ValueDebugFormatString` into a `String`.
     ///
     /// This can fail when resolving `Vc` types.
diff --git a/turbopack/crates/turbopack-bench/src/lib.rs b/turbopack/crates/turbopack-bench/src/lib.rs
@@ -387,10 +387,10 @@ fn insert_code(
 
 static CHANGE_TIMEOUT_MESSAGE: &str = "update was not registered by bundler";
 
-async fn make_change<'a>(
+async fn make_change(
     module: &Path,
     bundler: &dyn Bundler,
-    guard: &mut PageGuard<'a>,
+    guard: &mut PageGuard<'_>,
     location: CodeLocation,
     timeout_duration: Duration,
     measurement: &WallTime,
diff --git a/turbopack/crates/turbopack-ecmascript/src/analyzer/mod.rs b/turbopack/crates/turbopack-ecmascript/src/analyzer/mod.rs
@@ -1949,7 +1949,7 @@ impl JsValue {
                             if var_graph
                                 .free_var_ids
                                 .get(&first_str.into())
-                                .map_or(false, |id| var_graph.values.contains_key(id))
+                                .is_some_and(|id| var_graph.values.contains_key(id))
                             {
                                 // `typeof foo...` but `foo` was reassigned
                                 return None;
diff --git a/turbopack/crates/turbopack-ecmascript/src/references/mod.rs b/turbopack/crates/turbopack-ecmascript/src/references/mod.rs
@@ -355,7 +355,7 @@ struct AnalysisState<'a> {
     url_rewrite_behavior: Option<UrlRewriteBehavior>,
 }
 
-impl<'a> AnalysisState<'a> {
+impl AnalysisState<'_> {
     /// Links a value to the graph, returning the linked value.
     async fn link_value(&self, value: JsValue, attributes: &ImportAttributes) -> Result<JsValue> {
         let fun_args_values = self.fun_args_values.lock().clone();
@@ -3247,8 +3247,8 @@ fn detect_dynamic_export(p: &Program) -> DetectedDynamicExportType {
     if let Program::Module(m) = p {
         // Check for imports/exports
         if m.body.iter().any(|item| {
-            item.as_module_decl().map_or(false, |module_decl| {
-                module_decl.as_import().map_or(true, |import| {
+            item.as_module_decl().is_some_and(|module_decl| {
+                module_decl.as_import().is_none_or(|import| {
                     !is_turbopack_helper_import(import) && !is_swc_helper_import(import)
                 })
             })
diff --git a/turbopack/crates/turbopack-ecmascript/src/tree_shake/graph.rs b/turbopack/crates/turbopack-ecmascript/src/tree_shake/graph.rs
@@ -810,7 +810,7 @@ impl DepGraph {
                             for decl in &v.decls {
                                 let disable_export_merging = comments
                                     .has_flag(decl.name.span().lo, FLAG_DISABLE_EXPORT_MERGING)
-                                    || decl.init.as_deref().map_or(false, |e| {
+                                    || decl.init.as_deref().is_some_and(|e| {
                                         comments.has_flag(e.span().lo, FLAG_DISABLE_EXPORT_MERGING)
                                     });
 
@@ -1245,7 +1245,7 @@ impl DepGraph {
 
                         let side_effects = !has_explicit_pure
                             && (vars.found_unresolved
-                                || decl.init.as_deref().map_or(false, |e| {
+                                || decl.init.as_deref().is_some_and(|e| {
                                     e.may_have_side_effects(&ExprCtx {
                                         unresolved_ctxt,
                                         is_unresolved_ref_safe: false,
diff --git a/turbopack/crates/turbopack-swc-utils/src/emitter.rs b/turbopack/crates/turbopack-swc-utils/src/emitter.rs
@@ -102,7 +102,7 @@ impl Emitter for IssueEmitter {
         let is_lint = db
             .code
             .as_ref()
-            .map_or(false, |d| matches!(d, DiagnosticId::Lint(_)));
+            .is_some_and(|d| matches!(d, DiagnosticId::Lint(_)));
 
         let severity = (if is_lint {
             IssueSeverity::Suggestion
diff --git a/turbopack/crates/turbopack-trace-server/src/store.rs b/turbopack/crates/turbopack-trace-server/src/store.rs
@@ -73,7 +73,7 @@ impl Store {
     pub fn has_time_info(&self) -> bool {
         self.self_time_tree
             .as_ref()
-            .map_or(true, |tree| tree.len() > 0)
+            .is_none_or(|tree| tree.len() > 0)
     }
 
     pub fn add_span(

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ use crate::database::{`
`13`	`13`	`};`
`14`	`14`
`15`	`15`	`pub fn is_fresh(path: &Path) -> bool {`
`16`		`- fs::exists(path).map_or(false, \|exists\| !exists)`
	`16`	`+ fs::exists(path).is_ok_and(\|exists\| !exists)`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`pub struct FreshDbOptimization<T: KeyValueDatabase> {`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ impl<T> ChunkedVec<T> {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`pub fn is_empty(&self) -> bool {`
`52`		`- self.chunks.first().map_or(true, \|chunk\| chunk.is_empty())`
	`52`	`+ self.chunks.first().is_none_or(\|chunk\| chunk.is_empty())`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ impl DerefMut for TaskGuard<'_> {`
`482`	`482`	`}`
`483`	`483`	`}`
`484`	`484`
`485`		`-impl<'l> AggregationNodeGuard for TaskGuard<'l> {`
	`485`	`+impl AggregationNodeGuard for TaskGuard<'_> {`
`486`	`486`	`type Data = Aggregated;`
`487`	`487`	`type NodeRef = TaskId;`
`488`	`488`	`type DataChange = TaskChange;`
Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ pub enum ValueDebugFormatString<'a> {`
`379`	`379`	`),`
`380`	`380`	`}`
`381`	`381`
`382`		`-impl<'a> ValueDebugFormatString<'a> {`
	`382`	`+impl ValueDebugFormatString<'_> {`
`383`	`383`	/// Convert the `ValueDebugFormatString` into a `String`.
`384`	`384`	`///`
`385`	`385`	/// This can fail when resolving `Vc` types.