Some more fixes

Author: est31

compiler/rustc_infer/src/infer/error_reporting/mod.rs

@@ -717,9 +717,9 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
                             err.multipart_suggestion(
                                 "consider removing this semicolon and boxing the expressions",
                                 vec![
-                                    (prior_arm.shrink_to_lo(), "box (".to_string()),
+                                    (prior_arm.shrink_to_lo(), "Box::new(".to_string()),
                                     (prior_arm.shrink_to_hi(), ")".to_string()),
-                                    (arm_span.shrink_to_lo(), "box (".to_string()),
+                                    (arm_span.shrink_to_lo(), "Box::new(".to_string()),
                                     (arm_span.shrink_to_hi(), ")".to_string()),
                                     (sp, String::new()),
                                 ],
@@ -767,9 +767,9 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
                         err.multipart_suggestion(
                             "consider removing this semicolon and boxing the expression",
                             vec![
-                                (then.shrink_to_lo(), "box (".to_string()),
+                                (then.shrink_to_lo(), "Box::new(".to_string()),
                                 (then.shrink_to_hi(), ")".to_string()),
-                                (else_sp.shrink_to_lo(), "box (".to_string()),
+                                (else_sp.shrink_to_lo(), "Box::new(".to_string()),
                                 (else_sp.shrink_to_hi(), ")".to_string()),
                                 (sp, String::new()),
                             ],
@@ -812,8 +812,11 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
         );
         let sugg = arm_spans
             .flat_map(|sp| {
-                vec![(sp.shrink_to_lo(), "box (".to_string()), (sp.shrink_to_hi(), ")".to_string())]
-                    .into_iter()
+                vec![
+                    (sp.shrink_to_lo(), "Box::new(".to_string()),
+                    (sp.shrink_to_hi(), ")".to_string()),
+                ]
+                .into_iter()
             })
             .collect::<Vec<_>>();
         err.multipart_suggestion(

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

@@ -1157,14 +1157,14 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
             err.note(impl_trait_msg);
         } else {
             if is_object_safe {
-                // Suggest `-> Box<dyn Trait>` and `box (returned_value)`.
+                // Suggest `-> Box<dyn Trait>` and `Box::new(returned_value)`.
                 // Get all the return values and collect their span and suggestion.
                 let mut suggestions: Vec<_> = visitor
                     .returns
                     .iter()
                     .flat_map(|expr| {
                         vec![
-                            (expr.span.shrink_to_lo(), "box (".to_string()),
+                            (expr.span.shrink_to_lo(), "Box::new(".to_string()),
                             (expr.span.shrink_to_hi(), ")".to_string()),
                         ]
                         .into_iter()

compiler/rustc_typeck/src/check/coercion.rs

@@ -1608,7 +1608,7 @@ impl<'tcx, 'exprs, E: AsCoercionSite> CoerceMany<'tcx, 'exprs, E> {
                     .into_iter()
                     .flat_map(|sp| {
                         vec![
-                            (sp.shrink_to_lo(), "box (".to_string()),
+                            (sp.shrink_to_lo(), "Box::new(".to_string()),
                             (sp.shrink_to_hi(), ")".to_string()),
                         ]
                         .into_iter()