Revert "refactor: reduce redondant module names"

This reverts commit be01cb9.

Signed-off-by: Ambre Austen Suhamy <[email protected]>

Author: ElectreAAS

bin/build.ml

@@ -199,15 +199,15 @@ let build =
       Scheduler.go_without_rpc_server ~common ~config (fun () ->
         let open Fiber.O in
         let+ build_outcome =
-          Rpc.Common.fire_message
+          Rpc.Rpc_common.fire_message
             ~name:"build"
             ~wait:true
             ~lock_held_by
             builder
-            (Rpc.Common.Request Dune_rpc_impl.Decl.build)
+            (Rpc.Rpc_common.Request Dune_rpc_impl.Decl.build)
             targets
         in
-        Rpc.Common.wrap_build_outcome_exn ~print_on_success:true build_outcome)
+        Rpc.Rpc_common.wrap_build_outcome_exn ~print_on_success:true build_outcome)
     | Ok () ->
       let request setup =
         Target.interpret_targets (Common.root common) config setup targets

bin/diagnostics.ml

@@ -7,14 +7,14 @@ let info =
 
 let term =
   let+ (builder : Common.Builder.t) = Common.Builder.term in
-  Rpc.Common.client_term builder (fun () ->
+  Rpc.Rpc_common.client_term builder (fun () ->
     let open Fiber.O in
     let+ errors =
-      Rpc.Common.fire_message
+      Rpc.Rpc_common.fire_message
         ~name:"diagnostics_cmd"
         ~wait:false
         builder
-        (Rpc.Common.Request Dune_rpc_private.Procedures.Public.diagnostics)
+        (Rpc.Rpc_common.Request Dune_rpc_private.Procedures.Public.diagnostics)
         ()
     in
     List.iter errors ~f:(fun err ->

bin/exec.ml

@@ -228,15 +228,15 @@ let build_prog_via_rpc_if_necessary ~dir ~no_rebuild builder lock_held_by prog =
         let targets = Rpc.Group.Build.prepare_targets [ target ] in
         let open Fiber.O in
         let+ build_outcome =
-          Rpc.Common.fire_message
+          Rpc.Rpc_common.fire_message
             ~name:"build"
             ~wait:true
             ~lock_held_by
             builder
-            (Rpc.Common.Request Dune_rpc_impl.Decl.build)
+            (Rpc.Rpc_common.Request Dune_rpc_impl.Decl.build)
             targets
         in
-        Rpc.Common.wrap_build_outcome_exn ~print_on_success:false build_outcome)
+        Rpc.Rpc_common.wrap_build_outcome_exn ~print_on_success:false build_outcome)
     in
     Path.to_absolute_filename path
   | Absolute ->

bin/fmt.ml

@@ -44,17 +44,17 @@ let run_fmt_command ~common ~config ~preview builder =
   | Ok () -> Scheduler.go_with_rpc_server ~common ~config once
   | Error lock_held_by ->
     (* The --preview flag is being ignored by the RPC server, warn the user. *)
-    if preview then Rpc.Common.warn_ignore_arguments lock_held_by;
+    if preview then Rpc.Rpc_common.warn_ignore_arguments lock_held_by;
     Scheduler.go_without_rpc_server
       ~common
       ~config
-      (Rpc.Common.fire_message
+      (Rpc.Rpc_common.fire_message
          ~name:"format"
          ~wait:true
          ~warn_forwarding:false
          ~lock_held_by
          builder
-         (Rpc.Common.Request Dune_rpc.Procedures.Public.format))
+         (Rpc.Rpc_common.Request Dune_rpc.Procedures.Public.format))
 ;;
 
 let command =

bin/promotion.ml

@@ -65,15 +65,15 @@ module Apply = struct
       Scheduler.go_without_rpc_server ~common ~config (fun () ->
         let open Fiber.O in
         let+ build_outcome =
-          Rpc.Common.fire_message
+          Rpc.Rpc_common.fire_message
             ~name:"promote_many"
             ~wait:true
             ~lock_held_by
             builder
-            (Rpc.Common.Request Dune_rpc_private.Procedures.Public.promote_many)
+            (Rpc.Rpc_common.Request Dune_rpc_private.Procedures.Public.promote_many)
             files_to_promote
         in
-        Rpc.Common.wrap_build_outcome_exn ~print_on_success:true build_outcome)
+        Rpc.Rpc_common.wrap_build_outcome_exn ~print_on_success:true build_outcome)
   ;;
 
   let command = Cmd.v info term

bin/rpc/rpc.ml

@@ -1,5 +1,5 @@
 module Group = Group
-module Build = Rpc_build
-module Common = Rpc_common
-module Ping = Rpc_ping
-module Status = Rpc_status
+module Rpc_build = Rpc_build
+module Rpc_common = Rpc_common
+module Rpc_ping = Rpc_ping
+module Rpc_status = Rpc_status

bin/runtest.ml

@@ -51,15 +51,15 @@ let runtest_term =
     Scheduler.go_without_rpc_server ~common ~config (fun () ->
       let open Fiber.O in
       let+ build_outcome =
-        Rpc.Common.fire_message
+        Rpc.Rpc_common.fire_message
           ~name:"runtest"
           ~wait:false
           ~lock_held_by
           builder
-          (Rpc.Common.Request Dune_rpc.Procedures.Public.runtest)
+          (Rpc.Rpc_common.Request Dune_rpc.Procedures.Public.runtest)
           dir_or_cram_test_paths
       in
-      Rpc.Common.wrap_build_outcome_exn ~print_on_success:true build_outcome)
+      Rpc.Rpc_common.wrap_build_outcome_exn ~print_on_success:true build_outcome)
 ;;
 
 let commands =

bin/shutdown.ml

@@ -7,13 +7,13 @@ let info =
 
 let term =
   let+ builder = Common.Builder.term in
-  Rpc.Common.client_term
+  Rpc.Rpc_common.client_term
     builder
-    (Rpc.Common.fire_message
+    (Rpc.Rpc_common.fire_message
        ~name:"shutdown_cmd"
        ~wait:false
        builder
-       (Rpc.Common.Notification Dune_rpc_private.Procedures.Public.shutdown))
+       (Rpc.Rpc_common.Notification Dune_rpc_private.Procedures.Public.shutdown))
 ;;
 
 let command = Cmd.v info term

bin/tools/tools_common.ml

@@ -38,15 +38,15 @@ let build_dev_tool_via_rpc builder lock_held_by dev_tool =
   let targets = Rpc.Group.Build.prepare_targets [ target ] in
   let open Fiber.O in
   let+ build_outcome =
-    Rpc.Common.fire_message
+    Rpc.Rpc_common.fire_message
       ~name:"build"
       ~wait:true
       ~lock_held_by
       builder
-      (Rpc.Common.Request Dune_rpc_impl.Decl.build)
+      (Rpc.Rpc_common.Request Dune_rpc_impl.Decl.build)
       targets
   in
-  Rpc.Common.wrap_build_outcome_exn ~print_on_success:false build_outcome
+  Rpc.Rpc_common.wrap_build_outcome_exn ~print_on_success:false build_outcome
 ;;
 
 let lock_and_build_dev_tool ~common ~config builder dev_tool =