From a22633e348c9bdb1eb2a24bb52aa7fedc6e0799e Mon Sep 17 00:00:00 2001
From: Asumu Takikawa <asumu@ccs.neu.edu>
Date: Thu, 24 May 2012 00:07:16 -0400
Subject: [PATCH] Rename generics => generic.

---
 collects/data/order.rkt                                   | 2 +-
 collects/data/scribblings/order.scrbl                     | 2 +-
 collects/data/skip-list.rkt                               | 2 +-
 collects/data/splay-tree.rkt                              | 2 +-
 collects/meta/props                                       | 8 ++++----
 collects/racket/{generics.rkt => generic.rkt}             | 8 ++++----
 collects/racket/private/dict.rkt                          | 2 +-
 collects/racket/private/{generics.rkt => generic.rkt}     | 2 +-
 collects/racket/stream.rkt                                | 2 +-
 collects/scribblings/reference/define-struct.scrbl        | 2 +-
 collects/scribblings/reference/dicts.scrbl                | 4 ++--
 .../reference/{generics.scrbl => generic.scrbl}           | 6 +++---
 collects/scribblings/reference/sequences.scrbl            | 4 ++--
 collects/scribblings/reference/struct.scrbl               | 2 +-
 collects/tests/{generics => generic}/alist.rkt            | 2 +-
 collects/tests/{generics => generic}/custom-hash.rkt      | 2 +-
 collects/tests/{generics => generic}/custom-write.rkt     | 0
 collects/tests/{generics => generic}/equal+hash.rkt       | 0
 collects/tests/{generics => generic}/from-docs.rkt        | 2 +-
 collects/tests/{generics => generic}/from-unstable.rkt    | 2 +-
 collects/tests/{generics => generic}/iterator.rkt         | 2 +-
 collects/tests/{generics => generic}/stream.rkt           | 2 +-
 collects/tests/{generics => generic}/struct-form.rkt      | 0
 collects/tests/{generics => generic}/tests.rkt            | 0
 24 files changed, 30 insertions(+), 30 deletions(-)
 rename collects/racket/{generics.rkt => generic.rkt} (84%)
 rename collects/racket/private/{generics.rkt => generic.rkt} (99%)
 rename collects/scribblings/reference/{generics.scrbl => generic.scrbl} (97%)
 rename collects/tests/{generics => generic}/alist.rkt (94%)
 rename collects/tests/{generics => generic}/custom-hash.rkt (99%)
 rename collects/tests/{generics => generic}/custom-write.rkt (100%)
 rename collects/tests/{generics => generic}/equal+hash.rkt (100%)
 rename collects/tests/{generics => generic}/from-docs.rkt (98%)
 rename collects/tests/{generics => generic}/from-unstable.rkt (99%)
 rename collects/tests/{generics => generic}/iterator.rkt (98%)
 rename collects/tests/{generics => generic}/stream.rkt (97%)
 rename collects/tests/{generics => generic}/struct-form.rkt (100%)
 rename collects/tests/{generics => generic}/tests.rkt (100%)

diff --git a/collects/data/order.rkt b/collects/data/order.rkt
index 6f1130a1c9..47f22cb1b8 100644
--- a/collects/data/order.rkt
+++ b/collects/data/order.rkt
@@ -3,7 +3,7 @@
          racket/contract/base
          racket/string
          ffi/unsafe/atomic
-         racket/private/generics)
+         racket/private/generic)
 
 (define ordering/c
   (or/c '= '< '>))
diff --git a/collects/data/scribblings/order.scrbl b/collects/data/scribblings/order.scrbl
index 7da3c7a2c5..38c4810109 100644
--- a/collects/data/scribblings/order.scrbl
+++ b/collects/data/scribblings/order.scrbl
@@ -4,7 +4,7 @@
                      racket/contract
                      racket/dict
                      racket/base
-		     racket/generics))
+		     racket/generic))
 
 @title{Orders and Ordered Dictionaries}
 
diff --git a/collects/data/skip-list.rkt b/collects/data/skip-list.rkt
index c58fb67122..689fb206ab 100644
--- a/collects/data/skip-list.rkt
+++ b/collects/data/skip-list.rkt
@@ -2,7 +2,7 @@
 (require racket/match
          racket/contract/base
          racket/dict
-         racket/generics
+         racket/generic
          "order.rkt")
 ;; owned by ryanc
 
diff --git a/collects/data/splay-tree.rkt b/collects/data/splay-tree.rkt
index 96fff2e6ac..5d9df6e3b2 100644
--- a/collects/data/splay-tree.rkt
+++ b/collects/data/splay-tree.rkt
@@ -4,7 +4,7 @@
          racket/match
          racket/dict
          racket/contract/base
-	 racket/generics
+	 racket/generic
          "order.rkt")
 
 #|
diff --git a/collects/meta/props b/collects/meta/props
index c1890705ac..78af3fc3c6 100755
--- a/collects/meta/props
+++ b/collects/meta/props
@@ -1173,7 +1173,7 @@ path/s is either such a string or a list of them.
 "collects/racket/contract/private/ds.rkt" responsible (robby)
 "collects/racket/contract/private/guts.rkt" responsible (robby)
 "collects/racket/contract/private/helpers.rkt" responsible (robby)
-"collects/racket/generics.rkt" responsible (asumu stamourv)
+"collects/racket/generic.rkt" responsible (asumu stamourv)
 "collects/racket/gui/base.rkt" drdr:command-line (gracket "-t" *)
 "collects/racket/gui/init.rkt" drdr:command-line (gracket "-t" *)
 "collects/racket/gui.rkt" drdr:command-line (gracket "-t" *)
@@ -1181,7 +1181,7 @@ path/s is either such a string or a list of them.
 "collects/racket/match.rkt" responsible (samth)
 "collects/racket/place" responsible (tewk)
 "collects/racket/place/distributed/examples/hello-world.rkt" drdr:command-line #f
-"collects/racket/private/generics.rkt" responsible (asumu stamourv)
+"collects/racket/private/generic.rkt" responsible (asumu stamourv)
 "collects/racket/slice.rkt" responsible (jay)
 "collects/racklog" responsible (jay)
 "collects/rackunit" responsible (jay noel ryanc)
@@ -1286,7 +1286,7 @@ path/s is either such a string or a list of them.
 "collects/scribblings/guide/read.scrbl" drdr:command-line #f
 "collects/scribblings/raco" responsible (jay mflatt)
 "collects/scribblings/reference/distributed.scrbl" responsible (tewk)
-"collects/scribblings/reference/generics.scrbl" responsible (asumu stamourv)
+"collects/scribblings/reference/generic.scrbl" responsible (asumu stamourv)
 "collects/scriblib" responsible (mflatt)
 "collects/setup" responsible (mflatt)
 "collects/setup/main.rkt" drdr:command-line #f
@@ -1498,7 +1498,7 @@ path/s is either such a string or a list of them.
 "collects/tests/future" responsible (jamesswaine mflatt robby)
 "collects/tests/future/future.rkt" drdr:timeout 200
 "collects/tests/future/random-future.rkt" drdr:timeout 480
-"collects/tests/generics" responsible (asumu stamourv)
+"collects/tests/generic" responsible (asumu stamourv)
 "collects/tests/gracket" responsible (mflatt)
 "collects/tests/gracket/auto.rktl" drdr:command-line #f
 "collects/tests/gracket/blits.rkt" drdr:command-line (gracket "-f" *)
diff --git a/collects/racket/generics.rkt b/collects/racket/generic.rkt
similarity index 84%
rename from collects/racket/generics.rkt
rename to collects/racket/generic.rkt
index 766f2e44ab..2243a57293 100644
--- a/collects/racket/generics.rkt
+++ b/collects/racket/generic.rkt
@@ -1,13 +1,13 @@
 #lang racket/base
-(require (rename-in "private/generics.rkt"
+(require (rename-in "private/generic.rkt"
                     [define-generics define-generics/pre])
          (for-syntax racket/base racket/local))
 
-;; Convenience layer on top of racket/private/generics.
-;; To avoid circular dependencies, racket/private/generics cannot use
+;; Convenience layer on top of racket/private/generic.
+;; To avoid circular dependencies, racket/private/generic cannot use
 ;; `parse-keyword-options' (which depends on racket/dict). So we do
 ;; keyword argument parsing here.
-;; Files that use racket/private/generics _must_ pass _all_ keyword
+;; Files that use racket/private/generic _must_ pass _all_ keyword
 ;; arguments to define-generics _in_order_.
 
 (provide define-generics define/generic)
diff --git a/collects/racket/private/dict.rkt b/collects/racket/private/dict.rkt
index c15bb11bc0..5e970c9247 100644
--- a/collects/racket/private/dict.rkt
+++ b/collects/racket/private/dict.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 
-(require racket/private/generics ; to avoid circular dependencies
+(require racket/private/generic ; to avoid circular dependencies
          (for-syntax racket/base))
 
 (define-generics (dict gen:dict prop:dict dict? #:defined-table dict-def-table
diff --git a/collects/racket/private/generics.rkt b/collects/racket/private/generic.rkt
similarity index 99%
rename from collects/racket/private/generics.rkt
rename to collects/racket/private/generic.rkt
index 10c6ca044b..1faa2a620a 100644
--- a/collects/racket/private/generics.rkt
+++ b/collects/racket/private/generic.rkt
@@ -12,7 +12,7 @@
 (define-syntax (define-generics stx)
   (syntax-case stx () ; can't use syntax-parse, since it depends on us
     ;; keyword arguments must _all_ be provided _in_order_. For the
-    ;; user-facing version of `define-generics', see racket/generics.
+    ;; user-facing version of `define-generics', see racket/generic.
     ;;
     ;; The `header` is the original name the library writer provides
     ;; that is used to define the `name`, `prop:name`, and `name?`
diff --git a/collects/racket/stream.rkt b/collects/racket/stream.rkt
index 100a2f628b..d75c2cf01a 100644
--- a/collects/racket/stream.rkt
+++ b/collects/racket/stream.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 
-(require racket/private/generics
+(require racket/private/generic
          (rename-in "private/for.rkt"
                     [stream-ref    stream-get-generics]
                     [stream-empty? -stream-empty]
diff --git a/collects/scribblings/reference/define-struct.scrbl b/collects/scribblings/reference/define-struct.scrbl
index 71f81e46a0..da4a389174 100644
--- a/collects/scribblings/reference/define-struct.scrbl
+++ b/collects/scribblings/reference/define-struct.scrbl
@@ -1,6 +1,6 @@
 #lang scribble/doc
 @(require "mz.rkt" (for-syntax racket/base) (for-label racket/serialize
-                                                       racket/generics))
+                                                       racket/generic))
 
 @(define posn-eval (make-base-eval))
 @(interaction-eval #:eval posn-eval (require (for-syntax racket/base)))
diff --git a/collects/scribblings/reference/dicts.scrbl b/collects/scribblings/reference/dicts.scrbl
index 31de747b5e..2e2e75fc4d 100644
--- a/collects/scribblings/reference/dicts.scrbl
+++ b/collects/scribblings/reference/dicts.scrbl
@@ -1,8 +1,8 @@
 #lang scribble/doc
-@(require "mz.rkt" scribble/eval (for-label racket/generics))
+@(require "mz.rkt" scribble/eval (for-label racket/generic))
 
 @(define dict-eval (make-base-eval))
-@(interaction-eval #:eval dict-eval (require racket/dict racket/generics))
+@(interaction-eval #:eval dict-eval (require racket/dict racket/generic))
 
 @title[#:tag "dicts"]{Dictionaries}
 
diff --git a/collects/scribblings/reference/generics.scrbl b/collects/scribblings/reference/generic.scrbl
similarity index 97%
rename from collects/scribblings/reference/generics.scrbl
rename to collects/scribblings/reference/generic.scrbl
index 4289eb05b4..16c29dd35e 100644
--- a/collects/scribblings/reference/generics.scrbl
+++ b/collects/scribblings/reference/generic.scrbl
@@ -1,5 +1,5 @@
 #lang scribble/manual
-@(require (for-label racket/base racket/generics))
+@(require (for-label racket/base racket/generic))
 
 @title[#:tag "struct-generics"]{Generic Interfaces}
 @; @author[@author+email["Eli Barzilay" "eli@racket-lang.org"]
@@ -7,7 +7,7 @@
 @; 	@author+email["Vincent St-Amour" "stamourv@racket-lang.org"]
 @; 	@author+email["Asumu Takikawa" "asumu@racket-lang.org"]]
 
-@defmodule[racket/generics]
+@defmodule[racket/generic]
 
 A @deftech{generic interface} allows per-type methods to be
 associated with generic functions. Generic functions are defined
@@ -72,7 +72,7 @@ with @racket[#:methods].
 @(define (new-evaluator)
    (let* ([e (make-base-eval)])
      (e '(require (for-syntax racket/base)
-                  racket/generics))
+                  racket/generic))
      e))
 
 @(define evaluator (new-evaluator))
diff --git a/collects/scribblings/reference/sequences.scrbl b/collects/scribblings/reference/sequences.scrbl
index fc26f5ab7f..acdc50f3d0 100644
--- a/collects/scribblings/reference/sequences.scrbl
+++ b/collects/scribblings/reference/sequences.scrbl
@@ -2,7 +2,7 @@
 @(require "mz.rkt" scribble/scheme
           (for-syntax racket/base)
           (for-label racket/generator
-                     racket/generics
+                     racket/generic
                      racket/mpair))
 
 @(define (info-on-seq where what)
@@ -25,7 +25,7 @@ vice-versa.
 
 @(define stream-evaluator
    (let ([evaluator (make-base-eval)])
-     (evaluator '(require racket/generics))
+     (evaluator '(require racket/generic))
      (evaluator '(require racket/list))
      (evaluator '(require racket/stream))
      evaluator))
diff --git a/collects/scribblings/reference/struct.scrbl b/collects/scribblings/reference/struct.scrbl
index 1c53e8cf73..e759abbf42 100644
--- a/collects/scribblings/reference/struct.scrbl
+++ b/collects/scribblings/reference/struct.scrbl
@@ -405,7 +405,7 @@ Returns @racket[#t] if @racket[v] is an accessor procedure produced
 by @racket[make-struct-type-property], @racket[#f] otherwise.}
 
 @;------------------------------------------------------------------------
-@include-section["generics.scrbl"]
+@include-section["generic.scrbl"]
 
 @;------------------------------------------------------------------------
 @section[#:tag "struct-copy"]{Copying and Updating Structures}
diff --git a/collects/tests/generics/alist.rkt b/collects/tests/generic/alist.rkt
similarity index 94%
rename from collects/tests/generics/alist.rkt
rename to collects/tests/generic/alist.rkt
index 5b2179fde9..d97b8f9921 100644
--- a/collects/tests/generics/alist.rkt
+++ b/collects/tests/generic/alist.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 
-(require racket/generics racket/dict racket/list)
+(require racket/generic racket/dict racket/list)
 
 (define-struct alist (v)
   #:methods gen:dict
diff --git a/collects/tests/generics/custom-hash.rkt b/collects/tests/generic/custom-hash.rkt
similarity index 99%
rename from collects/tests/generics/custom-hash.rkt
rename to collects/tests/generic/custom-hash.rkt
index 6e2cd79da5..9333b25f8c 100644
--- a/collects/tests/generics/custom-hash.rkt
+++ b/collects/tests/generic/custom-hash.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 
-(require racket/generics
+(require racket/generic
          (only-in racket/dict
                   gen:dict prop:dict
                   dict?
diff --git a/collects/tests/generics/custom-write.rkt b/collects/tests/generic/custom-write.rkt
similarity index 100%
rename from collects/tests/generics/custom-write.rkt
rename to collects/tests/generic/custom-write.rkt
diff --git a/collects/tests/generics/equal+hash.rkt b/collects/tests/generic/equal+hash.rkt
similarity index 100%
rename from collects/tests/generics/equal+hash.rkt
rename to collects/tests/generic/equal+hash.rkt
diff --git a/collects/tests/generics/from-docs.rkt b/collects/tests/generic/from-docs.rkt
similarity index 98%
rename from collects/tests/generics/from-docs.rkt
rename to collects/tests/generic/from-docs.rkt
index a83a51206c..5254bd5f57 100644
--- a/collects/tests/generics/from-docs.rkt
+++ b/collects/tests/generic/from-docs.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 
-(require racket/generics racket/port)
+(require racket/generic racket/port)
 
 (define-generics printable
   (gen-print printable [port])
diff --git a/collects/tests/generics/from-unstable.rkt b/collects/tests/generic/from-unstable.rkt
similarity index 99%
rename from collects/tests/generics/from-unstable.rkt
rename to collects/tests/generic/from-unstable.rkt
index a9c5e33f78..b494a0612b 100644
--- a/collects/tests/generics/from-unstable.rkt
+++ b/collects/tests/generic/from-unstable.rkt
@@ -1,5 +1,5 @@
 #lang racket
-(require racket/generics
+(require racket/generic
          tests/eli-tester)
 
 (define (massq idx l)
diff --git a/collects/tests/generics/iterator.rkt b/collects/tests/generic/iterator.rkt
similarity index 98%
rename from collects/tests/generics/iterator.rkt
rename to collects/tests/generic/iterator.rkt
index 3bfc05b2e8..f5f65d6468 100644
--- a/collects/tests/generics/iterator.rkt
+++ b/collects/tests/generic/iterator.rkt
@@ -1,6 +1,6 @@
 #lang racket/base
 
-(require racket/private/generics racket/sequence)
+(require racket/private/generic racket/sequence)
 
 ;; This was designed as a higher-level interface on top of sequences,
 ;; but it turns out streams can do all that already (including state),
diff --git a/collects/tests/generics/stream.rkt b/collects/tests/generic/stream.rkt
similarity index 97%
rename from collects/tests/generics/stream.rkt
rename to collects/tests/generic/stream.rkt
index 65bc80649f..bdfeadef29 100644
--- a/collects/tests/generics/stream.rkt
+++ b/collects/tests/generic/stream.rkt
@@ -1,6 +1,6 @@
 #lang racket
 
-(require racket/generics racket/stream)
+(require racket/generic racket/stream)
 
 (define-struct list-stream (v)
   #:methods gen:stream
diff --git a/collects/tests/generics/struct-form.rkt b/collects/tests/generic/struct-form.rkt
similarity index 100%
rename from collects/tests/generics/struct-form.rkt
rename to collects/tests/generic/struct-form.rkt
diff --git a/collects/tests/generics/tests.rkt b/collects/tests/generic/tests.rkt
similarity index 100%
rename from collects/tests/generics/tests.rkt
rename to collects/tests/generic/tests.rkt