From 36eb66cd6e4ecbf9bd9bc6919f7d9b6c2e812ead Mon Sep 17 00:00:00 2001 From: David Scott Date: Thu, 14 Jun 2018 11:27:31 +0100 Subject: [PATCH 1/3] Remove use of deprecated `named-pipe` module The `named-pipe` module was deprecated because it was fundamentally broken -- named pipes do not behave like Unix file descriptors. People who want named pipes should investigate `Uwt`. Signed-off-by: David Scott --- lib_test/jbuild | 2 +- protocol-9p-unix.opam | 1 - protocol-9p.opam | 1 - unix/client9p_unix.ml | 4 ---- unix/jbuild | 2 +- 5 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lib_test/jbuild b/lib_test/jbuild index 77c6563..6e45322 100644 --- a/lib_test/jbuild +++ b/lib_test/jbuild @@ -3,7 +3,7 @@ (executables ((names (lofs_test tests)) (libraries (result cstruct alcotest lwt cstruct-lwt logs.fmt astring - named-pipe.lwt mirage-flow-lwt mirage-kv-lwt mirage-channel-lwt + mirage-flow-lwt mirage-kv-lwt mirage-channel-lwt protocol-9p protocol-9p-unix)) )) (alias diff --git a/protocol-9p-unix.opam b/protocol-9p-unix.opam index 6997e80..133bb99 100644 --- a/protocol-9p-unix.opam +++ b/protocol-9p-unix.opam @@ -28,7 +28,6 @@ depends: [ "base-unix" "cmdliner" "astring" - "named-pipe" {>= "0.4.0"} "fmt" "logs" {>= "0.5.0"} "win-error" diff --git a/protocol-9p.opam b/protocol-9p.opam index 5529844..e6229a4 100644 --- a/protocol-9p.opam +++ b/protocol-9p.opam @@ -24,7 +24,6 @@ depends: [ "lwt" {>= "3.0.0"} "cmdliner" "astring" - "named-pipe" {>= "0.4.0"} "fmt" "logs" {>= "0.5.0"} "win-error" diff --git a/unix/client9p_unix.ml b/unix/client9p_unix.ml index ba3d56a..fdd602e 100644 --- a/unix/client9p_unix.ml +++ b/unix/client9p_unix.ml @@ -107,10 +107,6 @@ module Make(Log: S.LOG) = struct end | "unix", _ -> open_unix address - | _, address when Astring.String.is_prefix ~affix:"\\\\" address -> - Named_pipe_lwt.Client.openpipe address - >>= fun pipe -> - Lwt.return (Ok (Named_pipe_lwt.Client.to_fd pipe)) | _ -> Lwt.return (Error.error_msg "Unknown protocol %s" proto) ) >>*= fun s -> diff --git a/unix/jbuild b/unix/jbuild index 8cb203e..22b2ce0 100644 --- a/unix/jbuild +++ b/unix/jbuild @@ -3,6 +3,6 @@ (library ((name protocol_9p_unix) (public_name protocol-9p-unix) - (libraries (result fmt lwt mirage-flow-lwt cstruct cstruct-lwt astring named-pipe.lwt + (libraries (result fmt lwt mirage-flow-lwt cstruct cstruct-lwt astring protocol-9p io-page.unix prometheus)) )) From e68ddbc92fa83eee92420988f71024fd2421444b Mon Sep 17 00:00:00 2001 From: David Scott Date: Thu, 14 Jun 2018 11:32:19 +0100 Subject: [PATCH 2/3] Remove unnecessary dependency on cmdliner in the core Signed-off-by: David Scott --- protocol-9p-unix.opam | 1 - protocol-9p.opam | 1 - 2 files changed, 2 deletions(-) diff --git a/protocol-9p-unix.opam b/protocol-9p-unix.opam index 133bb99..dbcccbd 100644 --- a/protocol-9p-unix.opam +++ b/protocol-9p-unix.opam @@ -26,7 +26,6 @@ depends: [ "mirage-channel-lwt" "lwt" {>= "3.0.0"} "base-unix" - "cmdliner" "astring" "fmt" "logs" {>= "0.5.0"} diff --git a/protocol-9p.opam b/protocol-9p.opam index e6229a4..2a8e692 100644 --- a/protocol-9p.opam +++ b/protocol-9p.opam @@ -22,7 +22,6 @@ depends: [ "mirage-kv-lwt" "mirage-channel-lwt" "lwt" {>= "3.0.0"} - "cmdliner" "astring" "fmt" "logs" {>= "0.5.0"} From 00768521f92a34a82acd1e67c7456f838a992c76 Mon Sep 17 00:00:00 2001 From: David Scott Date: Thu, 14 Jun 2018 11:32:28 +0100 Subject: [PATCH 3/3] Update CHANGES for 0.12.1 Signed-off-by: David Scott --- CHANGES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index bb061b8..5286460 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +## v0.12.1 (2018-06-14) + +* Remove (broken) support for named pipes. +* Remove unnecessary dependency on `cmdliner` in the core library. + ## v0.12.0 (2017-11-05) * Remove unnecessary dependency on `ppx_deriving`