Recketizing much in `net/*', mass ".ss" -> ".rkt" conversion in .scrbl files.

(Some other minor things here and there.)

original commit: debd1f9f1e

collects/net/cgi.rkt

@@ -1,5 +1,5 @@
-#lang scheme/base
+#lang racket/base
-(require scheme/unit "cgi-sig.ss" "cgi-unit.ss")
+(require racket/unit "cgi-sig.rkt" "cgi-unit.rkt")
 
 (define-values/invoke-unit/infer cgi@)
 

collects/net/cookie.rkt

@@ -1,5 +1,5 @@
-#lang scheme/base
+#lang racket/base
-(require scheme/unit "cookie-sig.ss" "cookie-unit.ss")
+(require racket/unit "cookie-sig.rkt" "cookie-unit.rkt")
 
 (provide-signature-elements cookie^)
 

collects/net/dns.rkt

@@ -1,5 +1,5 @@
-#lang scheme/base
+#lang racket/base
-(require scheme/unit "dns-sig.ss" "dns-unit.ss")
+(require racket/unit "dns-sig.rkt" "dns-unit.rkt")
 
 (define-values/invoke-unit/infer dns@)
 

collects/net/imap.rkt

@@ -1,5 +1,5 @@
-#lang scheme/base
+#lang racket/base
-(require scheme/unit scheme/contract "imap-sig.ss" "imap-unit.ss")
+(require racket/unit racket/contract "imap-sig.rkt" "imap-unit.rkt")
 
 (define-values/invoke-unit/infer imap@)
 

collects/net/mime-util.rkt

@@ -1,5 +1,5 @@
 ;;;
-;;; <mime-util.ss> ---- Extra utilities
+;;; <mime-util.rkt> ---- Extra utilities
 ;;; Time-stamp: <01/05/07 17:41:12 solsona>
 ;;;
 ;;; Copyright (C) 2001 by Francisco Solsona.
@@ -26,7 +26,7 @@
 ;;
 ;; Commentary:
 
-#lang scheme/base
+#lang racket/base
 
 (provide string-tokenizer
          trim-all-spaces
@@ -55,19 +55,17 @@
               (list s))))))
 
 ;; Trim all spaces, except those in quoted strings.
-(define re:quote-start (regexp "\""))
-(define re:space (regexp "[ \t\n\r\v]"))
 (define (trim-all-spaces str)
   ;; Break out alternate quoted and unquoted parts.
   ;; Initial and final string are unquoted.
   (let-values ([(unquoted quoted)
                 (let loop ([str str] [unquoted null] [quoted null])
-                  (let ([m (regexp-match-positions re:quote-start str)])
+                  (let ([m (regexp-match-positions #rx"\"" str)])
                     (if m
                       (let ([prefix (substring str 0 (caar m))]
                             [rest (substring str (add1 (caar m)) (string-length str))])
                         ;; Find closing quote
-                        (let ([m (regexp-match-positions re:quote-start rest)])
+                        (let ([m (regexp-match-positions #rx"\"" rest)])
                           (if m
                             (let ([inside (substring rest 0 (caar m))]
                                   [rest (substring rest (add1 (caar m)) (string-length rest))])
@@ -78,8 +76,8 @@
     ;; Put the pieces back together, stripping spaces for unquoted parts:
     (apply
      string-append
-     (let loop ([unquoted unquoted][quoted quoted])
+     (let loop ([unquoted unquoted] [quoted quoted])
-       (let ([clean (regexp-replace* re:space (car unquoted) "")])
+       (let ([clean (regexp-replace* #rx"[ \t\n\r\v]" (car unquoted) "")])
          (if (null? quoted)
            (list clean)
            (list* clean
@@ -92,15 +90,15 @@
                   (regexp-replace #rx"^[ \t\r\n\v]+" str "")
                   ""))
 
-(define re:comments #rx"^[^\"]*(\"[^\"]*\")*[^\"]*(\\(.*\\))")
 (define (trim-comments str)
-  (let ([positions (regexp-match-positions re:comments str)])
+  (define positions
+    (regexp-match-positions #rx"^[^\"]*(\"[^\"]*\")*[^\"]*(\\(.*\\))" str))
   (if positions
     (string-append (substring str 0 (caaddr positions))
                    (substring str (cdaddr positions) (string-length str)))
-      str)))
+    str))
 
-(define (lowercase str) (string-downcase str))
+(define lowercase string-downcase)
 
 (define warning
   void
@@ -119,4 +117,4 @@
       (fprintf out "~a\n" ln)
       (loop (read-line in)))))
 
-;;; mime-util.ss ends here
+;;; mime-util.rkt ends here

collects/net/mime.rkt

@@ -1,5 +1,5 @@
 ;;;
-;;; <mime.ss> ---- MIME support
+;;; <mime.rkt> ---- MIME support
 ;;;
 ;;; Copyright (C) 2002 by PLT.
 ;;; Copyright (C) 2001 by Wish Computing.
@@ -26,13 +26,9 @@
 ;;
 ;; Commentary:
 
-#lang scheme/base
+#lang racket/base
-(require scheme/unit
+(require racket/unit
-         "mime-sig.ss"
+         "mime-sig.rkt" "mime-unit.rkt" "qp.rkt" "base64.rkt" "head.rkt")
-         "mime-unit.ss"
-         "qp.ss"
-         "base64.ss"
-         "head.ss")
 
 ;(define-unit-from-context base64@ base64^)
 ;(define-unit-from-context qp@ qp^)
@@ -44,4 +40,4 @@
 
 (provide-signature-elements mime^)
 
-;;; mime.ss ends here
+;;; mime.rkt ends here

collects/net/nntp.rkt

@@ -1,5 +1,5 @@
-#lang scheme/base
+#lang racket/base
-(require scheme/unit "nntp-sig.ss" "nntp-unit.ss")
+(require racket/unit "nntp-sig.rkt" "nntp-unit.rkt")
 
 (define-values/invoke-unit/infer nntp@)
 

collects/net/pop3.rkt

@@ -1,5 +1,5 @@
-#lang scheme/base
+#lang racket/base
-(require scheme/unit "pop3-sig.ss" "pop3-unit.ss")
+(require racket/unit "pop3-sig.rkt" "pop3-unit.rkt")
 
 (define-values/invoke-unit/infer pop3@)
 
@@ -7,7 +7,7 @@
 
 #|
 
-> (require-library "pop3.ss" "net")
+> (require-library "pop3.rkt" "net")
 > (define c (connect-to-server "cs.rice.edu"))
 > (authenticate/plain-text "scheme" "********" c)
 > (get-mailbox-status c)

collects/net/private/rbtree.rkt

@@ -1,3 +1,4 @@
+#lang racket/base
 
 ;; Two variants of red-black trees.
 
@@ -18,28 +19,28 @@
 ;; decremented by the node's key (recursively). This allows a ln-time
 ;; shift operation when a message is expunged.
 
-(module rbtree mzscheme
+(provide new-tree tree-empty?
-  (provide new-tree tree-empty?
          expunge-insert! expunge-tree->list
          fetch-insert! fetch-find fetch-delete! fetch-shift! fetch-tree->list)
 
-  (define-struct tree (v red? left-count left right parent) (make-inspector))
+(define-struct tree (v red? left-count left right parent)
+  #:mutable #:transparent)
 
-  (define (new-tree)
+(define (new-tree)
   (make-tree 'pre-root #f 0 #f #f #f))
 
-  (define (tree-empty? t)
+(define (tree-empty? t)
   (not (tree-left t)))
 
-  (define (k+ a b)
+(define (k+ a b)
   (cons (+ (car a) (if (number? b) b (car b)))
         (cdr a)))
-  (define (k- a b)
+(define (k- a b)
   (cons (- (car a) (if (number? b) b (car b)))
         (cdr a)))
-  (define kv car)
+(define kv car)
 
-  (define (mk-insert sort-to-left? sort=? right+
+(define (mk-insert sort-to-left? sort=? right+
                    left-insert-adjust!
                    left-rotate-adjust! right-rotate-adjust!)
   (define-values (rotate-left! rotate-right!)
@@ -49,8 +50,7 @@
                (let ([old-east (tree-east t)])
                  (let ([r (tree-west old-east)])
                    (set-tree-east! t r)
-                     (when r
+                   (when r (set-tree-parent! r t)))
-                       (set-tree-parent! r t)))
                  (let ([p (tree-parent t)])
                    (set-tree-parent! old-east p)
                    (if (eq? t (tree-left p))
@@ -110,9 +110,7 @@
                                        (rotate-east! gp)
                                        (loop gp)))])
                        (if (eq? v (tree-east p))
-                               (begin
+                         (begin (rotate-west! p) (finish p))
-                                 (rotate-west! p)
-                                 (finish p))
                          (finish v))))))))))
        (set-tree-red?! (tree-left pre-root) #f)))
 
@@ -139,8 +137,7 @@
                    (set-tree-v! c (k- (tree-v c) delta))
                    (loop (tree-left c))))))
            ;; Now we can delete t:
-             (let ([child-t (or (tree-left t)
+           (let ([child-t (or (tree-left t) (tree-right t))]
-                                (tree-right t))]
                  [p (tree-parent t)])
              (when child-t
                (set-tree-parent! child-t p)
@@ -192,7 +189,7 @@
                               (set-tree-red?! (tree-east w) #f)
                               (rotate-west! p))))))]))))))))))
 
-  (define-values (expunge-insert! ---)
+(define-values (expunge-insert! ---)
   (mk-insert
    ;; sort-to-left?
    (lambda (n t)
@@ -216,7 +213,7 @@
                                 (tree-left-count old-left)
                                 1)))))
 
-  (define-values (fetch-insert! fetch-delete!)
+(define-values (fetch-insert! fetch-delete!)
   (mk-insert
    ;; sort-to-left?
    (lambda (n t)
@@ -238,7 +235,7 @@
      (set-tree-v! t (k- (tree-v t)
                         (tree-v old-left))))))
 
-  (define (expunge-tree->list pre-root)
+(define (expunge-tree->list pre-root)
   (let loop ([t (tree-left pre-root)])
     (if t
       (append (loop (tree-left t))
@@ -246,45 +243,41 @@
               (loop (tree-right t)))
       null)))
 
-  (define (fetch-find-node pre-root n)
+(define (fetch-find-node pre-root n)
-    (let loop ([t (tree-left pre-root)]
+  (let loop ([t (tree-left pre-root)] [n n])
-               [n n])
     (and t
          (cond
            [(= n (kv (tree-v t))) t]
            [(< n (kv (tree-v t))) (loop (tree-left t) n)]
            [else (loop (tree-right t) (- n (kv (tree-v t))))]))))
 
-  (define (fetch-find pre-root n)
+(define (fetch-find pre-root n)
   (let ([t (fetch-find-node pre-root n)])
     (and t (tree-v t))))
 
-  (define (fetch-shift! pre-root n)
+(define (fetch-shift! pre-root n)
   (fetch-delete! pre-root n)
-    (let loop ([t (tree-left pre-root)]
+  (let loop ([t (tree-left pre-root)] [n n])
-               [n n])
     (when t
       (if (n . < . (kv (tree-v t)))
-            (begin
+        (begin (set-tree-v! t (k- (tree-v t) 1))
-              (set-tree-v! t (k- (tree-v t) 1))
                (loop (tree-left t) n))
         (loop (tree-right t)
               (- n (kv (tree-v t))))))))
 
-  (define (fetch-tree->list pre-root)
+(define (fetch-tree->list pre-root)
   (let loop ([t (tree-left pre-root)][d 0])
     (if t
       (append (loop (tree-left t) d)
               (list (k+ (tree-v t) d))
               (loop (tree-right t) (+ d (kv (tree-v t)))))
-          null))))
+      null)))
 
 #|
 
 Tests:
 
-(require rbtree)
+(require rbtree racket/pretty)
-(require mzlib/pretty)
 (print-struct #t)
 
 (define t (new-tree))

collects/net/qp.rkt

@@ -1,5 +1,5 @@
 ;;;
-;;; <qp.ss> ---- Quoted Printable Encoding/Decoding
+;;; <qp.rkt> ---- Quoted Printable Encoding/Decoding
 ;;;
 ;;; Copyright (C) 2002 by PLT.
 ;;; Copyright (C) 2001 by Francisco Solsona.
@@ -26,11 +26,11 @@
 ;;
 ;; Commentary:
 
-#lang scheme/base
+#lang racket/base
-(require mzlib/unit "qp-sig.ss" "qp-unit.ss")
+(require racket/unit "qp-sig.rkt" "qp-unit.rkt")
 
 (define-values/invoke-unit/infer qp@)
 
 (provide-signature-elements qp^)
 
-;;; qp.ss ends here
+;;; qp.rkt ends here

collects/net/scribblings/base64.scrbl

@@ -1,8 +1,5 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt" (for-label net/base64 net/base64-unit net/base64-sig))
-          (for-label net/base64
-                     net/base64-unit
-                     net/base64-sig))
 
 @title[#:tag "base64"]{Base 64: Encoding and Decoding}
 

collects/net/scribblings/cgi.scrbl

@@ -1,9 +1,6 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt"
-          (for-label net/cgi
+          (for-label net/cgi net/uri-codec net/cgi-unit net/cgi-sig))
-                     net/uri-codec
-                     net/cgi-unit
-                     net/cgi-sig))
 
 @title[#:tag "cgi"]{CGI Scripts}
 

collects/net/scribblings/common.rkt

@@ -1,9 +1,7 @@
-#lang scheme/base
+#lang racket/base
 
 (require scribble/manual
-         (for-label scheme/base
+         (for-label racket/base racket/contract))
-                    scheme/contract))
 
 (provide (all-from-out scribble/manual)
-         (for-label (all-from-out scheme/base
+         (for-label (all-from-out racket/base racket/contract)))
-                                  scheme/contract)))

collects/net/scribblings/cookie.scrbl

@@ -1,9 +1,6 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt" scribble/eval
-          scribble/eval
+          (for-label net/cookie net/cookie-unit net/cookie-sig))
-          (for-label net/cookie
-                     net/cookie-unit
-                     net/cookie-sig))
 
 @(define cookie-eval (make-base-eval))
 @interaction-eval[#:eval cookie-eval (require net/cookie)]

collects/net/scribblings/dns.scrbl

@@ -1,8 +1,5 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt" (for-label net/dns net/dns-unit net/dns-sig))
-          (for-label net/dns
-                     net/dns-unit
-                     net/dns-sig))
 
 @title[#:tag "dns"]{DNS: Domain Name Service Queries}
 

collects/net/scribblings/ftp.scrbl

@@ -1,8 +1,5 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt" (for-label net/ftp net/ftp-unit net/ftp-sig))
-          (for-label net/ftp
-                     net/ftp-unit
-                     net/ftp-sig))
 
 @title[#:tag "ftp"]{FTP: Client Downloading}
 

collects/net/scribblings/head.scrbl

@@ -1,10 +1,6 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt" scribble/eval scribble/struct
-          scribble/eval
+          (for-label net/head net/head-unit net/head-sig))
-          scribble/struct
-          (for-label net/head
-                     net/head-unit
-                     net/head-sig))
 
 @(define head-eval (make-base-eval))
 @interaction-eval[#:eval head-eval (require net/head)]

collects/net/scribblings/imap.scrbl

@@ -1,10 +1,6 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt" scribble/eval scribble/struct
-          scribble/eval
+          (for-label net/imap net/imap-unit net/imap-sig))
-          scribble/struct
-          (for-label net/imap
-                     net/imap-unit
-                     net/imap-sig))
 
 @(define (just-report)
   @elem{This operation does not communicate with the server. It merely reports

collects/net/scribblings/mime.scrbl

@@ -1,9 +1,6 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt" scribble/struct
-          scribble/struct
+          (for-label net/mime net/mime-unit net/mime-sig))
-          (for-label net/mime
-                     net/mime-unit
-                     net/mime-sig))
 
 @(define-syntax-rule (mime-table (type (sub-type0 ref0) (sub-type ref) ...) ...)
   (let ([spacer (hspace 1)]

collects/net/scribblings/net.scrbl

@@ -1,5 +1,5 @@
 #lang scribble/doc
-@(require "common.ss")
+@(require "common.rkt")
 
 @title{@bold{Net}: Racket Networking Libraries}
 

collects/net/scribblings/nntp.scrbl

@@ -1,8 +1,5 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt" (for-label net/nntp net/nntp-unit net/nntp-sig))
-          (for-label net/nntp
-                     net/nntp-unit
-                     net/nntp-sig))
 
 @title[#:tag "nntp"]{NNTP: Newsgroup Protocol}
 

collects/net/scribblings/pop3.scrbl

@@ -1,8 +1,5 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt" (for-label net/pop3 net/pop3-unit net/pop3-sig))
-          (for-label net/pop3
-                     net/pop3-unit
-                     net/pop3-sig))
 
 @(define pt (tt ">"))
 
@@ -150,7 +147,7 @@ Raised when the server does not gracefully disconnect.}
 
 @defstruct[(malformed-server-response pop3) ([communicator communicator?])]{
 
-Raised when the server produces a mal-formed response.}
+Raised when the server produces a malformed response.}
 
 @section{Example Session}
 

collects/net/scribblings/qp.scrbl

@@ -1,8 +1,5 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt" (for-label net/qp net/qp-unit net/qp-sig))
-          (for-label net/qp
-                     net/qp-unit
-                     net/qp-sig))
 
 @title[#:tag "qp"]{Quoted-Printable: Encoding and Decoding}
 

collects/net/scribblings/sendmail.scrbl

@@ -1,8 +1,6 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt"
-          (for-label net/sendmail
+          (for-label net/sendmail net/sendmail-unit net/sendmail-sig))
-                     net/sendmail-unit
-                     net/sendmail-sig))
 
 @title[#:tag "sendmail"]{@exec{sendmail}: Sending E-Mail}
 

collects/net/scribblings/sendurl.scrbl

@@ -1,7 +1,5 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt" (for-label net/sendurl racket/file))
-          (for-label net/sendurl
-                     scheme/file))
 
 @title[#:tag "sendurl"]{Send URL: Opening a Web Browser}
 
@@ -9,7 +7,7 @@
 in the user's chosen web browser.}
 
 See also @schememodname[browser/external], which requires
-@scheme[scheme/gui], but can prompt the user for a browser if no
+@scheme[racket/gui], but can prompt the user for a browser if no
 browser preference is set.
 
 
@@ -64,7 +62,7 @@ Similar to @scheme[send-url/file], but it consumes the contents of a
 page to show, and displayes it from a temporary file.
 
 If @scheme[delete-at] is a number, the temporary file is removed after
-this many seconds.  The deletion happens in a thread, so if mzscheme
+this many seconds.  The deletion happens in a thread, so if racket
 exits before that it will not happen --- when this function is called
 it scans old generated files (this happens randomly, not on every
 call) and removes them to avoid cluttering the temporary directory.

collects/net/scribblings/smtp.scrbl

@@ -1,10 +1,6 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt"
-          (for-label net/smtp
+          (for-label net/smtp net/smtp-unit net/smtp-sig racket/tcp openssl))
-                     net/smtp-unit
-                     net/smtp-sig
-                     scheme/tcp
-                     openssl))
 
 @title[#:tag "smtp"]{SMTP: Sending E-Mail}
 

collects/net/scribblings/ssl-tcp-unit.scrbl

@@ -1,7 +1,5 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt" (for-label net/ssl-tcp-unit net/tcp-sig))
-          (for-label net/ssl-tcp-unit
-                     net/tcp-sig))
 
 @title[#:tag "ssl-tcp-unit"]{SSL Unit: @scheme[tcp^] via SSL}
 

collects/net/scribblings/tcp-redirect.scrbl

@@ -1,21 +1,19 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt" (for-label net/tcp-redirect net/tcp-sig))
-          (for-label net/tcp-redirect
-                     net/tcp-sig))
 
 @title[#:tag "tcp-redirect"]{TCP Redirect: @scheme[tcp^] via Channels}
 
 @defmodule[net/tcp-redirect]{The @schememodname[net/tcp-redirect]
 library provides a function for directing some TCP port numbers to use
 buffered channels instead of the TCP support from
-@schememodname[scheme/tcp].}
+@schememodname[racket/tcp].}
 
 @defproc[(tcp-redirect [port-numbers (listof (integer-in 0 65535))])
          unit?]{
 
 Returns a unit that implements @scheme[tcp^]. For port numbers not
 listed in @scheme[port-numbers], the unit's implementations are the
-@schememodname[scheme/tcp] implementations.
+@schememodname[racket/tcp] implementations.
 
 For the port numbers listed in @scheme[port-numbers] and for
 connections to @scheme["127.0.0.1"], the unit's implementation does

collects/net/scribblings/tcp.scrbl

@@ -1,18 +1,14 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt"
-          (for-label net/tcp-sig
+          (for-label net/tcp-sig net/tcp-unit net/url-unit net/tcp-redirect
-                     net/tcp-unit
+                     net/ssl-tcp-unit racket/tcp))
-                     net/url-unit
-                     net/tcp-redirect
-                     net/ssl-tcp-unit
-                     scheme/tcp))
 
 @title[#:tag "tcp"]{TCP: Unit and Signature}
 
 The @schememodname[net/tcp-sig] and @schememodname[net/tcp-unit]
 libraries define a @scheme[tcp^] signature and @scheme[tcp@]
 implementation, where the implementation uses
-@schememodname[scheme/tcp].
+@schememodname[racket/tcp].
 
 Some units in the @filepath{net} collection import @scheme[tcp^], so
 that they can be used with transports other than plain TCP. For
@@ -33,7 +29,7 @@ See also @scheme[tcp-redirect] and @scheme[make-ssl-tcp@].
                      [hostname (or/c string? false/c) #f])
          @#,sigelem[tcp^ tcp-listener?]]{
 
-Like @scheme[tcp-listen] from @schememodname[scheme/tcp].}
+Like @scheme[tcp-listen] from @schememodname[racket/tcp].}
 
 @defproc[(tcp-connect [hostname string?]
                       [port-no (and/c exact-nonnegative-integer?
@@ -45,7 +41,7 @@ Like @scheme[tcp-listen] from @schememodname[scheme/tcp].}
                                      #f])
           (values input-port? output-port?)]{
 
-Like @scheme[tcp-connect] from @schememodname[scheme/tcp].}
+Like @scheme[tcp-connect] from @schememodname[racket/tcp].}
 
 @defproc[(tcp-connect/enable-break [hostname string?]
                       [port-no (and/c exact-nonnegative-integer?
@@ -56,33 +52,33 @@ Like @scheme[tcp-connect] from @schememodname[scheme/tcp].}
                                            false/c)])
           (values input-port? output-port?)]{
 
-Like @scheme[tcp-connect/enable-break] from @schememodname[scheme/tcp].}
+Like @scheme[tcp-connect/enable-break] from @schememodname[racket/tcp].}
 
 @defproc[(tcp-accept [listener @#,sigelem[tcp^ tcp-listener?]])
          (values input-port? output-port?)]{
 
-Like @scheme[tcp-accept] from @schememodname[scheme/tcp].}
+Like @scheme[tcp-accept] from @schememodname[racket/tcp].}
 
 @defproc[(tcp-accept/enable-break [listener @#,sigelem[tcp^ tcp-listener?]])
          (values input-port? output-port?)]{
 
-Like @scheme[tcp-accept/enable-break] from @schememodname[scheme/tcp].}
+Like @scheme[tcp-accept/enable-break] from @schememodname[racket/tcp].}
 
 @defproc[(tcp-accept-ready? [listener @#,sigelem[tcp^ tcp-listener?]]) boolean?]{
 
-Like @scheme[tcp-accept-ready?] from @schememodname[scheme/tcp].}
+Like @scheme[tcp-accept-ready?] from @schememodname[racket/tcp].}
 
 @defproc[(tcp-close [listener @#,sigelem[tcp^ tcp-listener?]]) void?]{
 
-Like @scheme[tcp-close] from @schememodname[scheme/tcp].}
+Like @scheme[tcp-close] from @schememodname[racket/tcp].}
 
 @defproc[(tcp-listener? [v any/c]) boolean?]{
 
-Like @scheme[tcp-listener?] from @schememodname[scheme/tcp].}
+Like @scheme[tcp-listener?] from @schememodname[racket/tcp].}
 
 @defproc[(tcp-abandon-port [tcp-port port?]) void?]{
 
-Like @scheme[tcp-abandon-port] from @schememodname[scheme/tcp].}
+Like @scheme[tcp-abandon-port] from @schememodname[racket/tcp].}
 
 @defproc[(tcp-addresses [tcp-port port?]
                         [port-numbers? any/c #f])
@@ -90,7 +86,7 @@ Like @scheme[tcp-abandon-port] from @schememodname[scheme/tcp].}
                (values string? (integer-in 1 65535)
                        string? (integer-in 1 65535)))]{
 
-Like @scheme[tcp-addresses] from @schememodname[scheme/tcp].}
+Like @scheme[tcp-addresses] from @schememodname[racket/tcp].}
 
 }
 
@@ -101,4 +97,4 @@ Like @scheme[tcp-addresses] from @schememodname[scheme/tcp].}
 @defthing[tcp@ unit?]{
 
 Imports nothing and exports @scheme[tcp^], implemented using
-@schememodname[scheme/tcp].}
+@schememodname[racket/tcp].}

collects/net/scribblings/uri-codec.scrbl

@@ -1,11 +1,7 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt" scribble/bnf scribble/eval
-          scribble/bnf
-          scribble/eval
           (for-label net/url
-                     net/uri-codec
+                     net/uri-codec net/uri-codec-unit net/uri-codec-sig))
-                     net/uri-codec-unit
-                     net/uri-codec-sig))
 
 @(define uri-codec-eval (make-base-eval))
 @interaction-eval[#:eval uri-codec-eval (require net/uri-codec)]

collects/net/scribblings/url.scrbl

@@ -1,11 +1,6 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt" scribble/bnf
-          scribble/bnf
+          (for-label net/url net/url-unit net/url-sig net/head net/uri-codec))
-          (for-label net/url
-                     net/url-unit
-                     net/url-sig
-                     net/head
-                     net/uri-codec))
 
 @title[#:tag "url"]{URLs and HTTP}
 

collects/net/scribblings/websocket.scrbl

@@ -1,10 +1,7 @@
 #lang scribble/doc
-@(require "common.ss"
+@(require "common.rkt"
           scribble/bnf
-          (for-label net/url
+          (for-label net/url unstable/contract web-server/http racket/list
-                     unstable/contract
-                     web-server/http
-                     racket/list
                      racket/async-channel
                      (prefix-in raw: (for-label net/tcp-unit))
                      net/websocket

collects/net/sendmail.rkt

@@ -1,5 +1,5 @@
-#lang scheme/base
+#lang racket/base
-(require scheme/unit "sendmail-sig.ss" "sendmail-unit.ss")
+(require racket/unit "sendmail-sig.rkt" "sendmail-unit.rkt")
 
 (define-values/invoke-unit/infer sendmail@)
 

collects/net/sendurl.rkt

@@ -1,4 +1,4 @@
-;; The main client of this module is browser/external.ss
+;; The main client of this module is browser/external.rkt
 ;;   (others just use the (send-url url [new?]) interface.)
 
 #lang racket/base
@@ -188,7 +188,7 @@
     ;; if it's a known browser, then it must be an existing one at this point
     [(not exe) (error 'send-url "internal error")]
     ;; if it's gone throw an error (refiltering will break assumptions of
-    ;; browser/external.ss, and we really mimic the Win/Mac case where there
+    ;; browser/external.rkt, and we really mimic the Win/Mac case where there
     ;; should be some builtin facility that doesn't change)
     [(not (file-exists? exe)) (error 'send-url "executable vanished: ~a" exe)]
     ;; finally, deal with the actual browser process

collects/net/smtp.rkt

@@ -1,5 +1,5 @@
-#lang scheme/base
+#lang racket/base
-(require scheme/unit "smtp-sig.ss" "smtp-unit.ss")
+(require racket/unit "smtp-sig.rkt" "smtp-unit.rkt")
 
 (define-values/invoke-unit/infer smtp@)
 

collects/net/ssl-tcp-unit.rkt

@@ -1,11 +1,10 @@
-#lang scheme/base
+#lang racket/base
 (provide make-ssl-tcp@)
-(require scheme/unit
+(require racket/unit "tcp-sig.rkt" openssl/mzssl)
-         "tcp-sig.ss"
-         openssl/mzssl)
 
 (define (make-ssl-tcp@
-         server-cert-file server-key-file server-root-cert-files server-suggest-auth-file
+         server-cert-file server-key-file server-root-cert-files
+         server-suggest-auth-file
          client-cert-file client-key-file client-root-cert-files)
   (unit
    (import)

collects/net/tcp-redirect.rkt

@@ -1,10 +1,7 @@
-#lang scheme/base
+#lang racket/base
 (provide tcp-redirect)
 
-(require scheme/unit
+(require racket/unit racket/tcp racket/async-channel "tcp-sig.rkt")
-         scheme/tcp
-         scheme/async-channel
-         "tcp-sig.ss")
 
 (define raw:tcp-abandon-port tcp-abandon-port)
 (define raw:tcp-accept tcp-accept)
@@ -46,7 +43,7 @@
    (define (tcp-accept/enable-break tcp-listener)
      (cond
        [(pipe-listener? tcp-listener)
-        ;; XXX put this into async-channel.ss as async-channel-get/enable-break
+        ;; XXX put this into async-channel.rkt as async-channel-get/enable-break
         (sync/enable-break
          (handle-evt
           (pipe-listener-channel tcp-listener)

collects/net/tcp-sig.rkt

@@ -1,4 +1,4 @@
-#lang scheme/signature
+#lang racket/signature
 
 tcp-abandon-port
 tcp-accept

collects/net/tcp-unit.rkt

@@ -1,6 +1,6 @@
-#lang scheme/base
+#lang racket/base
 (provide tcp@)
 
-(require scheme/unit scheme/tcp "tcp-sig.ss")
+(require racket/unit racket/tcp "tcp-sig.rkt")
 
 (define-unit-from-context tcp@ tcp^)

collects/net/unihead.rkt

@@ -1,11 +1,7 @@
-#lang mzscheme
+#lang racket/base
-(require net/base64
+(require net/base64 net/qp racket/string)
-         net/qp
-         mzlib/string)
 
-(provide encode-for-header
+(provide encode-for-header decode-for-header generalize-encoding)
-         decode-for-header
-         generalize-encoding)
 
 (define re:ascii #rx"^[\u0-\u7F]*$")
 
@@ -51,23 +47,17 @@
 
 ;; ----------------------------------------
 
-(define re:us-ascii #rx#"^(?i:us-ascii)$")
-(define re:iso      #rx#"^(?i:iso-8859-1)$")
-(define re:gb       #rx#"^(?i:gb(?:2312)?)$")
-(define re:ks_c     #rx#"^(?i:ks_c_5601-1987)$")
-(define re:utf-8    #rx#"^(?i:utf-8)$")
-
 (define re:encoded #rx#"^(.*?)=[?]([^?]+)[?]([qQbB])[?](.*?)[?]=(.*)$")
 
 (define (generalize-encoding encoding)
   ;; Treat Latin-1 as Windows-1252 and also threat GB and GB2312
   ;; as GBK, because some mailers are broken.
-  (cond [(or (regexp-match? re:iso encoding)
+  (cond [(or (regexp-match? #rx#"^(?i:iso-8859-1)$" encoding)
-             (regexp-match? re:us-ascii encoding))
+             (regexp-match? #rx#"^(?i:us-ascii)$" encoding))
          (if (bytes? encoding) #"WINDOWS-1252" "WINDOWS-1252")]
-        [(regexp-match? re:gb encoding)
+        [(regexp-match? #rx#"^(?i:gb(?:2312)?)$" encoding)
          (if (bytes? encoding) #"GBK" "GBK")]
-        [(regexp-match? re:ks_c encoding)
+        [(regexp-match? #rx#"^(?i:ks_c_5601-1987)$" encoding)
          (if (bytes? encoding) #"CP949" "CP949")]
         [else encoding]))
 
@@ -88,7 +78,7 @@
               (decode-for-header (bytes->string/latin-1 (cadr m)))
               (let ([encoding (generalize-encoding encoding)])
                 (cond
-                  [(regexp-match? re:utf-8 encoding)
+                  [(regexp-match? #rx#"^(?i:utf-8)$" encoding)
                    (bytes->string/utf-8 s #\?)]
                   [else (let ([c (bytes-open-converter
                                   (bytes->string/latin-1 encoding)