From 500974878b435e78afd22e975c7ff6847cc061e7 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Sat, 23 Feb 2008 09:42:03 +0000 Subject: [PATCH] use new require specs in many places svn: r8774 original commit: b1a08edd5a8c0db0bae4a9e052d9a93d1faabb4f --- collects/net/cgi.ss | 2 +- collects/net/cookie.ss | 2 +- collects/net/dns.ss | 2 +- collects/net/ftp.ss | 2 +- collects/net/imap.ss | 2 +- collects/net/mime-util.ss | 2 +- collects/net/mime.ss | 2 +- collects/net/nntp.ss | 2 +- collects/net/pop3.ss | 2 +- collects/net/private/rbtree.ss | 2 +- collects/net/qp.ss | 2 +- collects/net/sendmail.ss | 2 +- collects/net/smtp.ss | 2 +- collects/net/ssl-tcp-unit.ss | 4 ++-- collects/net/tcp-redirect.ss | 6 +++--- collects/net/tcp-unit.ss | 2 +- collects/net/unihead.ss | 6 +++--- collects/tests/mzscheme/net.ss | 18 +++++++++--------- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/collects/net/cgi.ss b/collects/net/cgi.ss index 4a05ec4ce7..1dca70b60a 100644 --- a/collects/net/cgi.ss +++ b/collects/net/cgi.ss @@ -1,5 +1,5 @@ (module cgi mzscheme - (require (lib "unit.ss") "cgi-sig.ss" "cgi-unit.ss") + (require mzlib/unit "cgi-sig.ss" "cgi-unit.ss") (define-values/invoke-unit/infer cgi@) diff --git a/collects/net/cookie.ss b/collects/net/cookie.ss index da57a19217..6b900fe299 100644 --- a/collects/net/cookie.ss +++ b/collects/net/cookie.ss @@ -1,5 +1,5 @@ (module cookie mzscheme - (require (lib "unit.ss") "cookie-sig.ss" "cookie-unit.ss") + (require mzlib/unit "cookie-sig.ss" "cookie-unit.ss") (provide-signature-elements cookie^) diff --git a/collects/net/dns.ss b/collects/net/dns.ss index 9fc1cafd9d..2169f09f93 100644 --- a/collects/net/dns.ss +++ b/collects/net/dns.ss @@ -1,5 +1,5 @@ (module dns mzscheme - (require (lib "unit.ss") "dns-sig.ss" "dns-unit.ss") + (require mzlib/unit "dns-sig.ss" "dns-unit.ss") (define-values/invoke-unit/infer dns@) diff --git a/collects/net/ftp.ss b/collects/net/ftp.ss index a878adeee7..9685165d27 100644 --- a/collects/net/ftp.ss +++ b/collects/net/ftp.ss @@ -1,5 +1,5 @@ (module ftp mzscheme - (require (lib "unit.ss") "ftp-sig.ss" "ftp-unit.ss") + (require mzlib/unit "ftp-sig.ss" "ftp-unit.ss") (define-values/invoke-unit/infer ftp@) diff --git a/collects/net/imap.ss b/collects/net/imap.ss index 9a1559fae6..8881a8ab49 100644 --- a/collects/net/imap.ss +++ b/collects/net/imap.ss @@ -1,5 +1,5 @@ (module imap mzscheme - (require (lib "unit.ss") (lib "contract.ss") "imap-sig.ss" "imap-unit.ss") + (require mzlib/unit mzlib/contract "imap-sig.ss" "imap-unit.ss") (define-values/invoke-unit/infer imap@) diff --git a/collects/net/mime-util.ss b/collects/net/mime-util.ss index 5f315e4d87..2bdb219b68 100644 --- a/collects/net/mime-util.ss +++ b/collects/net/mime-util.ss @@ -27,7 +27,7 @@ ;; Commentary: (module mime-util mzscheme - (require (lib "etc.ss")) + (require mzlib/etc) (provide string-tokenizer trim-all-spaces diff --git a/collects/net/mime.ss b/collects/net/mime.ss index 2c207dd4bd..68a75cbdc5 100644 --- a/collects/net/mime.ss +++ b/collects/net/mime.ss @@ -27,7 +27,7 @@ ;; Commentary: (module mime mzscheme - (require (lib "unit.ss") + (require mzlib/unit "mime-sig.ss" "mime-unit.ss" "qp-sig.ss" diff --git a/collects/net/nntp.ss b/collects/net/nntp.ss index 35baae98cc..7162cc0cc4 100644 --- a/collects/net/nntp.ss +++ b/collects/net/nntp.ss @@ -1,5 +1,5 @@ (module nntp mzscheme - (require (lib "unit.ss") "nntp-sig.ss" "nntp-unit.ss") + (require mzlib/unit "nntp-sig.ss" "nntp-unit.ss") (define-values/invoke-unit/infer nntp@) diff --git a/collects/net/pop3.ss b/collects/net/pop3.ss index d60a40d1af..e327b256a3 100644 --- a/collects/net/pop3.ss +++ b/collects/net/pop3.ss @@ -1,5 +1,5 @@ (module pop3 mzscheme - (require (lib "unit.ss") "pop3-sig.ss" "pop3-unit.ss") + (require mzlib/unit "pop3-sig.ss" "pop3-unit.ss") (define-values/invoke-unit/infer pop3@) diff --git a/collects/net/private/rbtree.ss b/collects/net/private/rbtree.ss index 982d21ff0a..b37f4a0561 100644 --- a/collects/net/private/rbtree.ss +++ b/collects/net/private/rbtree.ss @@ -284,7 +284,7 @@ Tests: (require rbtree) -(require (lib "pretty.ss")) +(require mzlib/pretty) (print-struct #t) (define t (new-tree)) diff --git a/collects/net/qp.ss b/collects/net/qp.ss index db4f0c17aa..346aef1b94 100644 --- a/collects/net/qp.ss +++ b/collects/net/qp.ss @@ -27,7 +27,7 @@ ;; Commentary: (module qp mzscheme - (require (lib "unit.ss") "qp-sig.ss" "qp-unit.ss") + (require mzlib/unit "qp-sig.ss" "qp-unit.ss") (define-values/invoke-unit/infer qp@) diff --git a/collects/net/sendmail.ss b/collects/net/sendmail.ss index 25b6844098..19387b7a98 100644 --- a/collects/net/sendmail.ss +++ b/collects/net/sendmail.ss @@ -1,5 +1,5 @@ (module sendmail mzscheme - (require (lib "unit.ss") "sendmail-sig.ss" "sendmail-unit.ss") + (require mzlib/unit "sendmail-sig.ss" "sendmail-unit.ss") (define-values/invoke-unit/infer sendmail@) diff --git a/collects/net/smtp.ss b/collects/net/smtp.ss index 72fa6b1ff0..8aa43caa13 100644 --- a/collects/net/smtp.ss +++ b/collects/net/smtp.ss @@ -1,5 +1,5 @@ (module smtp mzscheme - (require (lib "unit.ss") "smtp-sig.ss" "smtp-unit.ss") + (require mzlib/unit "smtp-sig.ss" "smtp-unit.ss") (define-values/invoke-unit/infer smtp@) diff --git a/collects/net/ssl-tcp-unit.ss b/collects/net/ssl-tcp-unit.ss index b50b35b58a..bd31d15d15 100644 --- a/collects/net/ssl-tcp-unit.ss +++ b/collects/net/ssl-tcp-unit.ss @@ -1,9 +1,9 @@ (module ssl-tcp-unit mzscheme (provide make-ssl-tcp@) - (require (lib "unit.ss") + (require mzlib/unit "tcp-sig.ss" (lib "mzssl.ss" "openssl") - (lib "etc.ss")) + mzlib/etc) (define (make-ssl-tcp@ server-cert-file server-key-file server-root-cert-files server-suggest-auth-file diff --git a/collects/net/tcp-redirect.ss b/collects/net/tcp-redirect.ss index 717aa60e1c..eb7327f03c 100644 --- a/collects/net/tcp-redirect.ss +++ b/collects/net/tcp-redirect.ss @@ -1,9 +1,9 @@ (module tcp-redirect mzscheme (provide tcp-redirect) - (require (lib "unit.ss") - (lib "async-channel.ss") - (lib "etc.ss") + (require mzlib/unit + mzlib/async-channel + mzlib/etc "tcp-sig.ss") (define raw:tcp-abandon-port tcp-abandon-port) diff --git a/collects/net/tcp-unit.ss b/collects/net/tcp-unit.ss index ff6f6ffbd8..de87f4f8cb 100644 --- a/collects/net/tcp-unit.ss +++ b/collects/net/tcp-unit.ss @@ -1,6 +1,6 @@ (module tcp-unit mzscheme (provide tcp@) - (require (lib "unit.ss") "tcp-sig.ss") + (require mzlib/unit "tcp-sig.ss") (define-unit-from-context tcp@ tcp^)) diff --git a/collects/net/unihead.ss b/collects/net/unihead.ss index df8579b24c..581e295a36 100644 --- a/collects/net/unihead.ss +++ b/collects/net/unihead.ss @@ -1,7 +1,7 @@ (module unihead mzscheme - (require (lib "base64.ss" "net") - (lib "qp.ss" "net") - (lib "string.ss")) + (require net/base64 + net/qp + mzlib/string) (provide encode-for-header decode-for-header diff --git a/collects/tests/mzscheme/net.ss b/collects/tests/mzscheme/net.ss index 9ddbdc13e6..6bec67a8a8 100644 --- a/collects/tests/mzscheme/net.ss +++ b/collects/tests/mzscheme/net.ss @@ -8,10 +8,10 @@ ;; url.ss tests ;; -(require (lib "url.ss" "net") - (lib "uri-codec.ss" "net") - (lib "string.ss") - (lib "url-unit.ss" "net") ; to get set-url:os-type! +(require net/url + net/uri-codec + mzlib/string + net/url-unit ; to get set-url:os-type! ) (test "%Pq" uri-decode "%Pq") @@ -466,7 +466,7 @@ ;; a few tests of head.ss -- JBC, 2006-07-31 ;; -(require (lib "head.ss" "net")) +(require net/head) (test (void) validate-header "From: me@here.net\r\n\r\n") (test (void) validate-header #"From: me@here.net\r\n\r\n") @@ -541,7 +541,7 @@ ;; ;; cookie tests --- JBM, 2006-12-01 -(require (lib "cookie.ss" "net")) +(require net/cookie) ;; cookie-test : (cookie -> cookie) string -> test (define (cookie-test fn expected) @@ -615,9 +615,9 @@ ;; other net tests ;; -(require (lib "base64.ss" "net") - (lib "qp.ss" "net") - (lib "port.ss")) +(require net/base64 + net/qp + mzlib/port) (define tricky-strings (let ([dir (collection-path "tests" "mzscheme")])