Skip to content

Commit 6fb4792

Browse files
committed
Update to Eio 0.12
1 parent 7a4e710 commit 6fb4792

4 files changed

Lines changed: 13 additions & 12 deletions

File tree

src/cli/strings.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type traversal = {
4141

4242
type job = {
4343
file_type: file_type;
44-
eio_path: Eio.Fs.dir Eio.Path.t;
44+
eio_path: [< Eio.Fs.dir_ty ] Eio.Path.t;
4545
path: string;
4646
template_script: Vue.template_script;
4747
slow_pug: bool;
@@ -108,7 +108,7 @@ let rec traverse ~fs ~stderr ({ slow_pug; template_script; counts; wp; _ } as tr
108108
| None -> ()
109109
| Some file_type ->
110110
let job = { file_type; eio_path = Eio.Path.(fs / path); path; template_script; slow_pug } in
111-
let collector = Eio.Workpool.run_exn traversal.wp (fun () -> process_job job) in
111+
let collector = Eio.Workpool.submit_exn traversal.wp (fun () -> process_job job) in
112112
let count =
113113
match job.file_type with
114114
| JS -> counts.js

src/parsing/basic.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@ val exec_parser_eio :
6060
'a Angstrom.t ->
6161
path:string ->
6262
language_name:string ->
63-
#Eio.Flow.source ->
63+
_ Eio.Flow.source ->
6464
'b

src/utils/io.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let traversal_jobs_per_core = 4
1010

1111
let num_systhreads = 2
1212

13-
let stat wp path : Core_unix.stats = Eio.Workpool.run_exn wp (fun () -> Core_unix.stat path)
13+
let stat wp path : Core_unix.stats = Eio.Workpool.submit_exn wp (fun () -> Core_unix.stat path)
1414

1515
let load_flow flow =
1616
let open Eio in

strings.opam

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ homepage: "https://github.com/okTurtles/strings"
1313
doc: "https://github.com/okTurtles/strings"
1414
bug-reports: "https://github.com/okTurtles/strings/issues"
1515
pin-depends: [
16-
[ "angstrom-eio.0.15.0.custom" "git+https://github.com/SGrondin/angstrom.git#137d5ba2bb55f99b5278c11ab0c967669f2b998a" ]
17-
[ "angstrom.0.15.0.custom" "git+https://github.com/SGrondin/angstrom.git#137d5ba2bb55f99b5278c11ab0c967669f2b998a" ]
18-
[ "eio.0.11.custom" "git+https://github.com/SGrondin/eio.git#full-workpool" ]
19-
[ "eio_posix.0.11.custom" "git+https://github.com/SGrondin/eio.git#full-workpool" ]
20-
[ "eio_linux.0.11.custom" "git+https://github.com/SGrondin/eio.git#full-workpool" ]
21-
[ "eio_main.0.11.custom" "git+https://github.com/SGrondin/eio.git#full-workpool" ]
16+
[ "angstrom-eio.0.15.0.custom" "git+https://github.com/SGrondin/angstrom.git#1a961940ffb746379b4bdc648bc194501b65348a" ]
17+
[ "angstrom.0.15.0.custom" "git+https://github.com/SGrondin/angstrom.git#1a961940ffb746379b4bdc648bc194501b65348a" ]
18+
[ "eio.0.12.custom" "git+https://github.com/SGrondin/eio.git#37e0dc0d98bd6c18506a974c3ce2b81e89be30a9" ]
19+
[ "eio_posix.0.12.custom" "git+https://github.com/SGrondin/eio.git#37e0dc0d98bd6c18506a974c3ce2b81e89be30a9" ]
20+
[ "eio_linux.0.12.custom" "git+https://github.com/SGrondin/eio.git#37e0dc0d98bd6c18506a974c3ce2b81e89be30a9" ]
21+
[ "eio_main.0.12.custom" "git+https://github.com/SGrondin/eio.git#37e0dc0d98bd6c18506a974c3ce2b81e89be30a9" ]
22+
[ "SZXX.4.0.1.custom" "git+https://github.com/asemio/SZXX.git#4.0.1" ]
2223
]
2324
depends: [
2425
"ocaml" { = "5.0.0" }
@@ -28,7 +29,7 @@ depends: [
2829
"ocamlformat" { = "0.25.1" & with-test }
2930
"ocaml-lsp-server" { with-test }
3031

31-
"eio_main" { = "0.11.custom" }
32+
"eio_main" { = "0.12.custom" }
3233

3334
"angstrom" { = "0.15.0.custom" }
3435
"angstrom-eio" { = "0.15.0.custom" }
@@ -42,5 +43,5 @@ depends: [
4243
"yojson"
4344
"uuidm"
4445
"wtf8"
45-
"SZXX" { >= "4.0.0" }
46+
"SZXX" { = "4.0.1.custom" }
4647
]

0 commit comments

Comments
 (0)