remove box_syntax

Box syntax removed in rust-lang/rust#108471 Removed all `#![features(box_syntax)]` and ran `cargo fix --broken-code` to replace all previous box_patterns uses of `box` with `Box::new()`.
seeplusplus · Apr 21, 2023 · 9bcb212 · 9bcb212
1 parent 9066c95
commit 9bcb212
Show file tree

Hide file tree

Showing 29 changed files with 177 additions and 184 deletions.
diff --git a/crates/turbo-tasks-fs/src/lib.rs b/crates/turbo-tasks-fs/src/lib.rs
@@ -3,7 +3,6 @@
 #![feature(min_specialization)]
 #![feature(iter_advance_by)]
 #![feature(io_error_more)]
-#![feature(box_syntax)]
 #![feature(round_char_boundary)]
 
 pub mod attach;
@@ -1684,7 +1683,7 @@ impl FileContent {
                 match serde_path_to_error::deserialize(de) {
                     Ok(data) => FileJsonContent::Content(data),
                     Err(e) => FileJsonContent::Unparseable(
-                        box UnparseableJson::from_serde_path_to_error(e),
+                        Box::new(UnparseableJson::from_serde_path_to_error(e)),
                     ),
                 }
             }
@@ -1709,10 +1708,10 @@ impl FileContent {
                             "text content doesn't contain any json data",
                         ),
                     },
-                    Err(e) => FileJsonContent::Unparseable(box UnparseableJson::from_jsonc_error(
+                    Err(e) => FileJsonContent::Unparseable(Box::new(UnparseableJson::from_jsonc_error(
                         e,
                         string.as_ref(),
-                    )),
+                    ))),
                 },
                 Err(_) => FileJsonContent::unparseable("binary is not valid utf-8 text"),
             },

diff --git a/crates/turbo-tasks-memory/src/lib.rs b/crates/turbo-tasks-memory/src/lib.rs
@@ -1,6 +1,5 @@
 #![feature(hash_drain_filter)]
 #![feature(option_get_or_insert_default)]
-#![feature(box_syntax)]
 #![feature(type_alias_impl_trait)]
 #![feature(lint_reasons)]
 #![feature(box_patterns)]

diff --git a/crates/turbo-tasks-memory/src/task.rs b/crates/turbo-tasks-memory/src/task.rs
@@ -528,10 +528,10 @@ impl Task {
         Self {
             id,
             ty,
-            state: RwLock::new(TaskMetaState::Full(box TaskState::new(
+            state: RwLock::new(TaskMetaState::Full(Box::new(TaskState::new(
                 description,
                 stats_type,
-            ))),
+            )))),
         }
     }
 
@@ -546,11 +546,11 @@ impl Task {
         Self {
             id,
             ty,
-            state: RwLock::new(TaskMetaState::Full(box TaskState::new_scheduled_in_scope(
+            state: RwLock::new(TaskMetaState::Full(Box::new(TaskState::new_scheduled_in_scope(
                 description,
                 scope,
                 stats_type,
-            ))),
+            )))),
         }
     }
 
@@ -565,11 +565,11 @@ impl Task {
         Self {
             id,
             ty,
-            state: RwLock::new(TaskMetaState::Full(box TaskState::new_scheduled_in_scope(
+            state: RwLock::new(TaskMetaState::Full(Box::new(TaskState::new_scheduled_in_scope(
                 description,
                 scope,
                 stats_type,
-            ))),
+            )))),
         }
     }
 
@@ -579,18 +579,18 @@ impl Task {
         trait_type_id: TraitTypeId,
         stats_type: StatsType,
     ) -> Self {
-        let ty = TaskType::ReadScopeCollectibles(box ReadScopeCollectiblesTaskType {
+        let ty = TaskType::ReadScopeCollectibles(Box::new(ReadScopeCollectiblesTaskType {
             scope: target_scope,
             trait_type: trait_type_id,
-        });
+        }));
         let description = Self::get_event_description_static(id, &ty);
         Self {
             id,
             ty,
-            state: RwLock::new(TaskMetaState::Full(box TaskState::new(
+            state: RwLock::new(TaskMetaState::Full(Box::new(TaskState::new(
                 description,
                 stats_type,
-            ))),
+            )))),
         }
     }
 
@@ -601,19 +601,19 @@ impl Task {
         trait_type_id: TraitTypeId,
         stats_type: StatsType,
     ) -> Self {
-        let ty = TaskType::ReadTaskCollectibles(box ReadTaskCollectiblesTaskType {
+        let ty = TaskType::ReadTaskCollectibles(Box::new(ReadTaskCollectiblesTaskType {
             task: target_task,
             trait_type: trait_type_id,
-        });
+        }));
         let description = Self::get_event_description_static(id, &ty);
         Self {
             id,
             ty,
-            state: RwLock::new(TaskMetaState::Full(box TaskState::new_root_scoped(
+            state: RwLock::new(TaskMetaState::Full(Box::new(TaskState::new_root_scoped(
                 description,
                 scope,
                 stats_type,
-            ))),
+            )))),
         }
     }
 
@@ -2787,7 +2787,7 @@ impl Task {
         if unset {
             *state = TaskMetaState::Unloaded(UnloadedTaskState { stats_type });
         } else {
-            *state = TaskMetaState::Partial(box PartialTaskState { scopes, stats_type });
+            *state = TaskMetaState::Partial(Box::new(PartialTaskState { scopes, stats_type }));
         }
         drop(state);
 

diff --git a/crates/turbo-tasks-memory/src/task/meta_state.rs b/crates/turbo-tasks-memory/src/task/meta_state.rs
@@ -187,7 +187,7 @@ impl<'a> TaskMetaStateWriteGuard<'a> {
                 )
                 .into_partial()
                 .unwrap();
-                *guard = TaskMetaState::Full(box partial.into_full(task.get_event_description()));
+                *guard = TaskMetaState::Full(Box::new(partial.into_full(task.get_event_description())));
             }
             TaskMetaState::Unloaded(_) => {
                 let unloaded = replace(
@@ -199,7 +199,7 @@ impl<'a> TaskMetaStateWriteGuard<'a> {
                 )
                 .into_unloaded()
                 .unwrap();
-                *guard = TaskMetaState::Full(box unloaded.into_full(task.get_event_description()));
+                *guard = TaskMetaState::Full(Box::new(unloaded.into_full(task.get_event_description())));
             }
         }
         WriteGuard::new(guard, TaskMetaState::as_full, TaskMetaState::as_full_mut)
@@ -228,7 +228,7 @@ impl<'a> TaskMetaStateWriteGuard<'a> {
                 )
                 .into_unloaded()
                 .unwrap();
-                *guard = TaskMetaState::Partial(box unloaded.into_partial());
+                *guard = TaskMetaState::Partial(Box::new(unloaded.into_partial()));
                 TaskMetaStateWriteGuard::Partial(WriteGuard::new(
                     guard,
                     TaskMetaState::as_partial,

diff --git a/crates/turbo-tasks-testing/src/lib.rs b/crates/turbo-tasks-testing/src/lib.rs
@@ -1,6 +1,5 @@
 //! Testing utilities and macros for turbo-tasks and applications based on it.
 
-#![feature(box_syntax)]
 
 mod macros;
 pub mod retry;

diff --git a/crates/turbo-tasks/src/lib.rs b/crates/turbo-tasks/src/lib.rs
@@ -28,7 +28,6 @@
 #![feature(hash_drain_filter)]
 #![deny(unsafe_op_in_unsafe_fn)]
 #![feature(result_flattening)]
-#![feature(box_syntax)]
 #![feature(error_generic_member_access)]
 #![feature(provide_any)]
 #![feature(new_uninit)]

diff --git a/crates/turbopack-css/src/lib.rs b/crates/turbopack-css/src/lib.rs
@@ -1,6 +1,5 @@
 #![feature(min_specialization)]
 #![feature(box_patterns)]
-#![feature(box_syntax)]
 #![feature(iter_intersperse)]
 #![feature(int_roundings)]
 

diff --git a/crates/turbopack-ecmascript/src/analyzer/builtin.rs b/crates/turbopack-ecmascript/src/analyzer/builtin.rs
@@ -74,7 +74,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool {
                 *value = JsValue::alternatives(
                     take(alts)
                         .into_iter()
-                        .map(|alt| JsValue::member(box alt, prop.clone()))
+                        .map(|alt| JsValue::member(Box::new(alt), prop.clone()))
                         .collect(),
                 );
                 true
@@ -87,7 +87,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool {
             } => {
                 fn items_to_alternatives(items: &mut Vec<JsValue>, prop: &mut JsValue) -> JsValue {
                     items.push(JsValue::unknown(
-                        JsValue::member(box JsValue::array(Vec::new()), box take(prop)),
+                        JsValue::member(Box::new(JsValue::array(Vec::new())), Box::new(take(prop))),
                         "unknown array prototype methods or values",
                     ));
                     JsValue::alternatives(take(items))
@@ -105,7 +105,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool {
                                 true
                             } else {
                                 *value = JsValue::unknown(
-                                    JsValue::member(box take(obj), box take(prop)),
+                                    JsValue::member(Box::new(take(obj)), Box::new(take(prop))),
                                     "invalid index",
                                 );
                                 true
@@ -127,7 +127,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool {
                         *value = JsValue::alternatives(
                             take(alts)
                                 .into_iter()
-                                .map(|alt| JsValue::member(box obj.clone(), box alt))
+                                .map(|alt| JsValue::member(Box::new(obj.clone()), Box::new(alt)))
                                 .collect(),
                         );
                         true
@@ -160,7 +160,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool {
                             ObjectPart::Spread(_) => {
                                 values.push(JsValue::unknown(
                                     JsValue::member(
-                                        box JsValue::object(vec![take(part)]),
+                                        Box::new(JsValue::object(vec![take(part)])),
                                         prop.clone(),
                                     ),
                                     "spreaded object",
@@ -170,7 +170,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool {
                     }
                     if include_unknown {
                         values.push(JsValue::unknown(
-                            JsValue::member(box JsValue::object(Vec::new()), box take(prop)),
+                            JsValue::member(Box::new(JsValue::object(Vec::new())), Box::new(take(prop))),
                             "unknown object prototype methods or values",
                         ));
                     }
@@ -262,7 +262,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool {
                         *value = JsValue::alternatives(
                             take(alts)
                                 .into_iter()
-                                .map(|alt| JsValue::member(box obj.clone(), box alt))
+                                .map(|alt| JsValue::member(Box::new(obj.clone()), Box::new(alt)))
                                 .collect(),
                         );
                         true
@@ -336,7 +336,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool {
                                             .enumerate()
                                             .map(|(i, item)| {
                                                 JsValue::call(
-                                                    box func.clone(),
+                                                    Box::new(func.clone()),
                                                     vec![
                                                         item,
                                                         JsValue::Constant(ConstantValue::Num(
@@ -361,7 +361,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool {
                         take(alts)
                             .into_iter()
                             .map(|alt| {
-                                JsValue::member_call(box alt, box prop.clone(), args.clone())
+                                JsValue::member_call(Box::new(alt), Box::new(prop.clone()), args.clone())
                             })
                             .collect(),
                     );
@@ -372,7 +372,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool {
             // without special handling, we convert it into a normal call like
             // `(obj.prop)(arg1, arg2, ...)`
             *value = JsValue::call(
-                box JsValue::member(box take(obj), box take(prop)),
+                Box::new(JsValue::member(Box::new(take(obj)), Box::new(take(prop)))),
                 take(args),
             );
             true
@@ -383,7 +383,7 @@ pub fn replace_builtin(value: &mut JsValue) -> bool {
             *value = JsValue::alternatives(
                 take(alts)
                     .into_iter()
-                    .map(|alt| JsValue::call(box alt, args.clone()))
+                    .map(|alt| JsValue::call(Box::new(alt), args.clone()))
                     .collect(),
             );
             true