refactor(pkg): small formatting improvement (ocaml#12022)

Signed-off-by: Rudi Grinberg <[email protected]>

Author: rgrinberg

src/dune_pkg/lock_dir.ml

@@ -1060,8 +1060,7 @@ let create_latest_version
      |> Code_error.raise "Invalid package table");
   let version = Syntax.greatest_supported_version_exn Dune_lang.Pkg.syntax in
   let dependency_hash =
-    local_packages
-    |> Local_package.For_solver.non_local_dependencies
+    Local_package.For_solver.non_local_dependencies local_packages
     |> Local_package.Dependency_hash.of_dependency_formula
     |> Option.map ~f:(fun dependency_hash -> Loc.none, dependency_hash)
   in
@@ -1074,10 +1073,7 @@ let create_latest_version
       complete, Some used
   in
   let solved_for_platform_platform_specific_only =
-    Option.map
-      ~f:(fun solved_for_platform ->
-        Solver_env.remove_all_except_platform_specific solved_for_platform)
-      solved_for_platform
+    Option.map solved_for_platform ~f:Solver_env.remove_all_except_platform_specific
   in
   { version
   ; dependency_hash

src/dune_pkg/opam_solver.ml

@@ -1768,31 +1768,29 @@ let solve_lock_dir
           ~hints:[ Pp.text "add a conflict" ]
     in
     let lock_dir =
+      Package_name.Map.iter
+        pkgs_by_name
+        ~f:(fun { Lock_dir.Pkg.depends; info = { name; _ }; _ } ->
+          Lock_dir.Conditional_choice.choose_for_platform depends ~platform:solver_env
+          |> Option.iter ~f:(fun depends ->
+            List.iter depends ~f:(fun { Lock_dir.Dependency.name = dep_name; loc } ->
+              if Package_name.Map.mem local_packages dep_name
+              then
+                User_error.raise
+                  ~loc
+                  [ Pp.textf
+                      "Dune does not support packages outside the workspace depending on \
+                       packages in the workspace. The package %S is not in the workspace \
+                       but it depends on the package %S which is in the workspace."
+                      (Package_name.to_string name)
+                      (Package_name.to_string dep_name)
+                  ])));
       let expanded_solver_variable_bindings =
         let stats = Solver_stats.Updater.snapshot stats_updater in
         Solver_stats.Expanded_variable_bindings.of_variable_set
           stats.expanded_variables
           solver_env
       in
-      Package_name.Map.iter
-        pkgs_by_name
-        ~f:(fun { Lock_dir.Pkg.depends; info = { name; _ }; _ } ->
-          Option.iter
-            (Lock_dir.Conditional_choice.choose_for_platform depends ~platform:solver_env)
-            ~f:(fun depends ->
-              List.iter depends ~f:(fun { Lock_dir.Dependency.name = dep_name; loc } ->
-                if Package_name.Map.mem local_packages dep_name
-                then
-                  User_error.raise
-                    ~loc
-                    [ Pp.textf
-                        "Dune does not support packages outside the workspace depending \
-                         on packages in the workspace. The package %S is not in the \
-                         workspace but it depends on the package %S which is in the \
-                         workspace."
-                        (Package_name.to_string name)
-                        (Package_name.to_string dep_name)
-                    ])));
       Lock_dir.create_latest_version
         pkgs_by_name
         ~local_packages:(Package_name.Map.values local_packages)