Skip to content

Commit 0147c0c

Browse files
committed
Upgrade OCamlformat to 0.29
Signed-off-by: Christoph Knittel <ck@cca.io>
1 parent 79aaadf commit 0147c0c

124 files changed

Lines changed: 3077 additions & 3169 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ocamlformat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
profile = default
2-
version = 0.27.0
2+
version = 0.29.0
33

44
field-space = tight-decl
55
break-cases = toplevel

analysis/reactive/src/reactive.ml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,9 @@ module Scheduler = struct
360360
let nodes_with_levels =
361361
dirty
362362
|> List.filter_map (fun name ->
363-
match Hashtbl.find_opt Registry.nodes name with
364-
| Some info -> Some (info.Registry.level, name, info)
365-
| None -> None)
363+
match Hashtbl.find_opt Registry.nodes name with
364+
| Some info -> Some (info.Registry.level, name, info)
365+
| None -> None)
366366
in
367367

368368
let sorted =
@@ -875,10 +875,10 @@ let join ~name (left : ('k1, 'v1) t) (right : ('k2, 'v2) t) ~key_of ~f ?merge ()
875875
let output_entries =
876876
!all_affected
877877
|> List.filter_map (fun k3 ->
878-
if Hashtbl.mem seen k3 then None
879-
else (
880-
Hashtbl.replace seen k3 ();
881-
recompute_target k3))
878+
if Hashtbl.mem seen k3 then None
879+
else (
880+
Hashtbl.replace seen k3 ();
881+
recompute_target k3))
882882
in
883883

884884
if output_entries <> [] then (
@@ -1010,10 +1010,10 @@ let union ~name (left : ('k, 'v) t) (right : ('k, 'v) t) ?merge () : ('k, 'v) t
10101010
let output_entries =
10111011
!all_affected
10121012
|> List.filter_map (fun k ->
1013-
if Hashtbl.mem seen k then None
1014-
else (
1015-
Hashtbl.replace seen k ();
1016-
recompute_target k))
1013+
if Hashtbl.mem seen k then None
1014+
else (
1015+
Hashtbl.replace seen k ();
1016+
recompute_target k))
10171017
in
10181018

10191019
if output_entries <> [] then (

analysis/reactive/src/reactive_file_collection.ml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ let remove_batch t paths =
8787
let entries =
8888
paths
8989
|> List.filter_map (fun path ->
90-
if Hashtbl.mem t.internal.cache path then (
91-
Hashtbl.remove t.internal.cache path;
92-
Some (path, None))
93-
else None)
90+
if Hashtbl.mem t.internal.cache path then (
91+
Hashtbl.remove t.internal.cache path;
92+
Some (path, None))
93+
else None)
9494
in
9595
if entries <> [] then emit t (Reactive.Batch entries);
9696
List.length entries

analysis/reactive/test/batch_test.ml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ let test_batch_fixpoint () =
5555
incr batch_count;
5656
entries
5757
|> List.iter (fun (_, v_opt) ->
58-
match v_opt with
59-
| Some () -> incr total_added
60-
| None -> ())
58+
match v_opt with
59+
| Some () -> incr total_added
60+
| None -> ())
6161
| Set (_, ()) -> incr total_added
6262
| Remove _ -> ())
6363
fp;

analysis/reactive/test/fixpoint_incremental_test.ml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ let test_fixpoint_add_base () =
3131
| Batch entries ->
3232
entries
3333
|> List.iter (fun (k, v_opt) ->
34-
match v_opt with
35-
| Some () -> added := k :: !added
36-
| None -> removed := k :: !removed))
34+
match v_opt with
35+
| Some () -> added := k :: !added
36+
| None -> removed := k :: !removed))
3737
fp;
3838

3939
emit_init (Set ("c", ()));
@@ -299,9 +299,9 @@ let test_fixpoint_remove_spurious_root () =
299299
| Batch entries ->
300300
entries
301301
|> List.iter (fun (k, v_opt) ->
302-
match v_opt with
303-
| Some () -> added := k :: !added
304-
| None -> removed := k :: !removed))
302+
match v_opt with
303+
| Some () -> added := k :: !added
304+
| None -> removed := k :: !removed))
305305
fp;
306306

307307
(* Step 1: "b" is spuriously marked as a root *)
@@ -429,9 +429,9 @@ let test_fixpoint_remove_edge_rederivation () =
429429
| Batch entries ->
430430
entries
431431
|> List.iter (fun (k, v_opt) ->
432-
match v_opt with
433-
| Some () -> added := k :: !added
434-
| None -> removed := k :: !removed))
432+
match v_opt with
433+
| Some () -> added := k :: !added
434+
| None -> removed := k :: !removed))
435435
fp;
436436

437437
(* Add root *)
@@ -542,9 +542,9 @@ let test_fixpoint_remove_edge_entry_higher_rank_support () =
542542
| Batch entries ->
543543
entries
544544
|> List.iter (fun (k, v_opt) ->
545-
match v_opt with
546-
| Some () -> added := k :: !added
547-
| None -> removed := k :: !removed))
545+
match v_opt with
546+
| Some () -> added := k :: !added
547+
| None -> removed := k :: !removed))
548548
fp;
549549

550550
(* Add root *)

0 commit comments

Comments
 (0)