From 9b7cfefb06293778862d880f5c744c3bd51a7370 Mon Sep 17 00:00:00 2001
From: Gal Schlezinger <gal@spitfire.co.il>
Date: Sun, 7 Jul 2019 10:32:23 +0300
Subject: [PATCH] format versions before uninstalling

---
 executable/Uninstall.re | 75 +++++++++++++++++++++--------------------
 executable/Use.re       |  2 +-
 library/Http.re         |  2 +-
 library/Versions.re     |  2 +-
 4 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/executable/Uninstall.re b/executable/Uninstall.re
index f7d19e59f..fb99eba25 100644
--- a/executable/Uninstall.re
+++ b/executable/Uninstall.re
@@ -1,41 +1,42 @@
 open Fnm;
-open Lwt;
+open Lwt.Infix;
 
 let run = (~version) => {
-  Versions.getInstalledVersions()
-  >|= List.find_opt(x => Versions.Local.(x.name == version))
-  >>= (
-    installedVersion =>
-      switch (installedVersion) {
-      | None =>
-        Logger.error(
-          <Pastel>
-            "The version "
-            <Pastel color=Pastel.Cyan> version </Pastel>
-            " is not installed."
-          </Pastel>,
-        );
-        exit(1);
-      | Some(installedVersion) =>
-        Logger.debug(
-          <Pastel>
-            "Uninstalling node "
-            <Pastel color=Pastel.Cyan>
-              Versions.Local.(installedVersion.name)
-            </Pastel>
-          </Pastel>,
-        );
-        let%lwt _ = Versions.Local.remove(installedVersion);
-        Logger.info(
-          <Pastel>
-            "Node version "
-            <Pastel color=Pastel.Cyan>
-              Versions.Local.(installedVersion.name)
-            </Pastel>
-            " has correctly been removed."
-          </Pastel>,
-        )
-        |> Lwt.return;
-      }
-  );
+  let version = Versions.format(version);
+
+  let%lwt installedVersion =
+    Versions.getInstalledVersions()
+    >|= List.find_opt(x => Versions.Local.(x.name == version));
+
+  switch (installedVersion) {
+  | None =>
+    Logger.error(
+      <Pastel>
+        "The version "
+        <Pastel color=Pastel.Cyan> version </Pastel>
+        " is not installed."
+      </Pastel>,
+    );
+    exit(1);
+  | Some(installedVersion) =>
+    Logger.debug(
+      <Pastel>
+        "Uninstalling node "
+        <Pastel color=Pastel.Cyan>
+          Versions.Local.(installedVersion.name)
+        </Pastel>
+      </Pastel>,
+    );
+    let%lwt _ = Versions.Local.remove(installedVersion);
+    Logger.info(
+      <Pastel>
+        "Node version "
+        <Pastel color=Pastel.Cyan>
+          Versions.Local.(installedVersion.name)
+        </Pastel>
+        " has correctly been removed."
+      </Pastel>,
+    );
+    Lwt.return_unit;
+  };
 };
diff --git a/executable/Use.re b/executable/Use.re
index 945cfd257..877198460 100644
--- a/executable/Use.re
+++ b/executable/Use.re
@@ -20,7 +20,7 @@ let error = (~quiet, arg) =>
   };
 
 let switchVersion = (~version, ~quiet) => {
-  open Lwt;
+  open Lwt.Infix;
   let info = info(~quiet);
   let debug = debug(~quiet);
   let%lwt parsedVersion =
diff --git a/library/Http.re b/library/Http.re
index b02aafb07..55b7d487a 100644
--- a/library/Http.re
+++ b/library/Http.re
@@ -1,4 +1,4 @@
-open Lwt;
+open Lwt.Infix;
 open Cohttp;
 open Cohttp_lwt_unix;
 
diff --git a/library/Versions.re b/library/Versions.re
index 19353d32f..500fa6228 100644
--- a/library/Versions.re
+++ b/library/Versions.re
@@ -46,7 +46,7 @@ module Local = {
   let remove = version => Fs.rmdir(version.fullPath);
 
   let getLatestInstalledNameByPrefix = prefix => {
-    open Lwt;
+    open Lwt.Infix;
     let%lwt versions =
       Lwt.catch(
         () =>