From 1f0bee0cf756f5e2852ad2e65dad7f7983e6a625 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 19 Jul 2018 13:11:42 +0200 Subject: [PATCH] Rename base to common Signed-off-by: Rudi Grinberg --- src/workspace.ml | 10 +++++----- src/workspace.mli | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/workspace.ml b/src/workspace.ml index f331d5fa..f4780297 100644 --- a/src/workspace.ml +++ b/src/workspace.ml @@ -40,7 +40,7 @@ module Context = struct name) end - module Base = struct + module Common = struct type t = { loc : Loc.t ; profile : string @@ -65,7 +65,7 @@ module Context = struct module Opam = struct type t = - { base : Base.t + { base : Common.t ; name : string ; switch : string ; root : string option @@ -73,7 +73,7 @@ module Context = struct } let t ~profile ~x = - Base.t ~profile >>= fun base -> + Common.t ~profile >>= fun base -> field "switch" string >>= fun switch -> field "name" Name.t ~default:switch >>= fun name -> field_o "root" string >>= fun root -> @@ -88,10 +88,10 @@ module Context = struct end module Default = struct - type t = Base.t + type t = Common.t let t ~profile ~x = - Base.t ~profile >>= fun t -> + Common.t ~profile >>= fun t -> return { t with targets = Target.add t.targets x } end diff --git a/src/workspace.mli b/src/workspace.mli index f3d73ebe..fa5fd6a4 100644 --- a/src/workspace.mli +++ b/src/workspace.mli @@ -8,7 +8,7 @@ module Context : sig | Native | Named of string end - module Base : sig + module Common : sig type t = { loc : Loc.t ; profile : string @@ -18,7 +18,7 @@ module Context : sig end module Opam : sig type t = - { base : Base.t + { base : Common.t ; name : string ; switch : string ; root : string option @@ -27,7 +27,7 @@ module Context : sig end module Default : sig - type t = Base.t + type t = Common.t end type t = Default of Default.t | Opam of Opam.t