From 144dc8f8ad209ebcb6591e0adc1bc4cb73528f3a Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Tue, 29 Sep 2015 22:34:57 +0200 Subject: [PATCH 1/3] Move deprecated modules into lib/deprecated/ This gives clear indication what modules are now deprecated and reduce clutter in non-deprecated module directories. --- compiler/installer.ini | 3 +++ config/nim.cfg | 2 ++ lib/{ => deprecated}/core/unsigned.nim | 0 lib/{ => deprecated}/pure/actors.nim | 0 lib/{ => deprecated}/pure/actors.nim.cfg | 0 lib/{ => deprecated}/pure/asyncio.nim | 0 lib/{ => deprecated}/pure/ftpclient.nim | 0 lib/{ => deprecated}/pure/parseopt.nim | 0 lib/{ => deprecated}/pure/parseurl.nim | 0 lib/{ => deprecated}/pure/sockets.nim | 0 10 files changed, 5 insertions(+) rename lib/{ => deprecated}/core/unsigned.nim (100%) rename lib/{ => deprecated}/pure/actors.nim (100%) rename lib/{ => deprecated}/pure/actors.nim.cfg (100%) rename lib/{ => deprecated}/pure/asyncio.nim (100%) rename lib/{ => deprecated}/pure/ftpclient.nim (100%) rename lib/{ => deprecated}/pure/parseopt.nim (100%) rename lib/{ => deprecated}/pure/parseurl.nim (100%) rename lib/{ => deprecated}/pure/sockets.nim (100%) diff --git a/compiler/installer.ini b/compiler/installer.ini index c8af38886..729c13503 100644 --- a/compiler/installer.ini +++ b/compiler/installer.ini @@ -115,6 +115,9 @@ Files: "lib/posix/*.nim" Files: "lib/js/*.nim" Files: "lib/packages/docutils/*.nim" +Files: "lib/deprecated/core/*.nim" +Files: "lib/deprecated/pure/*.nim" +Files: "lib/deprecated/pure/*.cfg" [Other] Files: "examples/*.nim" diff --git a/config/nim.cfg b/config/nim.cfg index bf78c35cc..b8608b3ce 100644 --- a/config/nim.cfg +++ b/config/nim.cfg @@ -27,6 +27,8 @@ mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc" cs:partial @end +path="$lib/deprecated/core" +path="$lib/deprecated/pure" path="$lib/pure/collections" path="$lib/pure/concurrency" path="$lib/impure" diff --git a/lib/core/unsigned.nim b/lib/deprecated/core/unsigned.nim similarity index 100% rename from lib/core/unsigned.nim rename to lib/deprecated/core/unsigned.nim diff --git a/lib/pure/actors.nim b/lib/deprecated/pure/actors.nim similarity index 100% rename from lib/pure/actors.nim rename to lib/deprecated/pure/actors.nim diff --git a/lib/pure/actors.nim.cfg b/lib/deprecated/pure/actors.nim.cfg similarity index 100% rename from lib/pure/actors.nim.cfg rename to lib/deprecated/pure/actors.nim.cfg diff --git a/lib/pure/asyncio.nim b/lib/deprecated/pure/asyncio.nim similarity index 100% rename from lib/pure/asyncio.nim rename to lib/deprecated/pure/asyncio.nim diff --git a/lib/pure/ftpclient.nim b/lib/deprecated/pure/ftpclient.nim similarity index 100% rename from lib/pure/ftpclient.nim rename to lib/deprecated/pure/ftpclient.nim diff --git a/lib/pure/parseopt.nim b/lib/deprecated/pure/parseopt.nim similarity index 100% rename from lib/pure/parseopt.nim rename to lib/deprecated/pure/parseopt.nim diff --git a/lib/pure/parseurl.nim b/lib/deprecated/pure/parseurl.nim similarity index 100% rename from lib/pure/parseurl.nim rename to lib/deprecated/pure/parseurl.nim diff --git a/lib/pure/sockets.nim b/lib/deprecated/pure/sockets.nim similarity index 100% rename from lib/pure/sockets.nim rename to lib/deprecated/pure/sockets.nim From 4d2486c85854315e5d3de5627c0749f753d6e6fa Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Tue, 29 Sep 2015 22:49:21 +0200 Subject: [PATCH 2/3] doc: Move deprecated modules into separate section --- doc/lib.txt | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/doc/lib.txt b/doc/lib.txt index 868adde89..5b2648b2f 100644 --- a/doc/lib.txt +++ b/doc/lib.txt @@ -201,12 +201,6 @@ Internet Protocols and Support * `scgi `_ This module implements helpers for SCGI applications. -* `sockets `_ - This module implements a simple portable type-safe sockets layer. - -* `asyncio `_ - This module implements an asynchronous event loop for sockets. - * `browsers `_ This module implements procs for opening URLs with the user's default browser. @@ -220,9 +214,6 @@ Internet Protocols and Support * `smtp `_ This module implement a simple SMTP client. -* `ftpclient `_ - This module implements an FTP client. - * `cookies `_ This module contains helper procs for parsing and generating cookies. @@ -397,6 +388,27 @@ Modules for JS backend Declaration of the Document Object Model for the JS backend. +Deprecated modules +------------------ + +* `asyncio `_ + This module implements an asynchronous event loop for sockets. + **Deprecated since version 0.11.2:** + Use the `asyncnet `_ together with the + `asyncdispatch `_ module instead. + +* `ftpclient `_ + This module implements an FTP client. + **Deprecated since version 0.11.3:** + Use the `asyncftpclient `_ module instead. + +* `sockets `_ + This module implements a simple portable type-safe sockets layer. + **Deprecated since version 0.11.2:** + Use the `net `_ or the `rawsockets `_ module + instead. + + Impure libraries ================ From e9f5c256d78ca38885eac1d245992dd75df09380 Mon Sep 17 00:00:00 2001 From: Adam Strzelecki Date: Wed, 30 Sep 2015 12:28:41 +0200 Subject: [PATCH 3/3] parseopt: This module is no longer deprecated Remove depreciation notice from doc/lib.txt. --- doc/lib.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/lib.txt b/doc/lib.txt index 5b2648b2f..7c71e8ae5 100644 --- a/doc/lib.txt +++ b/doc/lib.txt @@ -256,8 +256,6 @@ Parsers * `parseopt `_ The ``parseopt`` module implements a command line option parser. - **Deprecated since version 0.9.3:** Use the `parseopt2 - `_ module instead. * `parseopt2 `_ The ``parseopt2`` module implements a command line option parser. This