Remove alias Findlib package lwt.preemptive

It was a deprecated alias for lwt.unix. Resolves #487.
ocsigen · Mar 25, 2018 · 6385306 · 6385306
1 parent 2c87ac0
commit 6385306
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 19 deletions.
diff --git a/META.lwt b/META.lwt
@@ -12,13 +12,6 @@ archive(native) = "lwt.cmxa"
 plugin(byte) = "lwt.cma"
 plugin(native) = "lwt.cmxs"
 
-package "preemptive" (
-  #directory = "preemptive"
-  version = "dev"
-  description = "Preemptive thread support for Lwt (deprecated; use lwt.unix)"
-  requires = "lwt.unix"
-)
-
 package "unix" (
   #directory = "unix"
   version = "dev"

diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md
@@ -259,10 +259,6 @@ This list surveys them, roughly in order of importance.
   Some of the C code in the Unix binding is generated by
   `src/unix/gen_stubs.ml`.
 
-- `src/preemptive/` provides `Lwt_preemptive` if the threaded runtime is
-  available. This is almost always the case when compiling to native code (i.e.,
-  when the Unix binding is available).
-
 - `src/react/` provides the separate library `Lwt_react`. This is basically an
    independent project that lives in the Lwt repo.
 

diff --git a/doc/Makefile b/doc/Makefile
@@ -10,14 +10,12 @@ PKGS=\
 INCS=\
 	-I ${BLD}/core \
 	-I ${BLD}/ppx \
-	-I ${BLD}/preemptive \
 	-I ${BLD}/react \
 	-I ${BLD}/unix
 
 MLIS=\
 	$(wildcard ${SRC}/core/*.mli) \
 	$(wildcard ${SRC}/ppx/*.mli) \
-	$(wildcard ${SRC}/preemptive/*.mli) \
 	$(wildcard ${SRC}/react/*.mli) \
 	$(filter-out ${BLD}/unix/lwt_unix.cppo.mli,$(wildcard ${BLD}/unix/*.mli))
 

diff --git a/doc/manual.wiki b/doc/manual.wiki
@@ -714,7 +714,7 @@ let () =
   //detach// the computation to a preemptive thread.
 
   This is done by the module {{{Lwt_preemptive}}} of the
-  {{{lwt.preemptive}}} package which maintains a pool of system
+  {{{lwt.unix}}} package which maintains a pool of system
   threads. The main function is:
 
 <<code language="ocaml" |val detach : ('a -> 'b) -> 'a -> 'b Lwt.t

diff --git a/src/util/install_filter.ml b/src/util/install_filter.ml
@@ -30,7 +30,6 @@ let filter_sub_path path s =
 
 let sub_paths = [
   "unix";
-  "preemptive";
   "options";
   "syntax";
   "ppx";

diff --git a/test/packaging/jbuilder/preemptive/jbuild b/test/packaging/jbuilder/preemptive/jbuild
@@ -2,4 +2,4 @@
 
 (executable
  ((name user)
-  (libraries (lwt.preemptive))))
+  (libraries (lwt.unix))))
diff --git a/test/packaging/ocamlfind/preemptive/Makefile b/test/packaging/ocamlfind/preemptive/Makefile
@@ -1,9 +1,7 @@
 .PHONY : test
 test : clean
-	@# Deliberately link with lwt.preemptive incorrectly, as Lwt is supporting
-	@# this usage until 4.0.0.
 	ocamlfind opt -package lwt -c user.ml
-	ocamlfind opt -package lwt.preemptive -thread -linkpkg user.cmx
+	ocamlfind opt -package lwt.unix -thread -linkpkg user.cmx
 	./a.out
 
 .PHONY : clean