Merge pull request #561 from diml/small-lib-improvements

Small lib improvements
ocaml · Mar 1, 2018 · 7ed033c · 7ed033c
2 parents 45535f7 + d5ebd0e
commit 7ed033c
Show file tree

Hide file tree

Showing 7 changed files with 342 additions and 359 deletions.
diff --git a/src/inline_tests.ml b/src/inline_tests.ml
@@ -54,20 +54,20 @@ module Backend = struct
 
     type t =
       { info             : Info.t
-      ; id               : Lib.Id.t
+      ; lib              : Lib.t
       ; runner_libraries : (Lib.t list, exn) result
       ; extends          : (    t list, exn) result option
       }
 
     let desc ~plural = "inline tests backend" ^ if plural then "s" else ""
     let desc_article = "an"
 
-    let id t = t.id
+    let lib  t = t.lib
     let deps t = t.extends
 
-    let instantiate ~resolve ~get id (info : Info.t) =
+    let instantiate ~resolve ~get lib (info : Info.t) =
       { info
-      ; id
+      ; lib
       ; runner_libraries = Result.all (List.map info.runner_libraries ~f:resolve)
       ; extends =
           let open Result.O in
@@ -87,7 +87,7 @@ module Backend = struct
     let to_sexp t =
       let open Sexp.To_sexp in
       let lib x = string (Lib.name x) in
-      let f x = string x.id.name in
+      let f x = string (Lib.name x.lib) in
       ((1, 0),
        record
          [ "runner_libraries", list lib (Result.ok_exn t.runner_libraries)