Remove orError

Author: chenglou

src/Packages.ml

@@ -25,15 +25,13 @@ let newBsPackage rootPath =
     match FindFiles.findDependencyFiles ~debug:true rootPath config with
     | Error e -> Error e
     | Ok (dependencyDirectories, dependencyModules) -> (
-      match
-        compiledBase
-        |> RResult.orError
-             "You need to run bsb first so that rescript-editor-support can \
-              access the compiled artifacts.\n\
-              Once you've run bsb, restart the language server."
-      with
-      | Error e -> Error e
-      | Ok compiledBase ->
+      match compiledBase with
+      | None ->
+        Error
+          "You need to run bsb first so that rescript-editor-support can \
+           access the compiled artifacts.\n\
+           Once you've run bsb, restart the language server."
+      | Some compiledBase ->
         Ok
           (let namespace = FindFiles.getNamespace config in
            let localSourceDirs =
@@ -118,12 +116,9 @@ let getPackage ~uri state =
   if Hashtbl.mem state.rootForUri uri then
     Ok (Hashtbl.find state.packagesByRoot (Hashtbl.find state.rootForUri uri))
   else
-    match
-      findRoot ~uri state.packagesByRoot
-      |> RResult.orError "No root directory found"
-    with
-    | Error e -> Error e
-    | Ok root -> (
+    match findRoot ~uri state.packagesByRoot with
+    | None -> Error "No root directory found"
+    | Some root -> (
       match
         match root with
         | `Root rootPath ->

src/RResult.ml

@@ -1,7 +1,3 @@
-let resultOfOption err v = match v with Some v -> Ok v | None -> Error err
-
-let orError = resultOfOption
-
 let toOptionAndLog err =
   match err with
   | Error e ->

src/References.ml

@@ -66,33 +66,22 @@ let definedForLoc ~file ~getModule locKind =
     inner ~file stamp tip
   | GlobalReference (moduleName, path, tip) ->
     (maybeLog ("Getting global " ^ moduleName);
-     match
-       getModule moduleName
-       |> RResult.orError ("Cannot get module " ^ moduleName)
-     with
-     | Error e -> Error e
-     | Ok file -> (
+     match getModule moduleName with
+     | None -> Error ("Cannot get module " ^ moduleName)
+     | Some file -> (
        let env = Query.fileEnv file in
-       match
-         Query.resolvePath ~env ~path ~getModule
-         |> RResult.orError ("Cannot resolve path " ^ pathToString path)
-       with
-       | Error e -> Error e
-       | Ok (env, name) -> (
-         match
-           Query.exportedForTip ~env name tip
-           |> RResult.orError
-                ("Exported not found for tip " ^ name ^ " > " ^ tipToString tip)
-         with
-         | Error e -> Error e
-         | Ok stamp -> (
+       match Query.resolvePath ~env ~path ~getModule with
+       | None -> Error ("Cannot resolve path " ^ pathToString path)
+       | Some (env, name) -> (
+         match Query.exportedForTip ~env name tip with
+         | None ->
+           Error ("Exported not found for tip " ^ name ^ " > " ^ tipToString tip)
+         | Some stamp -> (
            maybeLog ("Getting for " ^ string_of_int stamp ^ " in " ^ name);
-           match
-             inner ~file:env.file stamp tip
-             |> RResult.orError "could not get defined"
-           with
-           | Error e -> Error e
-           | Ok res ->
+
+           match inner ~file:env.file stamp tip with
+           | None -> Error "could not get defined"
+           | Some res ->
              maybeLog "Yes!! got it";
              Ok res))))
     |> RResult.toOptionAndLog