From 137183f2fe166991c7a70f5d1ad4d259ab21e005 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Sat, 27 Aug 2022 20:44:13 -0400 Subject: [PATCH] small fixes, warnings --- src/base/Data_ty.ml | 1 - src/base/LIA_term.ml | 1 - src/core-logic/term.ml | 2 +- src/util/Event.ml | 3 +-- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/base/Data_ty.ml b/src/base/Data_ty.ml index 408e8dba..29a9d533 100644 --- a/src/base/Data_ty.ml +++ b/src/base/Data_ty.ml @@ -62,7 +62,6 @@ end module Cstor = struct type t = cstor - let id c = c.cstor_id let hash c = ID.hash c.cstor_id let ty_args c = Lazy.force c.cstor_args |> List.map Select.ty diff --git a/src/base/LIA_term.ml b/src/base/LIA_term.ml index 213deba1..8042c06c 100644 --- a/src/base/LIA_term.ml +++ b/src/base/LIA_term.ml @@ -1,6 +1,5 @@ open struct let hash_z = Z.hash - let[@inline] hash_q q = CCHash.combine2 (hash_z (Q.num q)) (hash_z (Q.den q)) end module LIA_pred = LRA_term.Pred diff --git a/src/core-logic/term.ml b/src/core-logic/term.ml index e77a2cb6..689f06c7 100644 --- a/src/core-logic/term.ml +++ b/src/core-logic/term.ml @@ -135,7 +135,7 @@ module Hcons = Hashcons.Make (struct | E_app (f1, a1), E_app (f2, a2) -> equal f1 f2 && equal a1 a2 | E_app_fold a1, E_app_fold a2 -> equal a1.f a2.f && equal a1.acc0 a2.acc0 - && List.equal equal a1.args a2.args + && CCList.equal equal a1.args a2.args | E_lam (_, ty1, bod1), E_lam (_, ty2, bod2) -> equal ty1 ty2 && equal bod1 bod2 | E_pi (_, ty1, bod1), E_pi (_, ty2, bod2) -> diff --git a/src/util/Event.ml b/src/util/Event.ml index cad1fe52..f22f5988 100644 --- a/src/util/Event.ml +++ b/src/util/Event.ml @@ -7,8 +7,7 @@ module Emitter = struct type nonrec ('a, 'b) t = ('a, 'b) t let emit (self : (_, unit) t) x = - if not (Vec.is_empty self.h) then - (Vec.iter [@inlined]) self.h ~f:(fun h -> h x) + if not (Vec.is_empty self.h) then Vec.iter self.h ~f:(fun h -> h x) let emit_collect (self : _ t) x : _ list = if Vec.is_empty self.h then