From 4b191b2b0357c5ceaa292774d73dad4512100a9a Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Sun, 11 Mar 2018 11:17:09 +0700
Subject: [PATCH] s/Env.get_var/Env.get/

---
 src/context.ml | 6 +++---
 src/env.ml     | 2 +-
 src/env.mli    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/context.ml b/src/context.ml
index ccf6dc01..ff59ee66 100644
--- a/src/context.ml
+++ b/src/context.ml
@@ -251,7 +251,7 @@ let create ~(kind : Kind.t) ~path ~env_extra ~name ~merlin
       && version >= (4, 03, 0)
       && version <  (4, 05, 0) then
         let value =
-          match Env.get_var env "OCAMLPARAM" with
+          match Env.get env "OCAMLPARAM" with
           | None -> "color=always,_"
           | Some s -> "color=always," ^ s
         in
@@ -274,7 +274,7 @@ let create ~(kind : Kind.t) ~path ~env_extra ~name ~merlin
       ; build_dir
       ; path
       ; toplevel_path =
-          Option.map (Env.get_var env "OCAML_TOPLEVEL_PATH") ~f:Path.absolute
+          Option.map (Env.get env "OCAML_TOPLEVEL_PATH") ~f:Path.absolute
 
       ; ocaml_bin  = dir
       ; ocaml      = (match which "ocaml" with Some p -> p | None -> prog_not_found_in_path "ocaml")
@@ -422,7 +422,7 @@ let env_for_exec t =
   let cwd = Sys.getcwd () in
   let extend_var var v =
     let v = Filename.concat cwd (Path.to_string v) in
-    match Env.get_var t.env var with
+    match Env.get t.env var with
     | None -> (var, v)
     | Some prev -> (var, sprintf "%s%c%s" v sep prev)
   in
diff --git a/src/env.ml b/src/env.ml
index fbdccea0..cf533782 100644
--- a/src/env.ml
+++ b/src/env.ml
@@ -55,7 +55,7 @@ let get_env_base env var =
   in
   loop 0
 
-let get_var t v =
+let get t v =
   match Map.find t.extra v with
   | None -> get_env_base t.base v
   | Some _ as v -> v
diff --git a/src/env.mli b/src/env.mli
index 81b85e62..0bb9ef9a 100644
--- a/src/env.mli
+++ b/src/env.mli
@@ -13,6 +13,6 @@ val initial : unit -> t
 
 val to_unix : t -> string array
 
-val get_var : t -> Var.t -> string option
+val get : t -> Var.t -> string option
 
 val extend : t -> vars:string Map.t -> t