Skip to content

Commit bff05c4

Browse files
authored
Fix use of camlzip in byteweight (#1609)
1 parent 95e8173 commit bff05c4

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

bap-byteweight.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ depends: [
1212
"dune" {>= "3.1"}
1313
"bap-signatures" {= version}
1414
"bap-std" {= version}
15-
"camlzip" {>= "1.0" & < "2.0"}
15+
"camlzip" {>= "1.12" & < "2.0"}
1616
"core_kernel" {>= "v0.14" & < "v0.16"}
1717
"bap-common" {= version}
1818
"ppx_bap" {= version}

dune-project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@
283283
(depends
284284
(bap-signatures (= :version))
285285
(bap-std (= :version))
286-
(camlzip (and (>= 1.0) (< 2.0)))
286+
(camlzip (and (>= 1.12) (< 2.0)))
287287
(core_kernel (and (>= v0.14) (< v0.16)))
288288
(bap-common (= :version))
289289
(ppx_bap (= :version))

lib/bap_byteweight/bap_byteweight_signatures.ml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,8 @@ let update_or_fail ?compiler target data payload path =
109109
let path = make_entry ?compiler target data in
110110
let data = Bytes.unsafe_to_string (data.save payload) in
111111
Zip.add_entry data zip path;
112-
List.iter entries ~f:(fun ({Zip.filename; extra; comment; mtime},data) ->
113-
Zip.add_entry data zip filename
114-
~extra ~comment ~mtime)
112+
List.iter entries ~f:(fun ({Zip.filename; comment; mtime},data) ->
113+
Zip.add_entry data zip filename ~comment ~mtime)
115114

116115
let copy input output =
117116
let len = 0x1000 in

0 commit comments

Comments
 (0)