pghs975uc
/
infer_clone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[infer] Update to core 0.14

Browse Source 
Summary: A few source changes are needed for core 0.14.

Reviewed By: jvillard

Differential Revision: D21924396

fbshipit-source-id: ed958895e
master
Josh Berdine 5 years ago committed by Facebook GitHub Bot
parent 143eb793af
commit 5e90bc61b7
7 changed files with 68 additions and 64 deletions
Show Stats Download Patch File Download Diff File

4
infer/src/base/Config.ml
Unescape View File

@ -2924,9 +2924,9 @@ and pulse_model_transfer_ownership_namespace, pulse_model_transfer_ownership =
let aux el = let aux el =
match el with match el with
| _, [namespace; m] -> | _, [namespace; m] ->
`Fst (namespace, m) First (namespace, m)
| _, [m] -> | _, [m] ->
`Snd m Second m
| option, splits -> | option, splits ->
L.die UserError L.die UserError
"Wrong use of option pulse-model-transfer-ownership %s: expected at most one namespace \ "Wrong use of option pulse-model-transfer-ownership %s: expected at most one namespace \

2
infer/src/base/DBWriter.ml
Unescape View File

@ -281,7 +281,7 @@ module Server = struct
let server () = let server () =
L.debug Analysis Quiet "Sqlite write daemon: starting up@." ; L.debug Analysis Quiet "Sqlite write daemon: starting up@." ;
if socket_exists () then L.die InternalError "Sqlite write daemon: socket already exists@." ; if socket_exists () then L.die InternalError "Sqlite write daemon: socket already exists@." ;
let socket = Unix.socket ~domain:socket_domain ~kind:Unix.SOCK_STREAM ~protocol:0 in let socket = Unix.socket ~domain:socket_domain ~kind:Unix.SOCK_STREAM ~protocol:0 () in
in_results_dir ~f:(fun () -> Unix.bind socket ~addr:socket_addr) ; in_results_dir ~f:(fun () -> Unix.bind socket ~addr:socket_addr) ;
(* [backlog] is (supposedly) the length of the queue for pending connections ; (* [backlog] is (supposedly) the length of the queue for pending connections ;
there are no rules about the implied behaviour though. Here use optimistically there are no rules about the implied behaviour though. Here use optimistically

4
infer/src/base/Process.ml
Unescape View File

@ -70,7 +70,7 @@ let pipeline ~producer_prog ~producer_args ~consumer_prog ~consumer_args =
match Unix.fork () with match Unix.fork () with
| `In_the_child -> | `In_the_child ->
(* redirect producer's stdout to pipe_out *) (* redirect producer's stdout to pipe_out *)
Unix.dup2 ~src:pipe_out ~dst:Unix.stdout ; Unix.dup2 ~src:pipe_out ~dst:Unix.stdout () ;
(* close producer's copy of pipe ends *) (* close producer's copy of pipe ends *)
Unix.close pipe_out ; Unix.close pipe_out ;
Unix.close pipe_in ; Unix.close pipe_in ;
@ -80,7 +80,7 @@ let pipeline ~producer_prog ~producer_args ~consumer_prog ~consumer_args =
match Unix.fork () with match Unix.fork () with
| `In_the_child -> | `In_the_child ->
(* redirect consumer's stdin to pipe_in *) (* redirect consumer's stdin to pipe_in *)
Unix.dup2 ~src:pipe_in ~dst:Unix.stdin ; Unix.dup2 ~src:pipe_in ~dst:Unix.stdin () ;
(* close consumer's copy of pipe ends *) (* close consumer's copy of pipe ends *)
Unix.close pipe_out ; Unix.close pipe_out ;
Unix.close pipe_in ; Unix.close pipe_in ;

4
infer/src/base/Utils.ml
Unescape View File

@ -319,11 +319,11 @@ let devnull = lazy (Unix.openfile "/dev/null" ~mode:[Unix.O_WRONLY])
let suppress_stderr2 f2 x1 x2 = let suppress_stderr2 f2 x1 x2 =
let restore_stderr src = let restore_stderr src =
Unix.dup2 ~src ~dst:Unix.stderr ; Unix.dup2 ~src ~dst:Unix.stderr () ;
Unix.close src Unix.close src
in in
let orig_stderr = Unix.dup Unix.stderr in let orig_stderr = Unix.dup Unix.stderr in
Unix.dup2 ~src:(Lazy.force devnull) ~dst:Unix.stderr ; Unix.dup2 ~src:(Lazy.force devnull) ~dst:Unix.stderr () ;
let f () = f2 x1 x2 in let f () = f2 x1 x2 in
let finally () = restore_stderr orig_stderr in let finally () = restore_stderr orig_stderr in
protect ~f ~finally protect ~f ~finally

10
opam
Unescape View File

@ -21,11 +21,11 @@ install: [
] ]
depends: [ depends: [
"ANSITerminal" {>="0.7"} "ANSITerminal" {>="0.7"}
"async" {>="v0.13.0" & < "v0.14"} "async" {>= "v0.14.0" & < "v0.15"}
"atdgen" {>="2.0.0"} "atdgen" {>="2.0.0"}
"base64" {>="3.0.0"} "base64" {>="3.0.0"}
"cmdliner" {>="1.0.0"} "cmdliner" {>="1.0.0"}
"core" {>="v0.13.0" & < "v0.14"} "core" {>= "v0.14.0" & < "v0.15"}
"conf-autoconf" {build} "conf-autoconf" {build}
"conf-sqlite3" {build} "conf-sqlite3" {build}
"conf-zlib" {build} "conf-zlib" {build}
@ -39,10 +39,10 @@ depends: [
"ocamlgraph" "ocamlgraph"
"ounit" {>="2.0.5"} "ounit" {>="2.0.5"}
"parmap" {>="1.0-rc8"} "parmap" {>="1.0-rc8"}
"ppx_compare" {>= "v0.13.0" & < "v0.14"} "ppx_compare" {>= "v0.14.0" & < "v0.15"}
"ppx_deriving" {>="4.1"} "ppx_deriving" {>="4.1"}
"ppx_enumerate" {>="v0.13.0" & < "v0.14"} "ppx_enumerate" {>= "v0.14.0" & < "v0.15"}
"ppx_fields_conv" {>="v0.13.0" & < "v0.14"} "ppx_fields_conv" {>= "v0.14.0" & < "v0.15"}
"sawja" {>="1.5.8"} "sawja" {>="1.5.8"}
"sqlite3" "sqlite3"
"utop" {with-test} "utop" {with-test}

106
opam.locked
Unescape View File

@ -21,22 +21,22 @@ install: [
] ]
depends: [ depends: [
"ANSITerminal" {= "0.8.2"} "ANSITerminal" {= "0.8.2"}
"async" {= "v0.13.0"} "async" {= "v0.14.0"}
"async_kernel" {= "v0.13.0"} "async_kernel" {= "v0.14.0"}
"async_rpc_kernel" {= "v0.13.0"} "async_rpc_kernel" {= "v0.14.0"}
"async_unix" {= "v0.13.0"} "async_unix" {= "v0.14.0"}
"atd" {= "2.2.1"} "atd" {= "2.2.1"}
"atdgen" {= "2.2.1"} "atdgen" {= "2.2.1"}
"atdgen-runtime" {= "2.2.1"} "atdgen-runtime" {= "2.2.1"}
"base" {= "v0.13.2"} "base" {= "v0.14.0"}
"base-bigarray" {= "base"} "base-bigarray" {= "base"}
"base-bytes" {= "base"} "base-bytes" {= "base"}
"base-threads" {= "base"} "base-threads" {= "base"}
"base-unix" {= "base"} "base-unix" {= "base"}
"base64" {= "3.4.0"} "base64" {= "3.4.0"}
"base_bigstring" {= "v0.13.0"} "base_bigstring" {= "v0.14.0"}
"base_quickcheck" {= "v0.13.0"} "base_quickcheck" {= "v0.14.0"}
"bin_prot" {= "v0.13.0"} "bin_prot" {= "v0.14.0"}
"biniou" {= "1.2.1"} "biniou" {= "1.2.1"}
"camlidl" {= "1.07"} "camlidl" {= "1.07"}
"camlzip" {= "1.10"} "camlzip" {= "1.10"}
@ -44,14 +44,14 @@ depends: [
"conf-autoconf" {= "0.1"} "conf-autoconf" {= "0.1"}
"conf-gmp" {= "1"} "conf-gmp" {= "1"}
"conf-m4" {= "1"} "conf-m4" {= "1"}
"conf-mpfr" {= "1"} "conf-mpfr" {= "2"}
"conf-perl" {= "1"} "conf-perl" {= "1"}
"conf-pkg-config" {= "1.2"} "conf-pkg-config" {= "1.2"}
"conf-sqlite3" {= "1"} "conf-sqlite3" {= "1"}
"conf-which" {= "1"} "conf-which" {= "1"}
"conf-zlib" {= "1"} "conf-zlib" {= "1"}
"core" {= "v0.13.0"} "core" {= "v0.14.0"}
"core_kernel" {= "v0.13.1"} "core_kernel" {= "v0.14.0"}
"cppo" {= "1.6.6"} "cppo" {= "1.6.6"}
"ctypes" {= "0.17.1"} "ctypes" {= "0.17.1"}
"dune" {= "2.5.1"} "dune" {= "2.5.1"}
@ -59,11 +59,11 @@ depends: [
"dune-private-libs" {= "2.5.1"} "dune-private-libs" {= "2.5.1"}
"easy-format" {= "1.3.2"} "easy-format" {= "1.3.2"}
"extlib" {= "1.7.7"} "extlib" {= "1.7.7"}
"fieldslib" {= "v0.13.0"} "fieldslib" {= "v0.14.0"}
"integers" {= "0.4.0"} "integers" {= "0.4.0"}
"jane-street-headers" {= "v0.13.0"} "jane-street-headers" {= "v0.14.0"}
"javalib" {= "3.2.1"} "javalib" {= "3.2.1"}
"jst-config" {= "v0.13.0"} "jst-config" {= "v0.14.0"}
"menhir" {= "20200211"} "menhir" {= "20200211"}
"menhirLib" {= "20200211"} "menhirLib" {= "20200211"}
"menhirSdk" {= "20200211"} "menhirSdk" {= "20200211"}
@ -82,56 +82,58 @@ depends: [
"ounit" {= "2.2.2"} "ounit" {= "2.2.2"}
"ounit2" {= "2.2.2"} "ounit2" {= "2.2.2"}
"parmap" {= "1.1.1"} "parmap" {= "1.1.1"}
"parsexp" {= "v0.13.0"} "parsexp" {= "v0.14.0"}
"ppx_assert" {= "v0.13.0"} "ppx_assert" {= "v0.14.0"}
"ppx_base" {= "v0.13.0"} "ppx_base" {= "v0.14.0"}
"ppx_bench" {= "v0.13.0"} "ppx_bench" {= "v0.14.0"}
"ppx_bin_prot" {= "v0.13.0"} "ppx_bin_prot" {= "v0.14.0"}
"ppx_cold" {= "v0.13.0"} "ppx_cold" {= "v0.14.0"}
"ppx_compare" {= "v0.13.0"} "ppx_compare" {= "v0.14.0"}
"ppx_custom_printf" {= "v0.13.0"} "ppx_custom_printf" {= "v0.14.0"}
"ppx_derivers" {= "1.2.1"} "ppx_derivers" {= "1.2.1"}
"ppx_deriving" {= "4.4.1"} "ppx_deriving" {= "4.5"}
"ppx_enumerate" {= "v0.13.0"} "ppx_enumerate" {= "v0.14.0"}
"ppx_expect" {= "v0.13.1"} "ppx_expect" {= "v0.14.0"}
"ppx_fail" {= "v0.13.0"} "ppx_fields_conv" {= "v0.14.0"}
"ppx_fields_conv" {= "v0.13.0"} "ppx_fixed_literal" {= "v0.14.0"}
"ppx_hash" {= "v0.13.0"} "ppx_hash" {= "v0.14.0"}
"ppx_here" {= "v0.13.0"} "ppx_here" {= "v0.14.0"}
"ppx_inline_test" {= "v0.13.1"} "ppx_inline_test" {= "v0.14.0"}
"ppx_jane" {= "v0.13.0"} "ppx_jane" {= "v0.14.0"}
"ppx_js_style" {= "v0.13.0"} "ppx_js_style" {= "v0.14.0"}
"ppx_let" {= "v0.13.0"} "ppx_let" {= "v0.14.0"}
"ppx_module_timer" {= "v0.13.0"} "ppx_module_timer" {= "v0.14.0"}
"ppx_optcomp" {= "v0.13.0"} "ppx_optcomp" {= "v0.14.0"}
"ppx_optional" {= "v0.13.0"} "ppx_optional" {= "v0.14.0"}
"ppx_pipebang" {= "v0.13.0"} "ppx_pipebang" {= "v0.14.0"}
"ppx_sexp_conv" {= "v0.13.0"} "ppx_sexp_conv" {= "v0.14.0"}
"ppx_sexp_message" {= "v0.13.0"} "ppx_sexp_message" {= "v0.14.0"}
"ppx_sexp_value" {= "v0.13.0"} "ppx_sexp_value" {= "v0.14.0"}
"ppx_stable" {= "v0.13.0"} "ppx_stable" {= "v0.14.0"}
"ppx_string" {= "v0.14.0"}
"ppx_tools" {= "6.0+4.08.0"} "ppx_tools" {= "6.0+4.08.0"}
"ppx_typerep_conv" {= "v0.13.0"} "ppx_typerep_conv" {= "v0.14.0"}
"ppx_variants_conv" {= "v0.13.0"} "ppx_variants_conv" {= "v0.14.0"}
"ppxfind" {= "1.4"} "ppxfind" {= "1.4"}
"ppxlib" {= "0.13.0"} "ppxlib" {= "0.13.0"}
"protocol_version_header" {= "v0.13.0"} "protocol_version_header" {= "v0.14.0"}
"re" {= "1.9.0"} "re" {= "1.9.0"}
"result" {= "1.5"} "result" {= "1.5"}
"sawja" {= "1.5.8"} "sawja" {= "1.5.8"}
"seq" {= "base"} "seq" {= "base"}
"sexplib" {= "v0.13.0"} "sexplib" {= "v0.14.0"}
"sexplib0" {= "v0.13.0"} "sexplib0" {= "v0.14.0"}
"spawn" {= "v0.13.0"} "spawn" {= "v0.13.0"}
"splittable_random" {= "v0.13.0"} "splittable_random" {= "v0.14.0"}
"sqlite3" {= "5.0.1"} "sqlite3" {= "5.0.1"}
"stdio" {= "v0.13.0"} "stdio" {= "v0.14.0"}
"stdlib-shims" {= "0.1.0"} "stdlib-shims" {= "0.1.0"}
"textutils" {= "v0.13.0"} "textutils" {= "v0.14.0"}
"time_now" {= "v0.13.0"} "time_now" {= "v0.14.0"}
"timezone" {= "v0.14.0"}
"topkg" {= "1.0.1"} "topkg" {= "1.0.1"}
"typerep" {= "v0.13.0"} "typerep" {= "v0.14.0"}
"variantslib" {= "v0.13.0"} "variantslib" {= "v0.14.0"}
"xmlm" {= "1.3.0"} "xmlm" {= "1.3.0"}
"yojson" {= "1.7.0"} "yojson" {= "1.7.0"}
"zarith" {= "1.9.1"} "zarith" {= "1.9.1"}

2
sledge/src/import/import0.ml
Unescape View File

@ -14,7 +14,9 @@ include (
and module Option := Core.Option and module Option := Core.Option
and module List := Core.List and module List := Core.List
and module Map := Core.Map and module Map := Core.Map
and module Map_intf := Core.Map_intf
and module Set := Core.Set and module Set := Core.Set
and module Set_intf := Core.Set_intf
and module String := Core.String and module String := Core.String
and type -'a return := 'a Core.return and type -'a return := 'a Core.return
end ) end )

Write Preview
Loading…
Cancel
Save