From e6275c3b697da93be98f20fd4aa91c0b957f4796 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Fri, 28 Jun 2013 11:52:53 -0400 Subject: [PATCH] Move most of the `net` collection out of the core. - Most units and signatures from the `net` collection are now in `compatibility-lib`. - Most of the actual libraries are in the `net-lib` package. original commit: 2b1fb036c63639bc5dbb65348c4f4e5802c95b53 --- pkgs/net-lib/info.rkt | 4 ++++ {racket/lib/collects => pkgs/net-lib}/net/cgi.rkt | 2 +- {racket/lib/collects => pkgs/net-lib}/net/cookie.rkt | 2 -- {racket/lib/collects => pkgs/net-lib}/net/dns.rkt | 0 {racket/lib/collects => pkgs/net-lib}/net/ftp.rkt | 0 {racket/lib/collects => pkgs/net-lib}/net/imap.rkt | 0 {racket/lib/collects => pkgs/net-lib}/net/mime-util.rkt | 0 {racket/lib/collects => pkgs/net-lib}/net/mime.rkt | 2 +- {racket/lib/collects => pkgs/net-lib}/net/nntp.rkt | 0 {racket/lib/collects => pkgs/net-lib}/net/pop3.rkt | 0 {racket/lib/collects => pkgs/net-lib}/net/private/ip.rkt | 0 {racket/lib/collects => pkgs/net-lib}/net/private/rbtree.rkt | 0 {racket/lib/collects => pkgs/net-lib}/net/qp.rkt | 0 {racket/lib/collects => pkgs/net-lib}/net/sendmail.rkt | 0 {racket/lib/collects => pkgs/net-lib}/net/sendurl.rkt | 0 {racket/lib/collects => pkgs/net-lib}/net/smtp.rkt | 2 +- {racket/lib/collects => pkgs/net-lib}/net/ssl-tcp-unit.rkt | 2 +- {racket/lib/collects => pkgs/net-lib}/net/tcp-redirect.rkt | 0 {racket/lib/collects => pkgs/net-lib}/net/tcp-sig.rkt | 0 {racket/lib/collects => pkgs/net-lib}/net/tcp-unit.rkt | 0 {racket/lib/collects => pkgs/net-lib}/net/unihead.rkt | 0 pkgs/racket-pkgs/racket-doc/net/scribblings/cookie.scrbl | 4 ++++ 22 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 pkgs/net-lib/info.rkt rename {racket/lib/collects => pkgs/net-lib}/net/cgi.rkt (99%) rename {racket/lib/collects => pkgs/net-lib}/net/cookie.rkt (99%) rename {racket/lib/collects => pkgs/net-lib}/net/dns.rkt (100%) rename {racket/lib/collects => pkgs/net-lib}/net/ftp.rkt (100%) rename {racket/lib/collects => pkgs/net-lib}/net/imap.rkt (100%) rename {racket/lib/collects => pkgs/net-lib}/net/mime-util.rkt (100%) rename {racket/lib/collects => pkgs/net-lib}/net/mime.rkt (99%) rename {racket/lib/collects => pkgs/net-lib}/net/nntp.rkt (100%) rename {racket/lib/collects => pkgs/net-lib}/net/pop3.rkt (100%) rename {racket/lib/collects => pkgs/net-lib}/net/private/ip.rkt (100%) rename {racket/lib/collects => pkgs/net-lib}/net/private/rbtree.rkt (100%) rename {racket/lib/collects => pkgs/net-lib}/net/qp.rkt (100%) rename {racket/lib/collects => pkgs/net-lib}/net/sendmail.rkt (100%) rename {racket/lib/collects => pkgs/net-lib}/net/sendurl.rkt (100%) rename {racket/lib/collects => pkgs/net-lib}/net/smtp.rkt (99%) rename {racket/lib/collects => pkgs/net-lib}/net/ssl-tcp-unit.rkt (97%) rename {racket/lib/collects => pkgs/net-lib}/net/tcp-redirect.rkt (100%) rename {racket/lib/collects => pkgs/net-lib}/net/tcp-sig.rkt (100%) rename {racket/lib/collects => pkgs/net-lib}/net/tcp-unit.rkt (100%) rename {racket/lib/collects => pkgs/net-lib}/net/unihead.rkt (100%) diff --git a/pkgs/net-lib/info.rkt b/pkgs/net-lib/info.rkt new file mode 100644 index 0000000000..e43df74125 --- /dev/null +++ b/pkgs/net-lib/info.rkt @@ -0,0 +1,4 @@ +#lang setup/infotab + +(define collection 'multi) +(define deps '("base")) diff --git a/racket/lib/collects/net/cgi.rkt b/pkgs/net-lib/net/cgi.rkt similarity index 99% rename from racket/lib/collects/net/cgi.rkt rename to pkgs/net-lib/net/cgi.rkt index 1348217587..2b38c8839f 100644 --- a/racket/lib/collects/net/cgi.rkt +++ b/pkgs/net-lib/net/cgi.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require "uri-codec.rkt") +(require net/uri-codec) (provide diff --git a/racket/lib/collects/net/cookie.rkt b/pkgs/net-lib/net/cookie.rkt similarity index 99% rename from racket/lib/collects/net/cookie.rkt rename to pkgs/net-lib/net/cookie.rkt index df96af04cc..1050f84777 100644 --- a/racket/lib/collects/net/cookie.rkt +++ b/pkgs/net-lib/net/cookie.rkt @@ -351,5 +351,3 @@ (define (valid-path? v) (and (string? v) (rfc2109:value? v))) - -;;; cookie-unit.rkt ends here diff --git a/racket/lib/collects/net/dns.rkt b/pkgs/net-lib/net/dns.rkt similarity index 100% rename from racket/lib/collects/net/dns.rkt rename to pkgs/net-lib/net/dns.rkt diff --git a/racket/lib/collects/net/ftp.rkt b/pkgs/net-lib/net/ftp.rkt similarity index 100% rename from racket/lib/collects/net/ftp.rkt rename to pkgs/net-lib/net/ftp.rkt diff --git a/racket/lib/collects/net/imap.rkt b/pkgs/net-lib/net/imap.rkt similarity index 100% rename from racket/lib/collects/net/imap.rkt rename to pkgs/net-lib/net/imap.rkt diff --git a/racket/lib/collects/net/mime-util.rkt b/pkgs/net-lib/net/mime-util.rkt similarity index 100% rename from racket/lib/collects/net/mime-util.rkt rename to pkgs/net-lib/net/mime-util.rkt diff --git a/racket/lib/collects/net/mime.rkt b/pkgs/net-lib/net/mime.rkt similarity index 99% rename from racket/lib/collects/net/mime.rkt rename to pkgs/net-lib/net/mime.rkt index 938a067638..cd63732dea 100644 --- a/racket/lib/collects/net/mime.rkt +++ b/pkgs/net-lib/net/mime.rkt @@ -28,7 +28,7 @@ #lang racket/base -(require racket/port "mime-util.rkt" "qp.rkt" "base64.rkt" "head.rkt") +(require racket/port "mime-util.rkt" "qp.rkt" net/base64 net/head) (provide ;; -- exceptions raised -- diff --git a/racket/lib/collects/net/nntp.rkt b/pkgs/net-lib/net/nntp.rkt similarity index 100% rename from racket/lib/collects/net/nntp.rkt rename to pkgs/net-lib/net/nntp.rkt diff --git a/racket/lib/collects/net/pop3.rkt b/pkgs/net-lib/net/pop3.rkt similarity index 100% rename from racket/lib/collects/net/pop3.rkt rename to pkgs/net-lib/net/pop3.rkt diff --git a/racket/lib/collects/net/private/ip.rkt b/pkgs/net-lib/net/private/ip.rkt similarity index 100% rename from racket/lib/collects/net/private/ip.rkt rename to pkgs/net-lib/net/private/ip.rkt diff --git a/racket/lib/collects/net/private/rbtree.rkt b/pkgs/net-lib/net/private/rbtree.rkt similarity index 100% rename from racket/lib/collects/net/private/rbtree.rkt rename to pkgs/net-lib/net/private/rbtree.rkt diff --git a/racket/lib/collects/net/qp.rkt b/pkgs/net-lib/net/qp.rkt similarity index 100% rename from racket/lib/collects/net/qp.rkt rename to pkgs/net-lib/net/qp.rkt diff --git a/racket/lib/collects/net/sendmail.rkt b/pkgs/net-lib/net/sendmail.rkt similarity index 100% rename from racket/lib/collects/net/sendmail.rkt rename to pkgs/net-lib/net/sendmail.rkt diff --git a/racket/lib/collects/net/sendurl.rkt b/pkgs/net-lib/net/sendurl.rkt similarity index 100% rename from racket/lib/collects/net/sendurl.rkt rename to pkgs/net-lib/net/sendurl.rkt diff --git a/racket/lib/collects/net/smtp.rkt b/pkgs/net-lib/net/smtp.rkt similarity index 99% rename from racket/lib/collects/net/smtp.rkt rename to pkgs/net-lib/net/smtp.rkt index 7514fa5418..4ac7ea388b 100644 --- a/racket/lib/collects/net/smtp.rkt +++ b/pkgs/net-lib/net/smtp.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require racket/tcp "base64.rkt") +(require racket/tcp net/base64) (provide smtp-sending-server smtp-send-message diff --git a/racket/lib/collects/net/ssl-tcp-unit.rkt b/pkgs/net-lib/net/ssl-tcp-unit.rkt similarity index 97% rename from racket/lib/collects/net/ssl-tcp-unit.rkt rename to pkgs/net-lib/net/ssl-tcp-unit.rkt index df07a8ab3b..0568509095 100644 --- a/racket/lib/collects/net/ssl-tcp-unit.rkt +++ b/pkgs/net-lib/net/ssl-tcp-unit.rkt @@ -1,6 +1,6 @@ #lang racket/base (provide make-ssl-tcp@) -(require racket/unit "tcp-sig.rkt" openssl/mzssl) +(require racket/unit net/tcp-sig openssl/mzssl) (define (make-ssl-tcp@ server-cert-file server-key-file server-root-cert-files diff --git a/racket/lib/collects/net/tcp-redirect.rkt b/pkgs/net-lib/net/tcp-redirect.rkt similarity index 100% rename from racket/lib/collects/net/tcp-redirect.rkt rename to pkgs/net-lib/net/tcp-redirect.rkt diff --git a/racket/lib/collects/net/tcp-sig.rkt b/pkgs/net-lib/net/tcp-sig.rkt similarity index 100% rename from racket/lib/collects/net/tcp-sig.rkt rename to pkgs/net-lib/net/tcp-sig.rkt diff --git a/racket/lib/collects/net/tcp-unit.rkt b/pkgs/net-lib/net/tcp-unit.rkt similarity index 100% rename from racket/lib/collects/net/tcp-unit.rkt rename to pkgs/net-lib/net/tcp-unit.rkt diff --git a/racket/lib/collects/net/unihead.rkt b/pkgs/net-lib/net/unihead.rkt similarity index 100% rename from racket/lib/collects/net/unihead.rkt rename to pkgs/net-lib/net/unihead.rkt diff --git a/pkgs/racket-pkgs/racket-doc/net/scribblings/cookie.scrbl b/pkgs/racket-pkgs/racket-doc/net/scribblings/cookie.scrbl index 5cda30cb48..0916c487cc 100644 --- a/pkgs/racket-pkgs/racket-doc/net/scribblings/cookie.scrbl +++ b/pkgs/racket-pkgs/racket-doc/net/scribblings/cookie.scrbl @@ -178,6 +178,10 @@ won't have a cookie set then first arrive at your site. @section{Cookie Unit} +@margin-note{@racket[cookie@] and @racket[cookie^] are deprecated. +They exist for backward-compatibility and will likely be removed in +the future. New code should use the @racketmodname[net/cookie] module.} + @defmodule[net/cookie-unit] @defthing[cookie@ unit?]{