Merge pull request ocaml#3529 from rgrinberg/cram

[cram] file generation

boot/duneboot.ml

@@ -393,12 +393,12 @@ end = struct
           tmp_files := Files.empty;
           Files.iter fns ~f:(fun fn -> try Sys.remove fn with _ -> ()))
 
-    let create prefix suffix =
+    let file prefix suffix =
       let fn = Filename.temp_file prefix suffix in
       tmp_files := Files.add fn !tmp_files;
       fn
 
-    let destroy fn =
+    let destroy_file fn =
       (try Sys.remove fn with _ -> ());
       tmp_files := Files.remove fn !tmp_files
   end
@@ -444,15 +444,15 @@ end = struct
       done
 
     let open_temp_file () =
-      let out = Temp.create "duneboot-" ".output" in
+      let out = Temp.file "duneboot-" ".output" in
       let fd =
         Unix.openfile out [ O_WRONLY; O_CREAT; O_TRUNC; O_SHARE_DELETE ] 0o666
       in
       (out, fd)
 
     let read_temp fn =
       let s = read_file fn in
-      Temp.destroy fn;
+      Temp.destroy_file fn;
       s
 
     let initial_cwd = Sys.getcwd ()

otherlibs/cram/bin/cram_lexer.mli

@@ -1,8 +1,8 @@
 (** .t file parser *)
 
 (** A command or comment. Output blocks are skipped *)
-type block =
-  | Command of string list
+type 'command block =
+  | Command of 'command
   | Comment of string list
 
-val block : Lexing.lexbuf -> block option
+val block : Lexing.lexbuf -> string list block option

otherlibs/cram/bin/cram_lexer.mll

@@ -1,6 +1,6 @@
 {
-type block =
-  | Command of string list
+type 'command block =
+  | Command of 'command
   | Comment of string list
 }