diff --git a/infer/src/bufferoverrun/bufferOverrunUtils.ml b/infer/src/bufferoverrun/bufferOverrunUtils.ml index c9bb5e451..9f5b24a10 100644 --- a/infer/src/bufferoverrun/bufferOverrunUtils.ml +++ b/infer/src/bufferoverrun/bufferOverrunUtils.ml @@ -389,9 +389,9 @@ module ReplaceCallee = struct when Procname.C.is_make_shared name -> ( match strip_ttype args with | Some (class_typ_templ :: param_typs_templ) -> - let open Option.Let_syntax in - let%bind class_name = Typ.name class_typ_templ in - let%bind {Struct.methods} = Tenv.lookup tenv class_name in + let open IOption.Let_syntax in + let* class_name = Typ.name class_typ_templ in + let* {Struct.methods} = Tenv.lookup tenv class_name in List.find methods ~f:(is_cpp_constructor_with_types get_formals class_typ_templ param_typs_templ) | _ -> diff --git a/infer/src/deadcode/dune.in b/infer/src/deadcode/dune.in index c3e2431d2..86f61b351 100644 --- a/infer/src/deadcode/dune.in +++ b/infer/src/deadcode/dune.in @@ -17,7 +17,7 @@ Format.sprintf (ocamlopt_flags (%s)) (libraries %s) (modules All_infer_in_one_file) - (preprocess (pps ppx_compare ppx_fields_conv ppx_hash ppx_let ppx_sexp_conv ppx_variants_conv -no-check)) + (preprocess (pps ppx_compare ppx_fields_conv ppx_hash ppx_sexp_conv ppx_variants_conv -no-check)) ) |} (String.concat " " common_cflags) diff --git a/infer/src/dune.in b/infer/src/dune.in index 64c8f060e..9b09cd1fe 100644 --- a/infer/src/dune.in +++ b/infer/src/dune.in @@ -70,7 +70,7 @@ let stanzas = (ocamlopt_flags (%s)) (libraries %s) (modules :standard \ %s infertop) - (preprocess (pps ppx_compare ppx_fields_conv ppx_hash ppx_let ppx_sexp_conv ppx_variants_conv -no-check)) + (preprocess (pps ppx_compare ppx_fields_conv ppx_hash ppx_sexp_conv ppx_variants_conv -no-check)) ) (documentation @@ -91,7 +91,7 @@ let stanzas = (ocamlopt_flags (%s)) (libraries InferModules) (modules %s) - (preprocess (pps ppx_compare ppx_fields_conv ppx_hash ppx_let ppx_sexp_conv ppx_variants_conv -no-check)) + (preprocess (pps ppx_compare ppx_fields_conv ppx_hash ppx_sexp_conv ppx_variants_conv -no-check)) ) |} (String.concat " " infer_binaries) @@ -106,7 +106,7 @@ let stanzas = (flags (%s)) (libraries utop InferModules) (modules Infertop) - (preprocess (pps ppx_compare ppx_fields_conv ppx_hash ppx_let ppx_sexp_conv ppx_variants_conv -no-check)) + (preprocess (pps ppx_compare ppx_fields_conv ppx_hash ppx_sexp_conv ppx_variants_conv -no-check)) (link_flags (-linkall -warn-error -31)) ) |} diff --git a/opam b/opam index 20ec4c271..f3bc990ff 100644 --- a/opam +++ b/opam @@ -42,7 +42,6 @@ depends: [ "ppx_compare" {>= "v0.13.0" & < "v0.14"} "ppx_deriving" {>="4.1"} "ppx_fields_conv" {>="v0.13.0" & < "v0.14"} - "ppx_let" {>="v0.13.0" & < "v0.14"} "sawja" {>="1.5.8"} "sqlite3" "utop" {with-test}