Skip to content

Commit 4608e1b

Browse files
Leonidas-from-XIVrgrinberg
authored andcommitted
Update to our vendored copy of opam-file-format
This copy is a fork of opam-file-format.2.1.6 with out patches applied. Signed-off-by: Marek Kubica <[email protected]>
1 parent 4702483 commit 4608e1b

File tree

12 files changed

+214
-11
lines changed

12 files changed

+214
-11
lines changed

boot/libs.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ let local_libraries =
3333
; ("src/fiber_util", Some "Fiber_util", false, None)
3434
; ("src/dune_cache_storage", Some "Dune_cache_storage", false, None)
3535
; ("src/dune_cache", Some "Dune_cache", false, None)
36-
; ("vendor/opam-file-format/src", None, false, None)
36+
; ("vendor/opam-file-format", None, false, None)
3737
; ("otherlibs/action-plugin/src", Some "Dune_action_plugin", false, None)
3838
; ("otherlibs/chrome-trace/src", Some "Chrome_trace", false, None)
3939
; ("vendor/spawn/src", Some "Spawn", false, None)

vendor/opam-file-format/LICENSE

Lines changed: 198 additions & 0 deletions
Large diffs are not rendered by default.
File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ exception Error of string
1818

1919
let newline lexbuf = Lexing.new_line lexbuf
2020
let error fmt =
21-
Printf.kprintf (fun msg -> raise (Error msg)) fmt
21+
Printf.ksprintf (fun msg -> raise (Error msg)) fmt
2222

2323
let relop = function
2424
| "=" -> `Eq
File renamed without changes.
File renamed without changes.

vendor/opam-file-format/src/opamPrinter.ml renamed to vendor/opam-file-format/opamPrinter.ml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,7 @@ module FullPos = struct
426426
| Bool b -> Format.fprintf fmt "%b" b
427427
| String s ->
428428
if String.contains s '\n'
429-
then Format.fprintf fmt "\"\"\"%s%s\"\"\""
430-
(if s.[0] = '\n' then "" else "\\\n")
429+
then Format.fprintf fmt "\"\"\"\n%s\"\"\""
431430
(escape_string ~triple:true s)
432431
else Format.fprintf fmt "\"%s\"" (escape_string s)
433432
| List l ->

0 commit comments

Comments
 (0)