diff --git a/collects/data/heap.rkt b/collects/data/heap.rkt index 4520aff4d8..49dcfbc965 100644 --- a/collects/data/heap.rkt +++ b/collects/data/heap.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract +(require racket/contract/base racket/vector racket/match) diff --git a/collects/data/interval-map.rkt b/collects/data/interval-map.rkt index 27b8967986..728ba552fc 100644 --- a/collects/data/interval-map.rkt +++ b/collects/data/interval-map.rkt @@ -1,6 +1,6 @@ #lang racket/base ;; owned by ryanc -(require racket/contract +(require racket/contract/base racket/promise racket/dict data/splay-tree) diff --git a/collects/data/queue.rkt b/collects/data/queue.rkt index 6c40dfd1d1..6095f4a20c 100644 --- a/collects/data/queue.rkt +++ b/collects/data/queue.rkt @@ -1,6 +1,6 @@ #lang racket/base - -(require (for-syntax racket/base +(require racket/contract/base + (for-syntax racket/base unstable/wrapc)) ;; A Queue contains a linked list with mutable cdrs, holding two pointers @@ -82,8 +82,6 @@ ;; --- contracts --- -(require racket/contract) - (define queue/c (flat-named-contract "queue" queue?)) diff --git a/collects/data/skip-list.rkt b/collects/data/skip-list.rkt index f3657c3ed1..16e98f6561 100644 --- a/collects/data/skip-list.rkt +++ b/collects/data/skip-list.rkt @@ -1,6 +1,6 @@ #lang racket/base (require racket/match - racket/contract + racket/contract/base racket/dict "order.rkt") ;; owned by ryanc diff --git a/collects/data/splay-tree.rkt b/collects/data/splay-tree.rkt index fe112a43d7..4384603161 100644 --- a/collects/data/splay-tree.rkt +++ b/collects/data/splay-tree.rkt @@ -3,7 +3,7 @@ racket/syntax) racket/match racket/dict - racket/contract + racket/contract/base "order.rkt") #| diff --git a/collects/db/scribblings/tabbing.rkt b/collects/db/scribblings/tabbing.rkt index a2c9382b92..3db792f3cc 100644 --- a/collects/db/scribblings/tabbing.rkt +++ b/collects/db/scribblings/tabbing.rkt @@ -1,6 +1,6 @@ #lang racket/base (require scribble/struct - scribble/basic) + scribble/base) (provide & // tabbing) (define-struct tabbing-marker (kind) #:transparent) diff --git a/collects/db/util/datetime.rkt b/collects/db/util/datetime.rkt index 53e3ba3774..961fbdcb4f 100644 --- a/collects/db/util/datetime.rkt +++ b/collects/db/util/datetime.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract +(require racket/contract/base racket/match (prefix-in srfi: srfi/19) "../private/generic/sql-data.rkt") diff --git a/collects/db/util/geometry.rkt b/collects/db/util/geometry.rkt index f4c2d4d6bb..5c69e6e659 100644 --- a/collects/db/util/geometry.rkt +++ b/collects/db/util/geometry.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract +(require racket/contract/base "private/geometry.rkt") (provide/contract diff --git a/collects/db/util/postgresql.rkt b/collects/db/util/postgresql.rkt index 0bb0abda56..e6ddf3ab45 100644 --- a/collects/db/util/postgresql.rkt +++ b/collects/db/util/postgresql.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract +(require racket/contract/base "geometry.rkt") #| diff --git a/collects/errortrace/errortrace-lib.rkt b/collects/errortrace/errortrace-lib.rkt index 2fb5465abc..2b3b11d680 100644 --- a/collects/errortrace/errortrace-lib.rkt +++ b/collects/errortrace/errortrace-lib.rkt @@ -6,9 +6,8 @@ (require "stacktrace.rkt" "errortrace-key.rkt" "private/utils.rkt" - racket/contract + racket/contract/base racket/unit - racket/runtime-path (for-template racket/base) (for-syntax racket/base)) diff --git a/collects/framework/collapsed-snipclass-wxme.rkt b/collects/framework/collapsed-snipclass-wxme.rkt index dd2adbe76b..24ed587992 100644 --- a/collects/framework/collapsed-snipclass-wxme.rkt +++ b/collects/framework/collapsed-snipclass-wxme.rkt @@ -1,6 +1,5 @@ #lang racket/base (require racket/class - racket/snip wxme) (provide reader) diff --git a/collects/framework/gui-utils.rkt b/collects/framework/gui-utils.rkt index 52d3659abe..353c0346bb 100644 --- a/collects/framework/gui-utils.rkt +++ b/collects/framework/gui-utils.rkt @@ -1,7 +1,7 @@ -#lang at-exp scheme/base +#lang at-exp racket/base -(require string-constants scheme/gui/base - scheme/contract scheme/class) +(require string-constants racket/gui/base + racket/contract/base racket/class) (require scribble/srcdoc) (require/doc scheme/base scribble/manual) diff --git a/collects/framework/main.rkt b/collects/framework/main.rkt index 882b5e5f01..0a5e58e2f3 100644 --- a/collects/framework/main.rkt +++ b/collects/framework/main.rkt @@ -1,11 +1,10 @@ #lang at-exp racket/base -(require racket/contract +(require racket/contract/base racket/unit racket/class racket/gui/base mred/mred-unit - mred/mred-sig framework/framework-unit framework/private/sig (for-syntax scheme/base) diff --git a/collects/framework/preferences.rkt b/collects/framework/preferences.rkt index 3f4a4adae6..0757544b1a 100644 --- a/collects/framework/preferences.rkt +++ b/collects/framework/preferences.rkt @@ -26,8 +26,8 @@ the state transitions / contracts are: |# -(require scribble/srcdoc racket/class - racket/contract racket/file) +(require scribble/srcdoc + racket/contract/base racket/file) (require/doc racket/base scribble/manual (for-label racket/serialize)) (define-struct (exn:unknown-preference exn) ()) diff --git a/collects/framework/private/autosave.rkt b/collects/framework/private/autosave.rkt index 3abd8e0169..bb16515225 100644 --- a/collects/framework/private/autosave.rkt +++ b/collects/framework/private/autosave.rkt @@ -1,12 +1,11 @@ #lang scheme/unit - (require mzlib/class - scheme/file + (require racket/class + racket/file "sig.rkt" "../gui-utils.rkt" "../preferences.rkt" mred/mred-sig - mzlib/list string-constants) (import mred^ diff --git a/collects/framework/private/color-model.rkt b/collects/framework/private/color-model.rkt index f3984d5628..6c48aa8f52 100644 --- a/collects/framework/private/color-model.rkt +++ b/collects/framework/private/color-model.rkt @@ -1,9 +1,6 @@ #lang scheme/unit - (require mzlib/class - "sig.rkt" - mred/mred-sig - mzlib/list) - +(require "sig.rkt") + (import) (export framework:color-model^) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/collects/framework/private/color-prefs.rkt b/collects/framework/private/color-prefs.rkt index bcb0017292..aaac060210 100644 --- a/collects/framework/private/color-prefs.rkt +++ b/collects/framework/private/color-prefs.rkt @@ -1,6 +1,5 @@ #lang scheme/unit (require mzlib/class - mzlib/etc mred string-constants "../preferences.rkt" diff --git a/collects/framework/private/comment-box.rkt b/collects/framework/private/comment-box.rkt index 3d72e0c181..c4778455d9 100644 --- a/collects/framework/private/comment-box.rkt +++ b/collects/framework/private/comment-box.rkt @@ -2,9 +2,9 @@ (require (for-syntax scheme/base) scheme/unit - scheme/class + racket/class scheme/gui/base - scheme/runtime-path + racket/runtime-path "sig.rkt" "../decorated-editor-snip.rkt" string-constants) diff --git a/collects/framework/private/decorated-editor-snip.rkt b/collects/framework/private/decorated-editor-snip.rkt index f7c548a430..39a322df97 100644 --- a/collects/framework/private/decorated-editor-snip.rkt +++ b/collects/framework/private/decorated-editor-snip.rkt @@ -1,8 +1,7 @@ #lang scheme/base (require scheme/gui/base - scheme/class) - + racket/class) (provide editor-snip:decorated% editor-snip:decorated-snipclass% diff --git a/collects/framework/private/editor.rkt b/collects/framework/private/editor.rkt index 661e4f4178..d7b68dc457 100644 --- a/collects/framework/private/editor.rkt +++ b/collects/framework/private/editor.rkt @@ -7,7 +7,7 @@ "../gui-utils.rkt" mzlib/etc mred/mred-sig - scheme/path) + racket/path) (import mred^ [prefix autosave: framework:autosave^] diff --git a/collects/framework/private/encode.rkt b/collects/framework/private/encode.rkt index 31b876d4be..a8d0798788 100644 --- a/collects/framework/private/encode.rkt +++ b/collects/framework/private/encode.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/cmdline racket/string file/gzip file/gunzip net/base64) +(require racket/cmdline file/gzip file/gunzip net/base64) (define do-lang? #f) diff --git a/collects/framework/private/finder.rkt b/collects/framework/private/finder.rkt index ac020ee37f..31510a34cd 100644 --- a/collects/framework/private/finder.rkt +++ b/collects/framework/private/finder.rkt @@ -1,11 +1,10 @@ #lang scheme/unit (require string-constants - (prefix-in r: racket/gui/base) "sig.rkt" "../preferences.rkt" mred/mred-sig - scheme/path) + racket/path) (import mred^ [prefix keymap: framework:keymap^] diff --git a/collects/framework/private/focus-table.rkt b/collects/framework/private/focus-table.rkt index e29bb2cbf7..159ef90550 100644 --- a/collects/framework/private/focus-table.rkt +++ b/collects/framework/private/focus-table.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/gui/base racket/class) +(require racket/gui/base) (provide frame:lookup-focus-table frame:set-focus-table) diff --git a/collects/framework/private/frame.rkt b/collects/framework/private/frame.rkt index f889d47250..39cbc092cc 100644 --- a/collects/framework/private/frame.rkt +++ b/collects/framework/private/frame.rkt @@ -2,7 +2,7 @@ (require string-constants racket/class - racket/contract + racket/contract/base mzlib/include "search.rkt" "sig.rkt" @@ -12,7 +12,7 @@ framework/private/focus-table mrlib/close-icon mred/mred-sig - scheme/path) + racket/path) (import mred^ [prefix group: framework:group^] diff --git a/collects/framework/private/gen-standard-menus.rkt b/collects/framework/private/gen-standard-menus.rkt index d680952894..7df817d98f 100644 --- a/collects/framework/private/gen-standard-menus.rkt +++ b/collects/framework/private/gen-standard-menus.rkt @@ -1,8 +1,9 @@ #reader scribble/reader -#lang scheme +#lang racket/base (provide main) -(require scheme/pretty - scheme/runtime-path) +(require racket/pretty + racket/match + racket/runtime-path) (require "standard-menus-items.rkt") (define-runtime-path here ".") diff --git a/collects/framework/private/group.rkt b/collects/framework/private/group.rkt index 1bc409e9bb..e23e3a7939 100644 --- a/collects/framework/private/group.rkt +++ b/collects/framework/private/group.rkt @@ -1,13 +1,12 @@ #lang scheme/unit (require string-constants - mzlib/class + racket/class "sig.rkt" "../preferences.rkt" "../gui-utils.rkt" mred/mred-sig - mzlib/list - scheme/path) + racket/path) (import mred^ [prefix application: framework:application^] diff --git a/collects/framework/private/handler.rkt b/collects/framework/private/handler.rkt index 5fb720f779..f84dfe00ac 100644 --- a/collects/framework/private/handler.rkt +++ b/collects/framework/private/handler.rkt @@ -1,13 +1,12 @@ #lang scheme/unit (require mzlib/class - mzlib/list mrlib/hierlist "sig.rkt" "../preferences.rkt" "../gui-utils.rkt" mred/mred-sig - scheme/path + racket/path string-constants) (import mred^ diff --git a/collects/framework/private/icon.rkt b/collects/framework/private/icon.rkt index 6eab849ece..162c5cd937 100644 --- a/collects/framework/private/icon.rkt +++ b/collects/framework/private/icon.rkt @@ -2,9 +2,9 @@ (require (for-syntax scheme/base) scheme/unit - scheme/promise - scheme/class - scheme/runtime-path + racket/promise + racket/class + racket/runtime-path "bday.rkt" "sig.rkt" mred/mred-sig) diff --git a/collects/framework/private/mode.rkt b/collects/framework/private/mode.rkt index ab27f14e8f..052524785e 100644 --- a/collects/framework/private/mode.rkt +++ b/collects/framework/private/mode.rkt @@ -2,8 +2,8 @@ (require (for-syntax scheme/base) scheme/unit - scheme/class - scheme/surrogate + racket/class + racket/surrogate "sig.rkt") (provide mode@ surrogate-methods) diff --git a/collects/framework/private/panel.rkt b/collects/framework/private/panel.rkt index fa713bf5ab..71bd9a8de1 100644 --- a/collects/framework/private/panel.rkt +++ b/collects/framework/private/panel.rkt @@ -2,10 +2,8 @@ (require mzlib/class "sig.rkt" - mred/mred-sig - mzlib/list - mzlib/etc) - + mred/mred-sig) + (import [prefix icon: framework:icon^] mred^) (export framework:panel^) diff --git a/collects/framework/private/path-utils.rkt b/collects/framework/private/path-utils.rkt index ff348906a3..7b73201378 100644 --- a/collects/framework/private/path-utils.rkt +++ b/collects/framework/private/path-utils.rkt @@ -1,5 +1,5 @@ #lang scheme/unit - (require "sig.rkt" mred/mred-sig) + (require "sig.rkt") (import) (export framework:path-utils^) diff --git a/collects/framework/private/preferences.rkt b/collects/framework/private/preferences.rkt index f50bd14e70..7f55b561d8 100644 --- a/collects/framework/private/preferences.rkt +++ b/collects/framework/private/preferences.rkt @@ -34,8 +34,7 @@ the state transitions / contracts are: "sig.rkt" "../gui-utils.rkt" "../preferences.rkt" - mred/mred-sig - mzlib/list) + mred/mred-sig) (import mred^ [prefix exit: framework:exit^] diff --git a/collects/framework/private/scheme.rkt b/collects/framework/private/scheme.rkt index cb05887eeb..3509e379fe 100644 --- a/collects/framework/private/scheme.rkt +++ b/collects/framework/private/scheme.rkt @@ -4,15 +4,14 @@ ;; 6/30/95 (require string-constants - scheme/class + racket/class mred/mred-sig syntax-color/module-lexer "collapsed-snipclass-helpers.rkt" "sig.rkt" "../gui-utils.rkt" "../preferences.rkt" - scheme/match) - + racket/match) (import mred^ [prefix preferences: framework:preferences^] diff --git a/collects/framework/private/search.rkt b/collects/framework/private/search.rkt index 6f3acb577f..e7d91d7224 100644 --- a/collects/framework/private/search.rkt +++ b/collects/framework/private/search.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require scheme/contract - scheme/class +(require racket/contract/base + racket/class scheme/gui/base) (provide/contract diff --git a/collects/framework/private/text.rkt b/collects/framework/private/text.rkt index 30be968f00..28fc67b670 100644 --- a/collects/framework/private/text.rkt +++ b/collects/framework/private/text.rkt @@ -1,7 +1,6 @@ #lang racket/unit (require string-constants - racket/unit racket/class racket/match racket/path @@ -10,7 +9,6 @@ "../preferences.rkt" mred/mred-sig mrlib/interactive-value-port - setup/dirs racket/list) (require setup/xref scribble/xref diff --git a/collects/framework/private/version.rkt b/collects/framework/private/version.rkt index 8ae9e2b0d2..23c91f4ee7 100644 --- a/collects/framework/private/version.rkt +++ b/collects/framework/private/version.rkt @@ -1,7 +1,6 @@ #lang scheme/unit (require "sig.rkt" - mred/mred-sig mzlib/string mzlib/list) (import) diff --git a/collects/framework/test.rkt b/collects/framework/test.rkt index 7847588dcc..12339caeb9 100644 --- a/collects/framework/test.rkt +++ b/collects/framework/test.rkt @@ -1,6 +1,10 @@ -#lang at-exp scheme/gui +#lang at-exp racket/base -(require scribble/srcdoc +(require racket/class + racket/contract/base + racket/gui/base + scribble/srcdoc + (for-syntax racket/base) (prefix-in :: framework/private/focus-table)) (require/doc scheme/base scribble/manual (for-label framework)) diff --git a/collects/macro-debugger/analysis/check-requires.rkt b/collects/macro-debugger/analysis/check-requires.rkt index 8041ab1bf2..7c536414cf 100644 --- a/collects/macro-debugger/analysis/check-requires.rkt +++ b/collects/macro-debugger/analysis/check-requires.rkt @@ -3,7 +3,6 @@ racket/cmdline racket/match syntax/modcollapse - unstable/struct "private/get-references.rkt" "private/nom-use-alg.rkt" "private/util.rkt") diff --git a/collects/macro-debugger/analysis/private/moduledb.rkt b/collects/macro-debugger/analysis/private/moduledb.rkt index 0e4807ef5c..106a1d16da 100644 --- a/collects/macro-debugger/analysis/private/moduledb.rkt +++ b/collects/macro-debugger/analysis/private/moduledb.rkt @@ -1,7 +1,6 @@ #lang racket/base (require syntax/modresolve setup/path-to-relative - "util.rkt" racket/match) (provide allow-bypass? allow-drop? diff --git a/collects/macro-debugger/expand.rkt b/collects/macro-debugger/expand.rkt index b34cb03e2e..345b8a6419 100644 --- a/collects/macro-debugger/expand.rkt +++ b/collects/macro-debugger/expand.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract +(require racket/contract/base "model/trace.rkt" "model/reductions-config.rkt" "model/reductions.rkt") diff --git a/collects/macro-debugger/model/reductions-config.rkt b/collects/macro-debugger/model/reductions-config.rkt index 661e95c392..599ff05195 100644 --- a/collects/macro-debugger/model/reductions-config.rkt +++ b/collects/macro-debugger/model/reductions-config.rkt @@ -1,6 +1,6 @@ #lang racket/base (require (for-syntax racket/base) - racket/contract + racket/contract/base racket/match "../util/eomap.rkt" "deriv-util.rkt" diff --git a/collects/macro-debugger/model/reductions-engine.rkt b/collects/macro-debugger/model/reductions-engine.rkt index 3aec5cd893..b80eb25430 100644 --- a/collects/macro-debugger/model/reductions-engine.rkt +++ b/collects/macro-debugger/model/reductions-engine.rkt @@ -2,7 +2,7 @@ (require (for-syntax racket/base syntax/parse syntax/parse/experimental/contract) - racket/contract + racket/contract/base syntax/stx "deriv-util.rkt" "stx-util.rkt" diff --git a/collects/macro-debugger/stepper.rkt b/collects/macro-debugger/stepper.rkt index 48982a68d6..df245f25d5 100644 --- a/collects/macro-debugger/stepper.rkt +++ b/collects/macro-debugger/stepper.rkt @@ -1,6 +1,6 @@ #lang racket/base (require racket/class - racket/contract + racket/contract/base unstable/class-iop "model/trace.rkt" "view/interfaces.rkt" diff --git a/collects/macro-debugger/syntax-browser/frame.rkt b/collects/macro-debugger/syntax-browser/frame.rkt index 2286124c69..8b5b016cf5 100644 --- a/collects/macro-debugger/syntax-browser/frame.rkt +++ b/collects/macro-debugger/syntax-browser/frame.rkt @@ -1,7 +1,6 @@ #lang racket/base (require racket/class racket/gui/base - racket/list unstable/class-iop "interfaces.rkt" "partition.rkt" diff --git a/collects/macro-debugger/syntax-browser/image.rkt b/collects/macro-debugger/syntax-browser/image.rkt index 2a6e4e12e5..eab4c649f2 100644 --- a/collects/macro-debugger/syntax-browser/image.rkt +++ b/collects/macro-debugger/syntax-browser/image.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract +(require racket/contract/base racket/class racket/gui/base framework diff --git a/collects/macro-debugger/syntax-browser/interfaces.rkt b/collects/macro-debugger/syntax-browser/interfaces.rkt index 9d04748a75..53306ea6d5 100644 --- a/collects/macro-debugger/syntax-browser/interfaces.rkt +++ b/collects/macro-debugger/syntax-browser/interfaces.rkt @@ -1,6 +1,5 @@ #lang racket/base -(require racket/class - unstable/class-iop +(require unstable/class-iop (for-syntax racket/base)) (provide (all-defined-out)) diff --git a/collects/macro-debugger/syntax-browser/prefs.rkt b/collects/macro-debugger/syntax-browser/prefs.rkt index fb4dce2743..a3928823ed 100644 --- a/collects/macro-debugger/syntax-browser/prefs.rkt +++ b/collects/macro-debugger/syntax-browser/prefs.rkt @@ -1,6 +1,6 @@ #lang racket/base (require racket/class - framework + framework/preferences "interfaces.rkt" unstable/gui/notify unstable/gui/prefs) diff --git a/collects/macro-debugger/syntax-browser/pretty-printer.rkt b/collects/macro-debugger/syntax-browser/pretty-printer.rkt index ae5a8356e9..62e965a500 100644 --- a/collects/macro-debugger/syntax-browser/pretty-printer.rkt +++ b/collects/macro-debugger/syntax-browser/pretty-printer.rkt @@ -1,6 +1,5 @@ #lang racket/base -(require racket/list - racket/class +(require racket/class racket/pretty racket/gui/base racket/promise diff --git a/collects/macro-debugger/syntax-browser/text.rkt b/collects/macro-debugger/syntax-browser/text.rkt index 5b30b94e8f..dea286ae98 100644 --- a/collects/macro-debugger/syntax-browser/text.rkt +++ b/collects/macro-debugger/syntax-browser/text.rkt @@ -3,7 +3,7 @@ racket/gui/base data/interval-map drracket/arrow - framework/framework + framework data/interval-map "interfaces.rkt") diff --git a/collects/macro-debugger/util/eomap.rkt b/collects/macro-debugger/util/eomap.rkt index 1421385a7c..fd2f69a05f 100644 --- a/collects/macro-debugger/util/eomap.rkt +++ b/collects/macro-debugger/util/eomap.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract +(require racket/contract/base racket/dict racket/match) diff --git a/collects/macro-debugger/util/stxobj.rkt b/collects/macro-debugger/util/stxobj.rkt index 58d30f29dd..1650f6e122 100644 --- a/collects/macro-debugger/util/stxobj.rkt +++ b/collects/macro-debugger/util/stxobj.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require (rename-in racket/contract [-> c:->]) +(require (rename-in racket/contract/base [-> c:->]) ffi/unsafe) (define lib (ffi-lib #f)) diff --git a/collects/macro-debugger/view/prefs.rkt b/collects/macro-debugger/view/prefs.rkt index 6c86723318..b5ca82f7aa 100644 --- a/collects/macro-debugger/view/prefs.rkt +++ b/collects/macro-debugger/view/prefs.rkt @@ -1,6 +1,6 @@ #lang racket/base (require racket/class - framework + framework/preferences "interfaces.rkt" "../syntax-browser/prefs.rkt" unstable/gui/notify diff --git a/collects/mzlib/async-channel.rkt b/collects/mzlib/async-channel.rkt index 0b360c232f..fa1a0060fb 100644 --- a/collects/mzlib/async-channel.rkt +++ b/collects/mzlib/async-channel.rkt @@ -1,4 +1,3 @@ -#lang scheme/base - -(require scheme/async-channel) -(provide (all-from-out scheme/async-channel)) +#lang racket/base +(require racket/async-channel) +(provide (all-from-out racket/async-channel)) diff --git a/collects/mzlib/cm-accomplice.rkt b/collects/mzlib/cm-accomplice.rkt index b334c6da8d..74bdf451d5 100644 --- a/collects/mzlib/cm-accomplice.rkt +++ b/collects/mzlib/cm-accomplice.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require compiler/cm-accomplice) (provide (all-from-out compiler/cm-accomplice)) diff --git a/collects/mzlib/cm.rkt b/collects/mzlib/cm.rkt index ffff67c011..fb6006f28f 100644 --- a/collects/mzlib/cm.rkt +++ b/collects/mzlib/cm.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require compiler/cm) (provide (all-from-out compiler/cm)) diff --git a/collects/mzlib/cmdline.rkt b/collects/mzlib/cmdline.rkt index 8a0fe493cb..1cce81eac0 100644 --- a/collects/mzlib/cmdline.rkt +++ b/collects/mzlib/cmdline.rkt @@ -1,6 +1,6 @@ #lang mzscheme -(require (only scheme/cmdline parse-command-line)) +(require (only racket/cmdline parse-command-line)) (provide command-line parse-command-line) diff --git a/collects/mzlib/cml.rkt b/collects/mzlib/cml.rkt index c618562033..8eaf1b762b 100644 --- a/collects/mzlib/cml.rkt +++ b/collects/mzlib/cml.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract) +(require racket/contract/base) (define (spawn thunk) (thread/suspend-to-kill thunk)) diff --git a/collects/mzlib/compile.rkt b/collects/mzlib/compile.rkt index 037170c609..a097b724db 100644 --- a/collects/mzlib/compile.rkt +++ b/collects/mzlib/compile.rkt @@ -1,7 +1,7 @@ -#lang scheme/base -(require scheme/function - scheme/path - scheme/file +#lang racket/base +(require racket/function + racket/path + racket/file unstable/file) (provide compile-file) diff --git a/collects/mzlib/contract.rkt b/collects/mzlib/contract.rkt index c8f9724d14..c241f8de5b 100644 --- a/collects/mzlib/contract.rkt +++ b/collects/mzlib/contract.rkt @@ -7,7 +7,7 @@ (require "private/contract-arrow.rkt") (provide (all-from-out "private/contract-arrow.rkt")) -(require (only-in racket/contract unconstrained-domain->)) +(require (only-in racket/contract/base unconstrained-domain->)) (provide unconstrained-domain->) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/collects/mzlib/date.rkt b/collects/mzlib/date.rkt index 0dd0d9f8d9..c37deeabdd 100644 --- a/collects/mzlib/date.rkt +++ b/collects/mzlib/date.rkt @@ -3,7 +3,7 @@ racket/match racket/list racket/function - racket/contract) + racket/contract/base) (provide/contract [current-date (-> date?)] diff --git a/collects/mzlib/etc.rkt b/collects/mzlib/etc.rkt index 376d0a8bb9..7314700272 100644 --- a/collects/mzlib/etc.rkt +++ b/collects/mzlib/etc.rkt @@ -1,22 +1,18 @@ #lang mzscheme - (require setup/main-collects racket/local racket/bool racket/block (only racket/function identity) - (only scheme/base + (only racket/base build-string build-list build-vector compose) - (rename scheme/base base-else else) - "kw.rkt") + (rename racket/base base-else else)) -(require-for-syntax syntax/kerncase - syntax/stx - syntax/name +(require-for-syntax syntax/name setup/main-collects "private/stxset.rkt") diff --git a/collects/mzlib/file.rkt b/collects/mzlib/file.rkt index 944e1b017e..40eee70c19 100644 --- a/collects/mzlib/file.rkt +++ b/collects/mzlib/file.rkt @@ -1,6 +1,6 @@ -(module file scheme/base - (require scheme/file - scheme/path +(module file racket/base + (require racket/file + racket/path (prefix-in mz: (only-in mzscheme open-input-file open-output-file))) diff --git a/collects/mzlib/for.rkt b/collects/mzlib/for.rkt index a44225d8b8..c41ea2e6b7 100644 --- a/collects/mzlib/for.rkt +++ b/collects/mzlib/for.rkt @@ -1,4 +1,4 @@ -(module for scheme/base +(module for racket/base (provide for/fold for*/fold for for* for/list for*/list diff --git a/collects/mzlib/foreign.rkt b/collects/mzlib/foreign.rkt index 00d2ccebd7..e1f021cae8 100644 --- a/collects/mzlib/foreign.rkt +++ b/collects/mzlib/foreign.rkt @@ -1,4 +1,3 @@ - -(module foreign scheme/base +(module foreign racket/base (require scheme/foreign) (provide (all-from-out scheme/foreign))) diff --git a/collects/mzlib/inflate.rkt b/collects/mzlib/inflate.rkt index f51337c454..5fa4b7aea8 100644 --- a/collects/mzlib/inflate.rkt +++ b/collects/mzlib/inflate.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require (for-syntax scheme/base)) +#lang racket/base +(require (for-syntax racket/base)) (provide inflate gunzip-through-ports diff --git a/collects/mzlib/integer-set.rkt b/collects/mzlib/integer-set.rkt index c32ff58c8a..035cc6ae31 100644 --- a/collects/mzlib/integer-set.rkt +++ b/collects/mzlib/integer-set.rkt @@ -1,6 +1,6 @@ (module integer-set mzscheme - (require (all-except mzlib/list merge) - racket/contract) + (require (only racket/base foldr) + racket/contract/base) #;(define-syntax test-block (syntax-rules () diff --git a/collects/mzlib/list.rkt b/collects/mzlib/list.rkt index ed658ee04e..3bae96662d 100644 --- a/collects/mzlib/list.rkt +++ b/collects/mzlib/list.rkt @@ -1,9 +1,9 @@ -#lang scheme/base +#lang racket/base ;; The `first', etc. operations in this library ;; work on pairs, not lists. -(require (only-in scheme/list +(require (only-in racket/list cons? empty? empty diff --git a/collects/mzlib/math.rkt b/collects/mzlib/math.rkt index 5a2db7bdfb..bfc1841752 100644 --- a/collects/mzlib/math.rkt +++ b/collects/mzlib/math.rkt @@ -1,6 +1,5 @@ - -(module math scheme/base - (require scheme/math) - (provide (all-from-out scheme/math) +(module math racket/base + (require racket/math) + (provide (all-from-out racket/math) e) (define e (exp 1.0))) diff --git a/collects/mzlib/md5.rkt b/collects/mzlib/md5.rkt index d1e0060d90..8a82a112d1 100644 --- a/collects/mzlib/md5.rkt +++ b/collects/mzlib/md5.rkt @@ -1,3 +1,3 @@ -#lang scheme/base +#lang racket/base (require file/md5) (provide (all-from-out file/md5)) diff --git a/collects/mzlib/pconvert.rkt b/collects/mzlib/pconvert.rkt index f68a1d2b79..5aa959d585 100644 --- a/collects/mzlib/pconvert.rkt +++ b/collects/mzlib/pconvert.rkt @@ -1,8 +1,8 @@ (module pconvert mzscheme - (require (only "list.rkt" sort) - scheme/mpair + (require (only racket/base sort) + racket/mpair "pconvert-prop.rkt" "class.rkt") diff --git a/collects/mzlib/plt-match.rkt b/collects/mzlib/plt-match.rkt index add845afab..6814849d7c 100644 --- a/collects/mzlib/plt-match.rkt +++ b/collects/mzlib/plt-match.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require racket/match/match) (provide (all-from-out racket/match/match)) diff --git a/collects/mzlib/port.rkt b/collects/mzlib/port.rkt index 84fb89b6cc..1c32172120 100644 --- a/collects/mzlib/port.rkt +++ b/collects/mzlib/port.rkt @@ -2,7 +2,6 @@ (require (for-syntax racket/base) racket/contract/base - mzlib/list "private/port.rkt") (define (input-port-with-progress-evts? ip) diff --git a/collects/mzlib/pregexp.rkt b/collects/mzlib/pregexp.rkt index 5d2c4940ee..f1773befe8 100644 --- a/collects/mzlib/pregexp.rkt +++ b/collects/mzlib/pregexp.rkt @@ -7,7 +7,7 @@ ;; this is mostly a wrapper module. (module pregexp mzscheme - (require mzlib/string + (require (only racket/base regexp-quote regexp-split) mzlib/kw) (provide pregexp pregexp-match-positions diff --git a/collects/mzlib/pretty.rkt b/collects/mzlib/pretty.rkt index 3dcd8ee088..8e8238cdd4 100644 --- a/collects/mzlib/pretty.rkt +++ b/collects/mzlib/pretty.rkt @@ -1,3 +1,3 @@ -(module pretty scheme/base - (require scheme/pretty) - (provide (all-from-out scheme/pretty))) +(module pretty racket/base + (require racket/pretty) + (provide (all-from-out racket/pretty))) diff --git a/collects/mzlib/private/contract-arr-checks.rkt b/collects/mzlib/private/contract-arr-checks.rkt index 1bbf5d59c8..5a7ebe8afe 100644 --- a/collects/mzlib/private/contract-arr-checks.rkt +++ b/collects/mzlib/private/contract-arr-checks.rkt @@ -1,8 +1,7 @@ #lang racket/base (provide (all-defined-out)) -(require racket/contract/private/guts - racket/contract/private/blame +(require racket/contract/private/blame racket/contract/private/misc) (define empty-case-lambda/c diff --git a/collects/mzlib/private/contract-arr-obj-helpers.rkt b/collects/mzlib/private/contract-arr-obj-helpers.rkt index d72c58ca32..12a1abc7b4 100644 --- a/collects/mzlib/private/contract-arr-obj-helpers.rkt +++ b/collects/mzlib/private/contract-arr-obj-helpers.rkt @@ -1,9 +1,9 @@ -#lang scheme/base +#lang racket/base (require syntax/stx syntax/name) -(require (for-syntax scheme/base)) -(require (for-template scheme/base) +(require (for-syntax racket/base)) +(require (for-template racket/base) (for-template racket/contract/private/guts racket/contract/private/misc racket/contract/private/prop diff --git a/collects/mzlib/private/contract-object.rkt b/collects/mzlib/private/contract-object.rkt index 1a5840b5a9..6aedcbb464 100644 --- a/collects/mzlib/private/contract-object.rkt +++ b/collects/mzlib/private/contract-object.rkt @@ -7,7 +7,6 @@ "contract-arr-checks.rkt") (require (for-syntax racket/base - racket/contract/private/helpers "contract-arr-obj-helpers.rkt")) (provide object-contract) diff --git a/collects/mzlib/private/package-helper.rkt b/collects/mzlib/private/package-helper.rkt index 837f4df748..1fbd25d803 100644 --- a/collects/mzlib/private/package-helper.rkt +++ b/collects/mzlib/private/package-helper.rkt @@ -1,6 +1,5 @@ (module package-helper mzscheme - (require syntax/stx - syntax/boundmap) + (require syntax/boundmap) (provide str str? str-renames str-all-renames make-str check-defn-context diff --git a/collects/mzlib/private/sigutil.rkt b/collects/mzlib/private/sigutil.rkt index ff954ee1b3..7615bab957 100644 --- a/collects/mzlib/private/sigutil.rkt +++ b/collects/mzlib/private/sigutil.rkt @@ -9,7 +9,7 @@ (require "sigmatch.rkt") (require "../unit200.rkt") - (require "../list.rkt") + (require (only racket/base filter sort)) (define-struct signature (name ; sym src ; sym diff --git a/collects/mzlib/private/stxset.rkt b/collects/mzlib/private/stxset.rkt index 7c056f9e47..123cf7b6f2 100644 --- a/collects/mzlib/private/stxset.rkt +++ b/collects/mzlib/private/stxset.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require (for-syntax scheme/base +#lang racket/base +(require (for-syntax racket/base syntax/kerncase syntax/context)) diff --git a/collects/mzlib/private/unit-compiletime.rkt b/collects/mzlib/private/unit-compiletime.rkt index 593d352cf7..42ae4f045c 100644 --- a/collects/mzlib/private/unit-compiletime.rkt +++ b/collects/mzlib/private/unit-compiletime.rkt @@ -1,13 +1,11 @@ -#lang scheme/base +#lang racket/base -(require scheme/list - syntax/boundmap +(require syntax/boundmap "unit-syntax.rkt") -(require (for-syntax scheme/base)) -(require (for-template scheme/base +(require (for-syntax racket/base)) +(require (for-template racket/base "unit-keywords.rkt" "unit-runtime.rkt")) -(require racket/private/define-struct) (provide (struct-out var-info) (struct-out signature) diff --git a/collects/mzlib/private/unit-contract-syntax.rkt b/collects/mzlib/private/unit-contract-syntax.rkt index 8f34bf9512..ceb24ad9e9 100644 --- a/collects/mzlib/private/unit-contract-syntax.rkt +++ b/collects/mzlib/private/unit-contract-syntax.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require syntax/parse "unit-compiletime.rkt" diff --git a/collects/mzlib/private/unit-keywords.rkt b/collects/mzlib/private/unit-keywords.rkt index 9fa5f4f112..a14a9345f0 100644 --- a/collects/mzlib/private/unit-keywords.rkt +++ b/collects/mzlib/private/unit-keywords.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require (for-syntax scheme/base)) +#lang racket/base +(require (for-syntax racket/base)) (provide only except prefix rename tag import export init-depend link diff --git a/collects/mzlib/private/unit-runtime.rkt b/collects/mzlib/private/unit-runtime.rkt index bab3e3699a..ddc971c7f9 100644 --- a/collects/mzlib/private/unit-runtime.rkt +++ b/collects/mzlib/private/unit-runtime.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax "unit-syntax.rkt" scheme/base)) +(require (for-syntax "unit-syntax.rkt" racket/base)) (provide define-syntax/err-param undefined (rename-out [make-a-unit make-unit]) unit-import-sigs unit-export-sigs unit-go unit? unit-deps check-unit check-no-imports check-sigs check-deps check-helper) diff --git a/collects/mzlib/private/unit-syntax.rkt b/collects/mzlib/private/unit-syntax.rkt index 07b6b4199c..a11f5ffc8a 100644 --- a/collects/mzlib/private/unit-syntax.rkt +++ b/collects/mzlib/private/unit-syntax.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require syntax/stx) (require (for-template "unit-keywords.rkt")) diff --git a/collects/mzlib/private/unit-utils.rkt b/collects/mzlib/private/unit-utils.rkt index a74c36cdc1..7d8f6eb497 100644 --- a/collects/mzlib/private/unit-utils.rkt +++ b/collects/mzlib/private/unit-utils.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base +(require (for-syntax racket/base syntax/boundmap "unit-compiletime.rkt" "unit-syntax.rkt") diff --git a/collects/mzlib/private/unitidmap.rkt b/collects/mzlib/private/unitidmap.rkt index 4eb59079a9..c9ab855ac5 100644 --- a/collects/mzlib/private/unitidmap.rkt +++ b/collects/mzlib/private/unitidmap.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base ;; Help Desk binding info: (define (binding binder bound stx) diff --git a/collects/mzlib/process.rkt b/collects/mzlib/process.rkt index b897927f97..693c01beec 100644 --- a/collects/mzlib/process.rkt +++ b/collects/mzlib/process.rkt @@ -8,8 +8,7 @@ system/exit-code system*/exit-code) -(require mzlib/port - "private/streams.rkt") +(require "private/streams.rkt") ;; Helpers: ---------------------------------------- diff --git a/collects/mzlib/restart.rkt b/collects/mzlib/restart.rkt index 002832292d..55f99dbf9c 100644 --- a/collects/mzlib/restart.rkt +++ b/collects/mzlib/restart.rkt @@ -1,6 +1,6 @@ (module restart scheme/base - (require "cmdline.rkt") + (require racket/cmdline) (provide restart-mzscheme) diff --git a/collects/mzlib/runtime-path.rkt b/collects/mzlib/runtime-path.rkt index 2c96054c32..9fb0753eb6 100644 --- a/collects/mzlib/runtime-path.rkt +++ b/collects/mzlib/runtime-path.rkt @@ -1,12 +1,9 @@ - -(module runtime-path scheme/base +(module runtime-path racket/base (require mzlib/etc - syntax/modcollapse setup/dirs - scheme/list - scheme/string + racket/list (only-in "private/runtime-path-table.rkt" table) - (for-syntax scheme/base)) + (for-syntax racket/base)) (provide define-runtime-path define-runtime-paths diff --git a/collects/mzlib/sendevent.rkt b/collects/mzlib/sendevent.rkt index 74dd8aeb28..c28c1690ee 100644 --- a/collects/mzlib/sendevent.rkt +++ b/collects/mzlib/sendevent.rkt @@ -1,5 +1,5 @@ -#lang scheme/base -(require scheme/gui/dynamic) +#lang racket/base +(require racket/gui/dynamic) (provide send-event) diff --git a/collects/mzlib/serialize.rkt b/collects/mzlib/serialize.rkt index e4550133a9..8513cb695e 100644 --- a/collects/mzlib/serialize.rkt +++ b/collects/mzlib/serialize.rkt @@ -1,9 +1,6 @@ (module serialize mzscheme (require-for-syntax syntax/struct) - (require syntax/modcollapse - mzlib/etc - mzlib/list - ;; core [de]serializer: + (require ;; core [de]serializer: racket/private/serialize) (provide define-serializable-struct diff --git a/collects/mzlib/shared.rkt b/collects/mzlib/shared.rkt index 995bc9fd95..f6af9d4aae 100644 --- a/collects/mzlib/shared.rkt +++ b/collects/mzlib/shared.rkt @@ -1,11 +1,9 @@ -#lang scheme/base - -(require (for-syntax scheme/base - syntax/stx +#lang racket/base +(require (for-syntax racket/base syntax/kerncase syntax/struct racket/struct-info - scheme/include)) + racket/include)) (provide shared) @@ -13,7 +11,7 @@ (#%variable-reference))) (define undefined (letrec ([x x]) x)) -(require (only-in scheme/base [cons the-cons])) +(require (only-in racket/base [cons the-cons])) (define-syntax shared (lambda (stx) diff --git a/collects/mzlib/string.rkt b/collects/mzlib/string.rkt index 6dfe7156e9..7a157189c8 100644 --- a/collects/mzlib/string.rkt +++ b/collects/mzlib/string.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide string-lowercase! string-uppercase! diff --git a/collects/mzlib/struct.rkt b/collects/mzlib/struct.rkt index a291c64d54..eb54208080 100644 --- a/collects/mzlib/struct.rkt +++ b/collects/mzlib/struct.rkt @@ -6,7 +6,7 @@ define-struct/properties make-->vector) (require-for-syntax syntax/struct - "list.rkt" + (only racket/base filter) syntax/stx) ;; ------------------------------------------------------------ diff --git a/collects/mzlib/stxparam.rkt b/collects/mzlib/stxparam.rkt index f4c98cfe4d..19f10315e8 100644 --- a/collects/mzlib/stxparam.rkt +++ b/collects/mzlib/stxparam.rkt @@ -1,9 +1,8 @@ - -(module stxparam scheme/base - (require scheme/stxparam) +(module stxparam racket/base + (require racket/stxparam) (provide define-syntax-parameter syntax-parameterize) - (require scheme/stxparam-exptime) + (require racket/stxparam-exptime) (provide syntax-parameter-value make-parameter-rename-transformer)) diff --git a/collects/mzlib/surrogate.rkt b/collects/mzlib/surrogate.rkt index fed7774f84..1f53f2fe85 100644 --- a/collects/mzlib/surrogate.rkt +++ b/collects/mzlib/surrogate.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base -(require scheme/surrogate) -(provide (all-from-out scheme/surrogate)) +(require racket/surrogate) +(provide (all-from-out racket/surrogate)) diff --git a/collects/mzlib/tar.rkt b/collects/mzlib/tar.rkt index c251ede0a4..70cd53168f 100644 --- a/collects/mzlib/tar.rkt +++ b/collects/mzlib/tar.rkt @@ -1,3 +1,3 @@ -#lang scheme/base +#lang racket/base (require file/tar) (provide (all-from-out file/tar)) diff --git a/collects/mzlib/traceld.rkt b/collects/mzlib/traceld.rkt index 4d929fa339..946d4311a2 100644 --- a/collects/mzlib/traceld.rkt +++ b/collects/mzlib/traceld.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (let ([load (current-load)] [load-extension (current-load-extension)] diff --git a/collects/mzlib/trait.rkt b/collects/mzlib/trait.rkt index 00881507ca..bfcc46e8fd 100644 --- a/collects/mzlib/trait.rkt +++ b/collects/mzlib/trait.rkt @@ -1,3 +1,3 @@ -(module trait scheme/base - (require scheme/trait) - (provide (all-from-out scheme/trait))) +(module trait racket/base + (require racket/trait) + (provide (all-from-out racket/trait))) diff --git a/collects/mzlib/unit-exptime.rkt b/collects/mzlib/unit-exptime.rkt index e192e56ad2..df22354598 100644 --- a/collects/mzlib/unit-exptime.rkt +++ b/collects/mzlib/unit-exptime.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "private/unit-syntax.rkt" "private/unit-compiletime.rkt") diff --git a/collects/mzlib/unit.rkt b/collects/mzlib/unit.rkt index 8f18c8fa1c..7561aa30d1 100644 --- a/collects/mzlib/unit.rkt +++ b/collects/mzlib/unit.rkt @@ -1,25 +1,23 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base - scheme/list +(require (for-syntax racket/base syntax/boundmap syntax/context syntax/kerncase syntax/name syntax/parse syntax/struct - scheme/struct-info + racket/struct-info syntax/stx syntax/location "private/unit-contract-syntax.rkt" "private/unit-compiletime.rkt" "private/unit-syntax.rkt")) - -(require mzlib/etc + +(require racket/block racket/contract/base racket/contract/region - racket/contract/combinator - scheme/stxparam + racket/stxparam syntax/location "private/unit-contract.rkt" "private/unit-keywords.rkt" @@ -1154,7 +1152,7 @@ (apply append (map do-one ids tmps))))] [else (list defn-or-expr)])) expanded-body))]) - #'(begin-with-definitions defn-or-expr ...)))))))) + #'(block defn-or-expr ...)))))))) (define-for-syntax (redirect-imports/exports import?) (lambda (table-stx diff --git a/collects/mzlib/unit200.rkt b/collects/mzlib/unit200.rkt index 9247f12a2a..d1dd8ec122 100644 --- a/collects/mzlib/unit200.rkt +++ b/collects/mzlib/unit200.rkt @@ -7,7 +7,7 @@ syntax/name syntax/context racket/syntax - "list.rkt" + (only racket/base filter) "private/unitidmap.rkt") ;; ---------------------------------------------------------------------- diff --git a/collects/mzlib/unitsig200.rkt b/collects/mzlib/unitsig200.rkt index 0c6256d275..1cd69d5c51 100644 --- a/collects/mzlib/unitsig200.rkt +++ b/collects/mzlib/unitsig200.rkt @@ -9,7 +9,6 @@ (require "private/sigmatch.rkt") (require-for-syntax "private/sigutil.rkt") - (require-for-syntax "private/sigmatch.rkt") (require-for-syntax syntax/kerncase) (define-struct signed-unit (unit imports exports)) diff --git a/collects/mzlib/zip.rkt b/collects/mzlib/zip.rkt index b404e6e6ac..50cec2ded3 100644 --- a/collects/mzlib/zip.rkt +++ b/collects/mzlib/zip.rkt @@ -1,7 +1,7 @@ ;; A modification of Dave Herman's zip module (module zip mzscheme - (require mzlib/deflate mzlib/file mzlib/kw) + (require mzlib/deflate racket/file mzlib/kw) ;; =========================================================================== ;; DATA DEFINITIONS diff --git a/collects/planet/private/linkage.rkt b/collects/planet/private/linkage.rkt index 1d0b179991..d03d781a3d 100644 --- a/collects/planet/private/linkage.rkt +++ b/collects/planet/private/linkage.rkt @@ -1,11 +1,4 @@ #lang racket/base - - -(require "planet-shared.rkt" - "../config.rkt" - racket/match - racket/file) - (provide get/linkage get-linkage add-linkage! @@ -58,6 +51,10 @@ ;; causes ugliness in add-linkage! where we have the actual package but have to break it down ;; so the arguments needed to reconstitute it can be stored. +(require "planet-shared.rkt" + "../config.rkt" + racket/match + racket/file) ; LINKAGE-TABLE ::= hash-table[LINKAGE-KEY -> PKG-LOCATION] (define LT #f) diff --git a/collects/planet/private/planet-shared.rkt b/collects/planet/private/planet-shared.rkt index ec274c508a..c6c279e4d7 100644 --- a/collects/planet/private/planet-shared.rkt +++ b/collects/planet/private/planet-shared.rkt @@ -5,7 +5,7 @@ Various common pieces of code that both the client and server need to access ========================================================================================== |# - (require (only-in mzlib/file path-only) + (require (only-in racket/path path-only) mzlib/port racket/file setup/getinfo diff --git a/collects/planet/private/version.rkt b/collects/planet/private/version.rkt index 8190c375df..82eb855da9 100644 --- a/collects/planet/private/version.rkt +++ b/collects/planet/private/version.rkt @@ -1,5 +1,7 @@ -#lang racket -(require (for-syntax syntax/parse) +#lang racket/base +(require (for-syntax racket/base syntax/parse) + racket/path + racket/match unstable/syntax racket/syntax mzlib/etc diff --git a/collects/planet/scribble.rkt b/collects/planet/scribble.rkt index 61a4e16d34..f858ee6e92 100644 --- a/collects/planet/scribble.rkt +++ b/collects/planet/scribble.rkt @@ -18,18 +18,16 @@ (require scribble/manual - planet/util planet/version (for-label racket/base) (for-syntax racket/base - racket/block syntax/parse planet/syntax)) (define-syntax-rule (define-syntaxes-with [name ...] body ...) - (define-syntaxes [name ...] (block body ... (values name ...)))) + (define-syntaxes [name ...] (let () body ... (values name ...)))) (define-syntaxes-with [ racketmod/this-package diff --git a/collects/planet/util.rkt b/collects/planet/util.rkt index c5d0c4be86..b6066bcf95 100644 --- a/collects/planet/util.rkt +++ b/collects/planet/util.rkt @@ -12,11 +12,10 @@ net/url xml/xml - mzlib/file - mzlib/list - mzlib/etc + racket/file + racket/list - racket/contract + racket/contract/base racket/port racket/path racket/class @@ -27,9 +26,7 @@ setup/getinfo setup/unpack - racket/syntax - unstable/syntax - (for-syntax racket/base syntax/parse) + (for-syntax racket/base) (prefix-in srfi1: srfi/1) ) diff --git a/collects/racket/async-channel.rkt b/collects/racket/async-channel.rkt index 2abae652e2..1108834eb4 100644 --- a/collects/racket/async-channel.rkt +++ b/collects/racket/async-channel.rkt @@ -1,6 +1,6 @@ -#lang scheme/base +#lang racket/base -(require scheme/contract) +(require racket/contract/base) ;; This library implements buffered channels with ;; and optional buffer limit (so that puts block diff --git a/collects/racket/block.rkt b/collects/racket/block.rkt index efe9b3f087..d5c65cf494 100644 --- a/collects/racket/block.rkt +++ b/collects/racket/block.rkt @@ -1,15 +1,10 @@ (module block '#%kernel (#%require "private/define.rkt" - "private/small-scheme.rkt" - "private/more-scheme.rkt" (for-syntax '#%kernel "private/stx.rkt" "private/small-scheme.rkt" "private/stxcase-scheme.rkt" - "private/name.rkt" - "private/norm-define.rkt" - "private/qqstx.rkt" - "private/sort.rkt")) + "private/qqstx.rkt")) (#%provide block) diff --git a/collects/racket/contract/base.rkt b/collects/racket/contract/base.rkt index 88f37f1633..b30d48741c 100644 --- a/collects/racket/contract/base.rkt +++ b/collects/racket/contract/base.rkt @@ -10,7 +10,6 @@ "private/misc.rkt" "private/provide.rkt" "private/guts.rkt" - "private/prop.rkt" "private/opters.rkt" ;; required for effect to install the opters "private/opt.rkt" "private/out.rkt") diff --git a/collects/racket/contract/private/arr-i-parse.rkt b/collects/racket/contract/private/arr-i-parse.rkt index b17139c8f9..f7d25a5b1f 100644 --- a/collects/racket/contract/private/arr-i-parse.rkt +++ b/collects/racket/contract/private/arr-i-parse.rkt @@ -7,9 +7,7 @@ [module-identifier-mapping-get free-identifier-mapping-get] [module-identifier-mapping-put! free-identifier-mapping-put!]) (for-template racket/base - "misc.rkt" - "prop.rkt" - "guts.rkt")) + "misc.rkt")) #| diff --git a/collects/racket/contract/private/basic-opters.rkt b/collects/racket/contract/private/basic-opters.rkt index 9779636bee..182c0b5300 100644 --- a/collects/racket/contract/private/basic-opters.rkt +++ b/collects/racket/contract/private/basic-opters.rkt @@ -3,7 +3,6 @@ (require "guts.rkt" "blame.rkt" "opt.rkt" - "base.rkt" "misc.rkt") (require (for-syntax racket/base "opt-guts.rkt")) diff --git a/collects/racket/contract/private/exists.rkt b/collects/racket/contract/private/exists.rkt index 91751124cb..ec41cc5e1d 100644 --- a/collects/racket/contract/private/exists.rkt +++ b/collects/racket/contract/private/exists.rkt @@ -1,7 +1,6 @@ #lang racket/base -(require "guts.rkt" - "prop.rkt" +(require "prop.rkt" "blame.rkt") (provide new-∃/c diff --git a/collects/racket/contract/private/guts.rkt b/collects/racket/contract/private/guts.rkt index 6b9c354d29..39e6178986 100644 --- a/collects/racket/contract/private/guts.rkt +++ b/collects/racket/contract/private/guts.rkt @@ -1,12 +1,8 @@ #lang racket/base -(require "helpers.rkt" - "blame.rkt" - "prop.rkt" - racket/pretty) +(require "prop.rkt") -(require (for-syntax racket/base - "helpers.rkt")) +(require (for-syntax racket/base)) (provide coerce-contract coerce-contracts diff --git a/collects/racket/contract/private/legacy.rkt b/collects/racket/contract/private/legacy.rkt index 211bbb7e3e..3fbb6ab25e 100644 --- a/collects/racket/contract/private/legacy.rkt +++ b/collects/racket/contract/private/legacy.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require "guts.rkt" "blame.rkt" "prop.rkt" "misc.rkt" syntax/srcloc) +(require "blame.rkt" "prop.rkt" "misc.rkt" syntax/srcloc) (provide make-proj-contract raise-contract-error diff --git a/collects/racket/contract/private/misc.rkt b/collects/racket/contract/private/misc.rkt index ed3721807e..1f19f2aae3 100644 --- a/collects/racket/contract/private/misc.rkt +++ b/collects/racket/contract/private/misc.rkt @@ -1,7 +1,6 @@ #lang racket/base -(require (for-syntax racket/base - "helpers.rkt") +(require (for-syntax racket/base) racket/promise "prop.rkt" "blame.rkt" diff --git a/collects/racket/contract/private/opt.rkt b/collects/racket/contract/private/opt.rkt index bd8df429a8..5463b58264 100644 --- a/collects/racket/contract/private/opt.rkt +++ b/collects/racket/contract/private/opt.rkt @@ -1,7 +1,5 @@ #lang racket/base -(require "guts.rkt" - "prop.rkt" - "blame.rkt" +(require "prop.rkt" "misc.rkt" racket/stxparam) (require (for-syntax racket/base) diff --git a/collects/racket/contract/private/parametric.rkt b/collects/racket/contract/private/parametric.rkt index 5a490a7b10..a0a67fae54 100644 --- a/collects/racket/contract/private/parametric.rkt +++ b/collects/racket/contract/private/parametric.rkt @@ -1,6 +1,5 @@ #lang racket/base -(require "guts.rkt" - "prop.rkt" +(require "prop.rkt" "blame.rkt" "misc.rkt" (for-syntax racket/base)) diff --git a/collects/racket/contract/region.rkt b/collects/racket/contract/region.rkt index 95a059b595..15532dfbdb 100644 --- a/collects/racket/contract/region.rkt +++ b/collects/racket/contract/region.rkt @@ -6,7 +6,6 @@ current-contract-region) (require (for-syntax racket/base - racket/list racket/struct-info syntax/define syntax/kerncase diff --git a/collects/racket/dict.rkt b/collects/racket/dict.rkt index 4179805a45..01a3cbebdf 100644 --- a/collects/racket/dict.rkt +++ b/collects/racket/dict.rkt @@ -1,6 +1,5 @@ #lang racket/base -(require (for-syntax racket/base) - racket/contract/base +(require racket/contract/base unstable/prop-contract "private/dict.rkt") diff --git a/collects/racket/draw/private/brush.rkt b/collects/racket/draw/private/brush.rkt index aec314e906..09c2ea0a94 100644 --- a/collects/racket/draw/private/brush.rkt +++ b/collects/racket/draw/private/brush.rkt @@ -6,8 +6,7 @@ "local.rkt" "bitmap.rkt" "gradient.rkt" - "transform.rkt" - "dc-intf.rkt") + "transform.rkt") (provide brush% brush-list% the-brush-list diff --git a/collects/racket/draw/private/dc-intf.rkt b/collects/racket/draw/private/dc-intf.rkt index d2583b85cb..b5d7f4fd8f 100644 --- a/collects/racket/draw/private/dc-intf.rkt +++ b/collects/racket/draw/private/dc-intf.rkt @@ -1,6 +1,5 @@ #lang scheme/base -(require scheme/class - "font.rkt") +(require scheme/class) (provide dc<%>) diff --git a/collects/racket/draw/private/dc.rkt b/collects/racket/draw/private/dc.rkt index 6c2ba7c1da..3dd8c4e287 100644 --- a/collects/racket/draw/private/dc.rkt +++ b/collects/racket/draw/private/dc.rkt @@ -7,7 +7,6 @@ ffi/unsafe/atomic racket/math racket/class - "hold.rkt" "local.rkt" "../unsafe/cairo.rkt" "../unsafe/pango.rkt" @@ -22,8 +21,7 @@ "dc-path.rkt" "point.rkt" "transform.rkt" - "local.rkt" - "../unsafe/bstr.rkt") + "local.rkt") (provide dc-mixin dc-backend<%> diff --git a/collects/racket/draw/private/font.rkt b/collects/racket/draw/private/font.rkt index 737358252d..547a467633 100644 --- a/collects/racket/draw/private/font.rkt +++ b/collects/racket/draw/private/font.rkt @@ -1,6 +1,5 @@ #lang scheme/base (require scheme/class - ffi/unsafe ffi/unsafe/atomic "syntax.rkt" "../unsafe/pango.rkt" diff --git a/collects/racket/draw/private/post-script-dc.rkt b/collects/racket/draw/private/post-script-dc.rkt index d1e53b3316..7a70506a78 100644 --- a/collects/racket/draw/private/post-script-dc.rkt +++ b/collects/racket/draw/private/post-script-dc.rkt @@ -5,10 +5,8 @@ racket/math "syntax.rkt" racket/gui/dynamic - ffi/unsafe "../unsafe/cairo.rkt" "dc.rkt" - "font.rkt" "local.rkt" "ps-setup.rkt" "page-dc.rkt" diff --git a/collects/racket/draw/private/record-dc.rkt b/collects/racket/draw/private/record-dc.rkt index 8ab577778d..4e2f1dbbee 100644 --- a/collects/racket/draw/private/record-dc.rkt +++ b/collects/racket/draw/private/record-dc.rkt @@ -1,6 +1,5 @@ #lang racket/base -(require "syntax.rkt" - racket/class +(require racket/class ffi/unsafe/atomic "dc.rkt" "bitmap.rkt" @@ -10,8 +9,7 @@ "pen.rkt" "brush.rkt" "region.rkt" - "dc-path.rkt" - "local.rkt") + "dc-path.rkt") (provide record-dc-mixin get-recorded-command diff --git a/collects/racket/draw/private/svg-dc.rkt b/collects/racket/draw/private/svg-dc.rkt index 33b96564c8..6b2879b184 100644 --- a/collects/racket/draw/private/svg-dc.rkt +++ b/collects/racket/draw/private/svg-dc.rkt @@ -1,15 +1,9 @@ #lang racket/base (require racket/class - racket/file - racket/path - racket/math "syntax.rkt" - ffi/unsafe "../unsafe/cairo.rkt" "dc.rkt" - "font.rkt" "local.rkt" - "ps-setup.rkt" "page-dc.rkt" "write-bytes.rkt") diff --git a/collects/racket/draw/private/write-bytes.rkt b/collects/racket/draw/private/write-bytes.rkt index 856668f4a1..680b35888f 100644 --- a/collects/racket/draw/private/write-bytes.rkt +++ b/collects/racket/draw/private/write-bytes.rkt @@ -1,7 +1,5 @@ #lang racket/base -(require ffi/unsafe - ffi/unsafe/alloc - "../unsafe/cairo.rkt" +(require "../unsafe/cairo.rkt" "../unsafe/bstr.rkt") (provide make-port-writer diff --git a/collects/racket/draw/unsafe/cairo.rkt b/collects/racket/draw/unsafe/cairo.rkt index 65abc36c78..9b8302581c 100644 --- a/collects/racket/draw/unsafe/cairo.rkt +++ b/collects/racket/draw/unsafe/cairo.rkt @@ -2,7 +2,6 @@ (require ffi/unsafe ffi/unsafe/define ffi/unsafe/alloc - setup/dirs "../private/libs.rkt" "../private/utils.rkt") diff --git a/collects/racket/draw/unsafe/jpeg.rkt b/collects/racket/draw/unsafe/jpeg.rkt index 77606d8219..95ba285f23 100644 --- a/collects/racket/draw/unsafe/jpeg.rkt +++ b/collects/racket/draw/unsafe/jpeg.rkt @@ -2,8 +2,6 @@ (require ffi/unsafe ffi/unsafe/define ffi/unsafe/alloc - ffi/unsafe/atomic - setup/dirs "bstr.rkt" "../private/utils.rkt" "../private/libs.rkt") diff --git a/collects/racket/draw/unsafe/pango.rkt b/collects/racket/draw/unsafe/pango.rkt index 09b0f157f0..83870701b5 100644 --- a/collects/racket/draw/unsafe/pango.rkt +++ b/collects/racket/draw/unsafe/pango.rkt @@ -2,8 +2,6 @@ (require ffi/unsafe ffi/unsafe/define ffi/unsafe/alloc - ffi/unsafe/atomic - setup/dirs "glib.rkt" "cairo.rkt" "../private/utils.rkt" diff --git a/collects/racket/draw/unsafe/png.rkt b/collects/racket/draw/unsafe/png.rkt index 0740ed261e..6ce9b8b51d 100644 --- a/collects/racket/draw/unsafe/png.rkt +++ b/collects/racket/draw/unsafe/png.rkt @@ -2,8 +2,6 @@ (require ffi/unsafe ffi/unsafe/define ffi/unsafe/alloc - ffi/unsafe/atomic - setup/dirs "bstr.rkt" "../private/utils.rkt" "../private/libs.rkt") diff --git a/collects/racket/generator.rkt b/collects/racket/generator.rkt index 4d04d0f885..13a5e458c6 100644 --- a/collects/racket/generator.rkt +++ b/collects/racket/generator.rkt @@ -1,13 +1,14 @@ #lang racket/base (require (for-syntax racket/base) - racket/control - racket/stxparam racket/splicing) + racket/control) (provide yield generator generator-state in-generator infinite-generator sequence->generator sequence->repeated-generator generator?) +;; (require racket/stxparam racket/splicing) + ;; (define-syntax-parameter yield ;; (lambda (stx) ;; (raise-syntax-error diff --git a/collects/racket/include.rkt b/collects/racket/include.rkt index 78c6022f20..9f0aabfe79 100644 --- a/collects/racket/include.rkt +++ b/collects/racket/include.rkt @@ -1,7 +1,6 @@ #lang racket/base (require (for-syntax racket/base - syntax/stx syntax/path-spec mzlib/private/increader compiler/cm-accomplice)) diff --git a/collects/racket/match/compiler.rkt b/collects/racket/match/compiler.rkt index 0d73a9a461..0c54406f20 100644 --- a/collects/racket/match/compiler.rkt +++ b/collects/racket/match/compiler.rkt @@ -6,7 +6,6 @@ "patterns.rkt" "split-rows.rkt" "reorder.rkt" - scheme/struct-info scheme/stxparam scheme/nest racket/syntax) diff --git a/collects/racket/match/define-forms.rkt b/collects/racket/match/define-forms.rkt index ff116d5134..7a0f3126bf 100644 --- a/collects/racket/match/define-forms.rkt +++ b/collects/racket/match/define-forms.rkt @@ -5,8 +5,6 @@ (only-in racket/list append* remove-duplicates) unstable/sequence syntax/parse - "parse.rkt" - "parse-helper.rkt" "patterns.rkt" "gen-match.rkt")) diff --git a/collects/racket/match/legacy-match.rkt b/collects/racket/match/legacy-match.rkt index e607fbd2b8..77f8bc4506 100644 --- a/collects/racket/match/legacy-match.rkt +++ b/collects/racket/match/legacy-match.rkt @@ -7,7 +7,6 @@ define-match-expander) "define-forms.rkt" (for-syntax "parse-legacy.rkt" - "gen-match.rkt" (only-in "patterns.rkt" match-...-nesting))) (provide (for-syntax match-...-nesting) diff --git a/collects/racket/match/match.rkt b/collects/racket/match/match.rkt index 345b66ea5c..aa9033396c 100644 --- a/collects/racket/match/match.rkt +++ b/collects/racket/match/match.rkt @@ -8,7 +8,6 @@ "define-forms.rkt" "struct.rkt" (for-syntax "parse.rkt" - "gen-match.rkt" (only-in "patterns.rkt" match-...-nesting))) (provide (for-syntax match-...-nesting) diff --git a/collects/racket/match/parse-helper.rkt b/collects/racket/match/parse-helper.rkt index 43fd58a606..200c669688 100644 --- a/collects/racket/match/parse-helper.rkt +++ b/collects/racket/match/parse-helper.rkt @@ -2,11 +2,9 @@ (require (for-template scheme/base) syntax/boundmap - syntax/stx scheme/struct-info ;macro-debugger/emit - "patterns.rkt" - "compiler.rkt") + "patterns.rkt") (provide ddk? parse-literal all-vars pattern-var? match:syntax-err match-expander-transform trans-match parse-struct diff --git a/collects/racket/match/parse-legacy.rkt b/collects/racket/match/parse-legacy.rkt index 6c5d15f68d..4697acba61 100644 --- a/collects/racket/match/parse-legacy.rkt +++ b/collects/racket/match/parse-legacy.rkt @@ -1,11 +1,7 @@ #lang racket/base (require (for-template racket/base) - syntax/boundmap - syntax/stx - racket/struct-info "patterns.rkt" - "compiler.rkt" "parse-helper.rkt" "parse-quasi.rkt") diff --git a/collects/racket/match/parse-quasi.rkt b/collects/racket/match/parse-quasi.rkt index e258996f28..4b41dd8d23 100644 --- a/collects/racket/match/parse-quasi.rkt +++ b/collects/racket/match/parse-quasi.rkt @@ -1,11 +1,7 @@ #lang scheme/base (require (for-template scheme/base) - syntax/boundmap - syntax/stx - scheme/struct-info "patterns.rkt" - "compiler.rkt" "parse-helper.rkt") (provide parse-quasi) diff --git a/collects/racket/match/parse.rkt b/collects/racket/match/parse.rkt index 9ef5d717d7..585aebec90 100644 --- a/collects/racket/match/parse.rkt +++ b/collects/racket/match/parse.rkt @@ -1,10 +1,7 @@ #lang scheme/base -(require syntax/boundmap - syntax/stx - scheme/struct-info +(require scheme/struct-info "patterns.rkt" - "compiler.rkt" "parse-helper.rkt" "parse-quasi.rkt" (for-template (only-in "runtime.rkt" matchable?) diff --git a/collects/racket/match/reorder.rkt b/collects/racket/match/reorder.rkt index e68ec051c4..9f94f9a3a3 100644 --- a/collects/racket/match/reorder.rkt +++ b/collects/racket/match/reorder.rkt @@ -1,7 +1,6 @@ #lang scheme/base (require "patterns.rkt" - scheme/list (for-syntax scheme/base)) (provide reorder-columns) diff --git a/collects/racket/private/class-internal.rkt b/collects/racket/private/class-internal.rkt index 1d37bf8598..da2e6bc26a 100644 --- a/collects/racket/private/class-internal.rkt +++ b/collects/racket/private/class-internal.rkt @@ -5,17 +5,14 @@ racket/contract/base racket/contract/combinator (only-in racket/contract/private/arrow making-a-method) - racket/list racket/stxparam racket/unsafe/ops "class-events.rkt" "serialize-structs.rkt" - "define-struct.rkt" (for-syntax racket/stxparam syntax/kerncase syntax/stx syntax/name - syntax/context syntax/define syntax/flatten-begin syntax/private/boundmap diff --git a/collects/racket/private/classidmap.rkt b/collects/racket/private/classidmap.rkt index 90d2a3e647..87edbbf269 100644 --- a/collects/racket/private/classidmap.rkt +++ b/collects/racket/private/classidmap.rkt @@ -2,8 +2,7 @@ (require syntax/stx (for-syntax scheme/base) - (for-template scheme/base "class-events.rkt") - "define-struct.rkt") + (for-template scheme/base "class-events.rkt")) (define insp (variable-reference->module-declaration-inspector (#%variable-reference))) diff --git a/collects/racket/private/define-struct.rkt b/collects/racket/private/define-struct.rkt index 03559b5ece..bb6aa87c0a 100644 --- a/collects/racket/private/define-struct.rkt +++ b/collects/racket/private/define-struct.rkt @@ -2,7 +2,7 @@ ;; (planet "struct.ss" ("ryanc" "macros.plt" 1 0))) (module define-struct '#%kernel - (#%require "more-scheme.rkt" "small-scheme.rkt" "define.rkt" "../stxparam.rkt" + (#%require "small-scheme.rkt" "define.rkt" "../stxparam.rkt" (for-syntax '#%kernel "define.rkt" "stx.rkt" "stxcase-scheme.rkt" "small-scheme.rkt" "stxloc.rkt" "qqstx.rkt" diff --git a/collects/racket/private/letstx-scheme.rkt b/collects/racket/private/letstx-scheme.rkt index 5be2e7ab88..35b58e0340 100644 --- a/collects/racket/private/letstx-scheme.rkt +++ b/collects/racket/private/letstx-scheme.rkt @@ -3,8 +3,8 @@ ;; #%stxcase-scheme: adds let-syntax, letrec-syntax, etc. (module letstx-scheme '#%kernel - (#%require "small-scheme.rkt" "stx.rkt" "stxcase.rkt" "with-stx.rkt" "stxloc.rkt" - (for-syntax '#%kernel "small-scheme.rkt" "stx.rkt" "stxcase.rkt" + (#%require "small-scheme.rkt" + (for-syntax '#%kernel "stxcase.rkt" "with-stx.rkt" "stxloc.rkt")) (-define-syntax letrec-syntaxes diff --git a/collects/racket/private/local.rkt b/collects/racket/private/local.rkt index c59cd70e00..f4852b94ba 100644 --- a/collects/racket/private/local.rkt +++ b/collects/racket/private/local.rkt @@ -1,6 +1,5 @@ #lang racket/base (require (for-syntax racket/base) - (for-syntax syntax/context) (for-syntax syntax/kerncase)) (provide (for-syntax do-local)) diff --git a/collects/racket/private/map.rkt b/collects/racket/private/map.rkt index 2b163614a7..dd9d1a28d7 100644 --- a/collects/racket/private/map.rkt +++ b/collects/racket/private/map.rkt @@ -4,7 +4,7 @@ (module map '#%kernel (#%require '#%utils ; built into mzscheme - "more-scheme.rkt" "small-scheme.rkt" "define.rkt") + "small-scheme.rkt" "define.rkt") (#%provide (rename map2 map) (rename for-each2 for-each) diff --git a/collects/racket/private/misc.rkt b/collects/racket/private/misc.rkt index aa07c8a34f..c730f54125 100644 --- a/collects/racket/private/misc.rkt +++ b/collects/racket/private/misc.rkt @@ -4,7 +4,7 @@ (module misc '#%kernel (#%require '#%utils ; built into racket - "more-scheme.rkt" "small-scheme.rkt" "define.rkt" + "small-scheme.rkt" "define.rkt" (for-syntax '#%kernel "stx.rkt" "stxcase-scheme.rkt" "stxcase.rkt")) ;; ------------------------------------------------------------------------- diff --git a/collects/racket/private/old-procs.rkt b/collects/racket/private/old-procs.rkt index 632acb6bbb..e18572fc78 100644 --- a/collects/racket/private/old-procs.rkt +++ b/collects/racket/private/old-procs.rkt @@ -2,8 +2,6 @@ (module old-procs '#%kernel (#%require "small-scheme.rkt" "more-scheme.rkt" - "misc.rkt" - "stxmz-body.rkt" "define.rkt") (#%provide make-namespace diff --git a/collects/racket/private/reqprov.rkt b/collects/racket/private/reqprov.rkt index 5891f9a715..4c059dac2a 100644 --- a/collects/racket/private/reqprov.rkt +++ b/collects/racket/private/reqprov.rkt @@ -1,6 +1,6 @@ (module reqprov '#%kernel - (#%require "more-scheme.rkt" "small-scheme.rkt" "define.rkt" "../stxparam.rkt" - (for-syntax '#%kernel "define.rkt" + (#%require "define.rkt" + (for-syntax '#%kernel "stx.rkt" "stxcase-scheme.rkt" "small-scheme.rkt" "stxloc.rkt" "qqstx.rkt" "../require-transform.rkt" diff --git a/collects/racket/private/struct.rkt b/collects/racket/private/struct.rkt index 77e2fc07bc..390711e943 100644 --- a/collects/racket/private/struct.rkt +++ b/collects/racket/private/struct.rkt @@ -1,11 +1,10 @@ (module struct '#%kernel - (#%require "more-scheme.rkt" "small-scheme.rkt" "define.rkt" "../stxparam.rkt" + (#%require "define.rkt" "define-struct.rkt" (for-syntax '#%kernel "define.rkt" "stx.rkt" "stxcase-scheme.rkt" "small-scheme.rkt" - "stxloc.rkt" "qqstx.rkt" - "struct-info.rkt")) + "stxloc.rkt")) (#%provide struct) diff --git a/collects/racket/private/stxmz-body.rkt b/collects/racket/private/stxmz-body.rkt index e1c3ecf61e..39ccc18992 100644 --- a/collects/racket/private/stxmz-body.rkt +++ b/collects/racket/private/stxmz-body.rkt @@ -2,7 +2,7 @@ ;; mzscheme's `#%module-begin' (module stxmz-body '#%kernel - (#%require "stxcase-scheme.rkt" "define.rkt" + (#%require "define.rkt" (for-syntax '#%kernel "stx.rkt")) ;; So that expansions print the way the Racket programmer expects: diff --git a/collects/racket/private/stxparam.rkt b/collects/racket/private/stxparam.rkt index 9a8a372332..c7124cf9ed 100644 --- a/collects/racket/private/stxparam.rkt +++ b/collects/racket/private/stxparam.rkt @@ -1,10 +1,7 @@ (module stxparam '#%kernel - (#%require "more-scheme.rkt" - "letstx-scheme.rkt" - "define.rkt" + (#%require "define.rkt" (for-syntax '#%kernel - "../stxparam-exptime.rkt" "stx.rkt" "stxcase-scheme.rkt" "small-scheme.rkt" "stxloc.rkt" "stxparamkey.rkt")) diff --git a/collects/racket/private/stxparamkey.rkt b/collects/racket/private/stxparamkey.rkt index a73e33e8be..67f58f2c3b 100644 --- a/collects/racket/private/stxparamkey.rkt +++ b/collects/racket/private/stxparamkey.rkt @@ -1,6 +1,6 @@ (module stxparamkey '#%kernel - (#%require "more-scheme.rkt" "small-scheme.rkt" "define.rkt" + (#%require "small-scheme.rkt" "define.rkt" "stxcase.rkt" "stxloc.rkt" "with-stx.rkt") (-define-struct wrapped-renamer (renamer)) diff --git a/collects/racket/private/with-stx.rkt b/collects/racket/private/with-stx.rkt index cb65708160..ff29e192cc 100644 --- a/collects/racket/private/with-stx.rkt +++ b/collects/racket/private/with-stx.rkt @@ -2,7 +2,7 @@ ;; with-syntax, generate-temporaries (module with-stx '#%kernel - (#%require "stx.rkt" "stxloc.rkt" "small-scheme.rkt" "stxcase.rkt" + (#%require "stx.rkt" "small-scheme.rkt" "stxcase.rkt" (for-syntax '#%kernel "stx.rkt" "stxcase.rkt" "stxloc.rkt" "sc.rkt" "qq-and-or.rkt" "cond.rkt")) diff --git a/collects/racket/provide-transform.rkt b/collects/racket/provide-transform.rkt index 0f639aab07..fcef14e43d 100644 --- a/collects/racket/provide-transform.rkt +++ b/collects/racket/provide-transform.rkt @@ -1,9 +1,7 @@ (module provide-transform '#%kernel (#%require "private/stxcase-scheme.rkt" - "private/qqstx.rkt" "private/stx.rkt" "private/define-struct.rkt" - "private/more-scheme.rkt" "private/small-scheme.rkt" "private/define.rkt") diff --git a/collects/racket/require-transform.rkt b/collects/racket/require-transform.rkt index df5a5605d2..ca06e57ada 100644 --- a/collects/racket/require-transform.rkt +++ b/collects/racket/require-transform.rkt @@ -1,13 +1,11 @@ (module require-transform '#%kernel (#%require "private/stxcase-scheme.rkt" - "private/qqstx.rkt" "private/stx.rkt" "private/define-struct.rkt" - "private/more-scheme.rkt" "private/small-scheme.rkt" "private/define.rkt" (for-template (only '#%kernel quote)) - (for-syntax '#%kernel "private/stxcase-scheme.rkt")) + (for-syntax '#%kernel)) (#%provide expand-import syntax-local-require-certifier diff --git a/collects/racket/set.rkt b/collects/racket/set.rkt index 1e6dbd18c1..91353b8c88 100644 --- a/collects/racket/set.rkt +++ b/collects/racket/set.rkt @@ -2,7 +2,8 @@ (require (for-syntax racket/base) racket/serialize racket/pretty - racket/contract) + racket/contract/base + racket/contract/combinator) (provide set seteq seteqv set? set-eq? set-eqv? set-equal? diff --git a/collects/racket/splicing.rkt b/collects/racket/splicing.rkt index f9d2d0ee0a..90a5ff827b 100644 --- a/collects/racket/splicing.rkt +++ b/collects/racket/splicing.rkt @@ -2,7 +2,6 @@ (require (for-syntax scheme/base syntax/kerncase racket/syntax) - "stxparam.rkt" "private/stxparam.rkt" "private/local.rkt") diff --git a/collects/racket/stxparam-exptime.rkt b/collects/racket/stxparam-exptime.rkt index 5f66fcc5ca..5131a7884c 100644 --- a/collects/racket/stxparam-exptime.rkt +++ b/collects/racket/stxparam-exptime.rkt @@ -1,8 +1,8 @@ (module stxparam-exptime '#%kernel - (#%require "private/stx.rkt" "private/stxcase-scheme.rkt" + (#%require "private/stxcase-scheme.rkt" "private/small-scheme.rkt" - "private/stxloc.rkt" "private/stxparamkey.rkt") + "private/stxparamkey.rkt") (#%provide syntax-parameter-value make-parameter-rename-transformer) diff --git a/collects/racket/stxparam.rkt b/collects/racket/stxparam.rkt index 5bca563382..4ea659e950 100644 --- a/collects/racket/stxparam.rkt +++ b/collects/racket/stxparam.rkt @@ -1,12 +1,11 @@ (module stxparam '#%kernel - (#%require "private/more-scheme.rkt" - "private/letstx-scheme.rkt" + (#%require "private/letstx-scheme.rkt" "private/define.rkt" "private/stxparam.rkt" (for-syntax '#%kernel "stxparam-exptime.rkt" - "private/stx.rkt" "private/stxcase-scheme.rkt" + "private/stxcase-scheme.rkt" "private/small-scheme.rkt" "private/stxloc.rkt" "private/stxparamkey.rkt")) diff --git a/collects/racket/unit.rkt b/collects/racket/unit.rkt index b7da3f2478..586e2b064d 100644 --- a/collects/racket/unit.rkt +++ b/collects/racket/unit.rkt @@ -1,9 +1,6 @@ (module unit racket/base - (require mzlib/unit - racket/contract/base - (for-syntax racket/base - syntax/struct)) + (require mzlib/unit) (provide (except-out (all-from-out mzlib/unit) struct struct/ctc struct~r struct~r/ctc diff --git a/collects/rackunit/gui.rkt b/collects/rackunit/gui.rkt index 6e7434a6a4..73465c8dd6 100644 --- a/collects/rackunit/gui.rkt +++ b/collects/rackunit/gui.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract +(require racket/contract/base racket/gui/base "private/base.rkt" "private/gui/gui.rkt") diff --git a/collects/rackunit/private/base.rkt b/collects/rackunit/private/base.rkt index 4570be0b7f..b1b315df5a 100644 --- a/collects/rackunit/private/base.rkt +++ b/collects/rackunit/private/base.rkt @@ -1,6 +1,5 @@ #lang racket/base - -(require racket/contract) +(require racket/contract/base) ;; struct test : (define-struct test ()) diff --git a/collects/rackunit/private/check-info.rkt b/collects/rackunit/private/check-info.rkt index 5b9a741eac..563ed0b7cf 100644 --- a/collects/rackunit/private/check-info.rkt +++ b/collects/rackunit/private/check-info.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract +(require racket/contract/base "location.rkt" (for-syntax racket/base racket/syntax)) diff --git a/collects/rackunit/private/format.rkt b/collects/rackunit/private/format.rkt index 958f79943a..e254f19c9f 100644 --- a/collects/rackunit/private/format.rkt +++ b/collects/rackunit/private/format.rkt @@ -1,5 +1,4 @@ #lang racket/base - (require racket/match srfi/13 "base.rkt" diff --git a/collects/rackunit/private/gui/cache-box.rkt b/collects/rackunit/private/gui/cache-box.rkt index f3fce40a91..9d141db3c3 100644 --- a/collects/rackunit/private/gui/cache-box.rkt +++ b/collects/rackunit/private/gui/cache-box.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract) +(require racket/contract/base) ;; Add a new kind of promise instead? diff --git a/collects/rackunit/private/gui/config.rkt b/collects/rackunit/private/gui/config.rkt index 74d22b4bdc..dbfee0fdf4 100644 --- a/collects/rackunit/private/gui/config.rkt +++ b/collects/rackunit/private/gui/config.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require framework +(require framework/preferences unstable/gui/prefs) (provide (all-defined-out)) diff --git a/collects/rackunit/private/gui/controller.rkt b/collects/rackunit/private/gui/controller.rkt index 97e76bc123..cb9e65e872 100644 --- a/collects/rackunit/private/gui/controller.rkt +++ b/collects/rackunit/private/gui/controller.rkt @@ -4,8 +4,7 @@ unstable/gui/notify "../base.rkt" "interfaces.rkt" - "model.rkt" - "view.rkt") + "model.rkt") (provide controller%) (define controller% diff --git a/collects/rackunit/private/gui/drracket-ui.rkt b/collects/rackunit/private/gui/drracket-ui.rkt index d6dd57b4d2..20196e72c1 100644 --- a/collects/rackunit/private/gui/drracket-ui.rkt +++ b/collects/rackunit/private/gui/drracket-ui.rkt @@ -1,7 +1,5 @@ #lang racket/base -(require racket/list - racket/string - mzlib/etc +(require mzlib/etc "drracket-link.rkt") ;; Procedures which *may* be overridden by DrRacket to do useful things. diff --git a/collects/rackunit/private/gui/gui.rkt b/collects/rackunit/private/gui/gui.rkt index 0df37bb0b4..fa5dda472f 100644 --- a/collects/rackunit/private/gui/gui.rkt +++ b/collects/rackunit/private/gui/gui.rkt @@ -1,7 +1,6 @@ #lang racket/base (require racket/class unstable/class-iop - racket/gui/base "../base.rkt" "../result.rkt" "../check-info.rkt" diff --git a/collects/rackunit/private/gui/interfaces.rkt b/collects/rackunit/private/gui/interfaces.rkt index adcff8f9d5..6805fd8cd8 100644 --- a/collects/rackunit/private/gui/interfaces.rkt +++ b/collects/rackunit/private/gui/interfaces.rkt @@ -1,6 +1,5 @@ #lang racket/base -(require racket/class - unstable/class-iop) +(require unstable/class-iop) (provide (all-defined-out)) ;; controller diff --git a/collects/rackunit/private/gui/model.rkt b/collects/rackunit/private/gui/model.rkt index 74e25ccb48..985ca1e9ff 100644 --- a/collects/rackunit/private/gui/model.rkt +++ b/collects/rackunit/private/gui/model.rkt @@ -1,7 +1,6 @@ #lang racket/base (require racket/class unstable/class-iop - racket/list data/gvector "../base.rkt" "interfaces.rkt" diff --git a/collects/rackunit/private/gui/model2rml.rkt b/collects/rackunit/private/gui/model2rml.rkt index f874cf3f7e..eee29a5319 100644 --- a/collects/rackunit/private/gui/model2rml.rkt +++ b/collects/rackunit/private/gui/model2rml.rkt @@ -1,10 +1,8 @@ #lang racket/base (require racket/class unstable/class-iop - racket/list racket/gui/base racket/match - racket/file racket/path mrlib/include-bitmap (prefix-in drlink: "drracket-ui.rkt") diff --git a/collects/rackunit/private/gui/rml.rkt b/collects/rackunit/private/gui/rml.rkt index eea40bfde8..3525db010b 100644 --- a/collects/rackunit/private/gui/rml.rkt +++ b/collects/rackunit/private/gui/rml.rkt @@ -1,6 +1,5 @@ #lang racket/base (require racket/class - unstable/class-iop racket/gui/base framework "interfaces.rkt") diff --git a/collects/rackunit/private/gui/view.rkt b/collects/rackunit/private/gui/view.rkt index 2089f1cd61..fecc679baf 100644 --- a/collects/rackunit/private/gui/view.rkt +++ b/collects/rackunit/private/gui/view.rkt @@ -2,7 +2,6 @@ (require racket/class unstable/class-iop unstable/gui/notify - racket/list racket/gui/base framework mrlib/hierlist diff --git a/collects/rackunit/private/location.rkt b/collects/rackunit/private/location.rkt index cace08e174..5852a9e1fa 100644 --- a/collects/rackunit/private/location.rkt +++ b/collects/rackunit/private/location.rkt @@ -1,6 +1,6 @@ #lang racket/base (require racket/list - racket/contract) + racket/contract/base) ;; type location = (list any number/#f number/#f number/#f number/#f) ;; location : source line column position span diff --git a/collects/rackunit/private/test-case.rkt b/collects/rackunit/private/test-case.rkt index 3a4577fc9a..6bbee11d60 100644 --- a/collects/rackunit/private/test-case.rkt +++ b/collects/rackunit/private/test-case.rkt @@ -1,9 +1,6 @@ #lang racket/base - (require (for-syntax racket/base) - "base.rkt" "format.rkt" - "check-info.rkt" "check.rkt") (provide current-test-name diff --git a/collects/rackunit/private/text-ui-util.rkt b/collects/rackunit/private/text-ui-util.rkt index affc9ca7b2..deb4e4d896 100644 --- a/collects/rackunit/private/text-ui-util.rkt +++ b/collects/rackunit/private/text-ui-util.rkt @@ -27,14 +27,9 @@ ;; Commentary: #lang racket/base - -(require (only-in srfi/13 string-contains string-drop)) - - (provide trim-current-directory) ;; trim-current-directory : string -> string (define (trim-current-directory path) (let ((cd (path->string (current-directory)))) (regexp-replace (regexp-quote cd) path ""))) - diff --git a/collects/rackunit/text-ui.rkt b/collects/rackunit/text-ui.rkt index 89d78f0587..240632eefd 100644 --- a/collects/rackunit/text-ui.rkt +++ b/collects/rackunit/text-ui.rkt @@ -30,9 +30,6 @@ (require racket/match racket/pretty - srfi/13 - srfi/26 - "main.rkt" "private/base.rkt" "private/counter.rkt" "private/format.rkt" @@ -241,6 +238,5 @@ test)) ((normal) (std-test/text-ui display-context test)) ((verbose) (std-test/text-ui - (cut display-context <> #t) + (lambda (x) (display-context x #t)) test)))))) - diff --git a/collects/rackunit/tool.rkt b/collects/rackunit/tool.rkt index 230df69fd4..31a078cc25 100644 --- a/collects/rackunit/tool.rkt +++ b/collects/rackunit/tool.rkt @@ -1,7 +1,6 @@ #lang racket/base (require racket/class racket/gui/base - framework drscheme/tool racket/unit) diff --git a/collects/scheme/foreign.rkt b/collects/scheme/foreign.rkt index facff8204c..81b8eb70d5 100644 --- a/collects/scheme/foreign.rkt +++ b/collects/scheme/foreign.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require (for-syntax scheme/base)) +(require (for-syntax racket/base)) (define-syntax-rule (provide-except-unsafe (ulib ...) u! id ...) (begin diff --git a/collects/scheme/nest.rkt b/collects/scheme/nest.rkt index b17e2b3da4..00febe65ae 100644 --- a/collects/scheme/nest.rkt +++ b/collects/scheme/nest.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide nest) diff --git a/collects/scheme/pretty.rkt b/collects/scheme/pretty.rkt index 906281ea81..e0cdc2ac50 100644 --- a/collects/scheme/pretty.rkt +++ b/collects/scheme/pretty.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require racket/pretty) (provide (except-out (all-from-out racket/pretty) pretty-print) diff --git a/collects/scheme/unit.rkt b/collects/scheme/unit.rkt index a32063b198..b615375163 100644 --- a/collects/scheme/unit.rkt +++ b/collects/scheme/unit.rkt @@ -1,13 +1,9 @@ (module unit racket/base - (require mzlib/unit - racket/contract/base - (for-syntax racket/base - syntax/struct)) + (require mzlib/unit) (provide (except-out (all-from-out mzlib/unit) struct struct/ctc struct~s struct~s/ctc struct~r struct~r/ctc) (rename-out [struct~s struct] [struct~s/ctc struct/ctc]))) - diff --git a/collects/scribble/base.rkt b/collects/scribble/base.rkt index a563cf999a..94e88abea0 100644 --- a/collects/scribble/base.rkt +++ b/collects/scribble/base.rkt @@ -7,9 +7,8 @@ "html-properties.rkt" scheme/list scheme/class - scheme/contract + racket/contract/base setup/main-collects - syntax/modresolve (for-syntax scheme/base)) ;; ---------------------------------------- diff --git a/collects/scribble/base/lang.rkt b/collects/scribble/base/lang.rkt index 173f2c1e57..a964276983 100644 --- a/collects/scribble/base/lang.rkt +++ b/collects/scribble/base/lang.rkt @@ -1,4 +1,4 @@ -#lang scheme +#lang racket/base (require scribble/doclang scribble/base) (provide (all-from-out scribble/doclang scribble/base)) diff --git a/collects/scribble/bnf.rkt b/collects/scribble/bnf.rkt index 597dead1a1..d3575ae260 100644 --- a/collects/scribble/bnf.rkt +++ b/collects/scribble/bnf.rkt @@ -1,8 +1,7 @@ (module bnf mzscheme (require "struct.rkt" "decode.rkt" - mzlib/kw - mzlib/class) + mzlib/kw) (provide BNF nonterm diff --git a/collects/scribble/core.rkt b/collects/scribble/core.rkt index aa88460147..5130351193 100644 --- a/collects/scribble/core.rkt +++ b/collects/scribble/core.rkt @@ -1,7 +1,7 @@ #lang scheme/base (require "private/provide-structs.rkt" scheme/serialize - scheme/contract + racket/contract/base file/convertible) ;; ---------------------------------------- diff --git a/collects/scribble/decode-struct.rkt b/collects/scribble/decode-struct.rkt index 2583e4cb8e..3a56e267ee 100644 --- a/collects/scribble/decode-struct.rkt +++ b/collects/scribble/decode-struct.rkt @@ -1,7 +1,5 @@ #lang scheme/base - -(require "core.rkt" - "private/provide-structs.rkt") +(require "private/provide-structs.rkt") (provide-structs [part-index-desc ()]) diff --git a/collects/scribble/decode.rkt b/collects/scribble/decode.rkt index 2f5f51de2d..c6d8beff4c 100644 --- a/collects/scribble/decode.rkt +++ b/collects/scribble/decode.rkt @@ -2,8 +2,7 @@ (require "core.rkt" "private/provide-structs.rkt" "decode-struct.rkt" - scheme/contract - scheme/class + racket/contract/base scheme/list) (define (pre-content? i) diff --git a/collects/scribble/doclang.rkt b/collects/scribble/doclang.rkt index 1acbea935f..f0590eeee3 100644 --- a/collects/scribble/doclang.rkt +++ b/collects/scribble/doclang.rkt @@ -1,7 +1,6 @@ #lang racket/base -(require "struct.rkt" - "decode.rkt" +(require "decode.rkt" (for-syntax racket/base syntax/kerncase)) diff --git a/collects/scribble/eval.rkt b/collects/scribble/eval.rkt index 7563af1dbc..2b944f7afb 100644 --- a/collects/scribble/eval.rkt +++ b/collects/scribble/eval.rkt @@ -1,8 +1,9 @@ #lang racket/base (require "manual.rkt" "struct.rkt" "scheme.rkt" "decode.rkt" - racket/string racket/list racket/file - racket/sandbox racket/promise racket/port file/convertible + racket/list + file/convertible ;; attached into new namespace via anchor + racket/sandbox racket/promise racket/port racket/gui/dynamic (for-syntax racket/base)) diff --git a/collects/scribble/html-properties.rkt b/collects/scribble/html-properties.rkt index a46b9785e6..9d46cabc9f 100644 --- a/collects/scribble/html-properties.rkt +++ b/collects/scribble/html-properties.rkt @@ -1,6 +1,6 @@ #lang scheme/base (require "private/provide-structs.rkt" - scheme/contract) + racket/contract/base) (provide-structs [body-id ([value string?])] diff --git a/collects/scribble/html/resource.rkt b/collects/scribble/html/resource.rkt index 54632f4eaa..1cd83ec774 100644 --- a/collects/scribble/html/resource.rkt +++ b/collects/scribble/html/resource.rkt @@ -26,7 +26,7 @@ ;; rendering; they will also be rendered in turn until no more resources are ;; created. -(require racket/list racket/string scribble/text "xml.rkt") +(require scribble/text) ;; default file, urls to it will point to its directory instead, and a ;; /-suffixed path will render to this file diff --git a/collects/scribble/jfp/lang.rkt b/collects/scribble/jfp/lang.rkt index 3ee36659bf..429ece6d3d 100644 --- a/collects/scribble/jfp/lang.rkt +++ b/collects/scribble/jfp/lang.rkt @@ -1,8 +1,6 @@ #lang scheme/base (require scribble/doclang - scribble/core (except-in scribble/base author) - scribble/decode scribble/jfp setup/main-collects "../private/defaults.rkt" diff --git a/collects/scribble/latex-properties.rkt b/collects/scribble/latex-properties.rkt index f03860929e..7e6396aaf5 100644 --- a/collects/scribble/latex-properties.rkt +++ b/collects/scribble/latex-properties.rkt @@ -1,6 +1,6 @@ #lang scheme/base (require "private/provide-structs.rkt" - scheme/contract) + racket/contract/base) (provide-structs [tex-addition ([path (or/c path-string? (cons/c 'collects (listof bytes?)))])] diff --git a/collects/scribble/latex-render.rkt b/collects/scribble/latex-render.rkt index ba574c168f..1657907de8 100644 --- a/collects/scribble/latex-render.rkt +++ b/collects/scribble/latex-render.rkt @@ -1,12 +1,10 @@ #lang scheme/base - (require "core.rkt" "latex-properties.rkt" "private/render-utils.rkt" scheme/class scheme/runtime-path scheme/port - scheme/path scheme/string scheme/list setup/main-collects diff --git a/collects/scribble/lncs/lang.rkt b/collects/scribble/lncs/lang.rkt index bfde172fc4..9051d3552f 100644 --- a/collects/scribble/lncs/lang.rkt +++ b/collects/scribble/lncs/lang.rkt @@ -6,16 +6,15 @@ (prefix-in s/b: scribble/base) scribble/decode "../private/defaults.rkt" - (for-syntax racket/base racket/list) setup/main-collects scribble/html-properties scribble/latex-properties racket/stxparam net/ftp file/gunzip - (for-syntax racket/stxparam-exptime - racket/base - setup/dirs)) + (for-syntax racket/base + racket/list + racket/stxparam-exptime)) (provide (except-out (all-from-out scribble/doclang) #%module-begin) (all-from-out scribble/base) diff --git a/collects/scribble/lp.rkt b/collects/scribble/lp.rkt index eebf6cd5a2..b96a8a0b5d 100644 --- a/collects/scribble/lp.rkt +++ b/collects/scribble/lp.rkt @@ -1,4 +1,3 @@ -#lang scheme - +#lang racket/base (require scribble/private/lp) (provide chunk) diff --git a/collects/scribble/lp/lang/lang.rkt b/collects/scribble/lp/lang/lang.rkt index 640849a0bc..9a65f368c6 100644 --- a/collects/scribble/lp/lang/lang.rkt +++ b/collects/scribble/lp/lang/lang.rkt @@ -3,7 +3,7 @@ (provide (except-out (all-from-out scheme/base) #%module-begin) (rename-out [module-begin #%module-begin])) -(require (for-syntax scheme/base syntax/boundmap scheme/list syntax/kerncase +(require (for-syntax scheme/base syntax/boundmap scheme/list syntax/strip-context)) ;; --- MF: bad hack for getting rid of comments diff --git a/collects/scribble/manual-struct.rkt b/collects/scribble/manual-struct.rkt index 4496391255..0e229abdfa 100644 --- a/collects/scribble/manual-struct.rkt +++ b/collects/scribble/manual-struct.rkt @@ -1,8 +1,7 @@ #lang scheme/base - (require "core.rkt" "private/provide-structs.rkt" - scheme/contract) + racket/contract/base) (provide-structs [module-path-index-desc ()] diff --git a/collects/scribble/private/indirect-renderer.rkt b/collects/scribble/private/indirect-renderer.rkt index dc6f951170..68371ecfd4 100644 --- a/collects/scribble/private/indirect-renderer.rkt +++ b/collects/scribble/private/indirect-renderer.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require racket/class racket/file racket/path racket/port) +(require racket/class racket/file racket/path) (provide make-indirect-renderer-mixin) diff --git a/collects/scribble/private/lp.rkt b/collects/scribble/private/lp.rkt index a565a293bd..28efb5bb33 100644 --- a/collects/scribble/private/lp.rkt +++ b/collects/scribble/private/lp.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require (for-syntax scheme/base syntax/boundmap scheme/list syntax/kerncase) +(require (for-syntax scheme/base syntax/boundmap) scribble/scheme scribble/decode scribble/manual scribble/struct) (begin-for-syntax diff --git a/collects/scribble/private/manual-bib.rkt b/collects/scribble/private/manual-bib.rkt index afc155ce90..08b257411b 100644 --- a/collects/scribble/private/manual-bib.rkt +++ b/collects/scribble/private/manual-bib.rkt @@ -1,5 +1,5 @@ #lang scheme/base -(require scheme/contract +(require racket/contract/base "../decode.rkt" "../struct.rkt" "../basic.rkt" diff --git a/collects/scribble/private/manual-bind.rkt b/collects/scribble/private/manual-bind.rkt index 7acf507c06..d5c4c8398e 100644 --- a/collects/scribble/private/manual-bind.rkt +++ b/collects/scribble/private/manual-bind.rkt @@ -1,25 +1,15 @@ #lang scheme/base -(require "../decode.rkt" - "../struct.rkt" +(require "../struct.rkt" "../scheme.rkt" "../search.rkt" "../basic.rkt" "../manual-struct.rkt" "manual-ex.rkt" - scheme/string - scheme/contract - scheme/list - scheme/class - scheme/stxparam - scheme/serialize - setup/main-collects - (for-syntax scheme/base - syntax/boundmap - syntax/kerncase) + racket/contract/base + (for-syntax scheme/base) (for-label scheme/base scheme/class)) - (provide definition-site libs->taglet annote-exporting-library diff --git a/collects/scribble/private/manual-class.rkt b/collects/scribble/private/manual-class.rkt index 7c55292a9b..54b5f1b250 100644 --- a/collects/scribble/private/manual-class.rkt +++ b/collects/scribble/private/manual-class.rkt @@ -9,14 +9,11 @@ scheme/serialize scheme/stxparam "manual-utils.rkt" - "manual-vars.rkt" "manual-style.rkt" "manual-scheme.rkt" "manual-bind.rkt" "manual-method.rkt" "manual-proc.rkt" - "manual-ex.rkt" - scheme/string scheme/list (for-syntax scheme/base) (for-label scheme/base diff --git a/collects/scribble/private/manual-code.rkt b/collects/scribble/private/manual-code.rkt index f90e750740..362e198575 100644 --- a/collects/scribble/private/manual-code.rkt +++ b/collects/scribble/private/manual-code.rkt @@ -2,7 +2,6 @@ (require syntax/strip-context syntax-color/module-lexer "../racket.rkt" - "../core.rkt" "../base.rkt" "manual-scheme.rkt" "manual-style.rkt" diff --git a/collects/scribble/private/manual-form.rkt b/collects/scribble/private/manual-form.rkt index 2a30f17132..76b8f922d0 100644 --- a/collects/scribble/private/manual-form.rkt +++ b/collects/scribble/private/manual-form.rkt @@ -2,23 +2,17 @@ (require "../decode.rkt" "../struct.rkt" "../scheme.rkt" - "../search.rkt" "../basic.rkt" "../manual-struct.rkt" "qsloc.rkt" "manual-utils.rkt" "manual-vars.rkt" - "manual-style.rkt" "manual-scheme.rkt" "manual-bind.rkt" - "manual-method.rkt" - "manual-ex.rkt" - scheme/string scheme/list (for-syntax scheme/base) (for-label scheme/base)) - (provide defform defform* defform/subs defform*/subs defform/none defidform defidform/inline specform specform/subs diff --git a/collects/scribble/private/manual-mod.rkt b/collects/scribble/private/manual-mod.rkt index 6cd96aecec..10c7df1192 100644 --- a/collects/scribble/private/manual-mod.rkt +++ b/collects/scribble/private/manual-mod.rkt @@ -6,8 +6,6 @@ "manual-ex.rkt" "manual-style.rkt" "manual-scheme.rkt" - scheme/string - scheme/list (for-syntax scheme/base) (for-label scheme/base)) diff --git a/collects/scribble/private/manual-proc.rkt b/collects/scribble/private/manual-proc.rkt index c7b9eacaa8..191cbcb402 100644 --- a/collects/scribble/private/manual-proc.rkt +++ b/collects/scribble/private/manual-proc.rkt @@ -1,8 +1,6 @@ #lang racket/base -(require "../decode.rkt" - "../struct.rkt" +(require "../struct.rkt" "../scheme.rkt" - "../search.rkt" "../basic.rkt" "../manual-struct.rkt" (only-in "../core.rkt" diff --git a/collects/scribble/private/manual-scheme.rkt b/collects/scribble/private/manual-scheme.rkt index 307938ccae..113d6a1e89 100644 --- a/collects/scribble/private/manual-scheme.rkt +++ b/collects/scribble/private/manual-scheme.rkt @@ -4,10 +4,8 @@ "../scheme.rkt" "../search.rkt" "../basic.rkt" - (only-in "../core.rkt" make-style box-mode) - racket/list - "manual-utils.rkt" "manual-style.rkt" + "manual-utils.rkt" ;; used via datum->syntax (for-syntax racket/base) (for-label racket/base)) diff --git a/collects/scribble/private/manual-sprop.rkt b/collects/scribble/private/manual-sprop.rkt index 8877870728..35c206fea9 100644 --- a/collects/scribble/private/manual-sprop.rkt +++ b/collects/scribble/private/manual-sprop.rkt @@ -1,10 +1,8 @@ #lang scheme/base - (require "../html-properties.rkt" "../latex-properties.rkt" "on-demand.rkt" - setup/main-collects - scheme/promise) + setup/main-collects) (provide scheme-properties) diff --git a/collects/scribble/private/manual-style.rkt b/collects/scribble/private/manual-style.rkt index 39b968606e..61ad3bb571 100644 --- a/collects/scribble/private/manual-style.rkt +++ b/collects/scribble/private/manual-style.rkt @@ -11,7 +11,7 @@ "on-demand.rkt" "manual-sprop.rkt" racket/list - racket/contract + racket/contract/base racket/string) (provide (rename-out [hyperlink link]) diff --git a/collects/scribble/private/manual-tech.rkt b/collects/scribble/private/manual-tech.rkt index 5f32d4d9ff..1a508b75b0 100644 --- a/collects/scribble/private/manual-tech.rkt +++ b/collects/scribble/private/manual-tech.rkt @@ -1,8 +1,7 @@ #lang scheme/base -(require scheme/contract +(require racket/contract/base "../decode.rkt" "../struct.rkt" - "../basic.rkt" "manual-utils.rkt" "manual-style.rkt") diff --git a/collects/scribble/private/manual-unit.rkt b/collects/scribble/private/manual-unit.rkt index 6fe9ecdfd8..a336e62e67 100644 --- a/collects/scribble/private/manual-unit.rkt +++ b/collects/scribble/private/manual-unit.rkt @@ -1,17 +1,11 @@ #lang scheme/base (require "../decode.rkt" "../struct.rkt" - "../scheme.rkt" - "../search.rkt" - "../basic.rkt" - "manual-utils.rkt" "manual-vars.rkt" - "manual-style.rkt" - "manual-scheme.rkt" "manual-bind.rkt" "manual-ex.rkt" "manual-proc.rkt" - scheme/contract + racket/contract/base (for-syntax scheme/base) (for-label scheme/base)) diff --git a/collects/scribble/private/manual-utils.rkt b/collects/scribble/private/manual-utils.rkt index 6ed36a5a48..4a07d68ebe 100644 --- a/collects/scribble/private/manual-utils.rkt +++ b/collects/scribble/private/manual-utils.rkt @@ -1,10 +1,9 @@ #lang scheme/base (require "../struct.rkt" - "../decode.rkt" "../base.rkt" (only-in "../core.rkt" content?) - scheme/contract + racket/contract/base scheme/list) (provide doc-prefix) diff --git a/collects/scribble/private/manual-vars.rkt b/collects/scribble/private/manual-vars.rkt index e6c0275932..c287f7d5e8 100644 --- a/collects/scribble/private/manual-vars.rkt +++ b/collects/scribble/private/manual-vars.rkt @@ -6,7 +6,7 @@ make-style style-name nested-flow? nested-flow-blocks nested-flow-style) "../html-properties.rkt" - scheme/contract + racket/contract/base (for-syntax scheme/base syntax/kerncase syntax/boundmap) diff --git a/collects/scribble/private/on-demand.rkt b/collects/scribble/private/on-demand.rkt index 6a97468d14..11b78b1648 100644 --- a/collects/scribble/private/on-demand.rkt +++ b/collects/scribble/private/on-demand.rkt @@ -1,4 +1,6 @@ -#lang scheme +#lang racket/base +(require racket/promise + (for-syntax racket/base)) (provide define-on-demand) (define-syntax-rule (define-on-demand id rhs) diff --git a/collects/scribble/private/provide-structs.rkt b/collects/scribble/private/provide-structs.rkt index 18162c2e8f..66aa3b4e59 100644 --- a/collects/scribble/private/provide-structs.rkt +++ b/collects/scribble/private/provide-structs.rkt @@ -1,6 +1,6 @@ #lang scheme/base (require scheme/serialize - scheme/contract + racket/contract/base (for-syntax scheme/base)) (provide provide-structs) diff --git a/collects/scribble/private/run-pdflatex.rkt b/collects/scribble/private/run-pdflatex.rkt index 7efec3a3cd..49638b8530 100644 --- a/collects/scribble/private/run-pdflatex.rkt +++ b/collects/scribble/private/run-pdflatex.rkt @@ -1,6 +1,6 @@ #lang scheme/base -(require scheme/system scheme/port scheme/promise) +(require scheme/system scheme/port) (provide run-pdflatex) diff --git a/collects/scribble/racket.rkt b/collects/scribble/racket.rkt index 321eb718c2..e408e88bb2 100644 --- a/collects/scribble/racket.rkt +++ b/collects/scribble/racket.rkt @@ -4,10 +4,6 @@ "search.rkt" "private/manual-sprop.rkt" "private/on-demand.rkt" - mzlib/class - mzlib/for - syntax/modresolve - syntax/modcode file/convertible (for-syntax racket/base)) diff --git a/collects/scribble/render.rkt b/collects/scribble/render.rkt index f9ee4a7202..143101026b 100644 --- a/collects/scribble/render.rkt +++ b/collects/scribble/render.rkt @@ -5,7 +5,7 @@ "xref.rkt" racket/file racket/class - racket/contract + racket/contract/base (prefix-in html: "html-render.rkt")) (provide/contract diff --git a/collects/scribble/search.rkt b/collects/scribble/search.rkt index 2db52b6c20..38695def71 100644 --- a/collects/scribble/search.rkt +++ b/collects/scribble/search.rkt @@ -1,7 +1,6 @@ (module search racket/base (require "struct.rkt" "basic.rkt" - setup/main-collects syntax/modcode) (provide find-racket-tag diff --git a/collects/scribble/sigplan.rkt b/collects/scribble/sigplan.rkt index 8607a80037..0a6e8f680d 100644 --- a/collects/scribble/sigplan.rkt +++ b/collects/scribble/sigplan.rkt @@ -1,6 +1,6 @@ #lang scheme/base (require setup/main-collects - scheme/contract + racket/contract/base scribble/core scribble/base scribble/decode diff --git a/collects/scribble/sigplan/lang.rkt b/collects/scribble/sigplan/lang.rkt index 2f01623a3d..49b3dae99d 100644 --- a/collects/scribble/sigplan/lang.rkt +++ b/collects/scribble/sigplan/lang.rkt @@ -2,7 +2,6 @@ (require scribble/doclang scribble/core scribble/base - scribble/decode scribble/sigplan racket/list "../private/defaults.rkt" diff --git a/collects/scribble/srcdoc.rkt b/collects/scribble/srcdoc.rkt index 2553b2f246..e1253e780b 100644 --- a/collects/scribble/srcdoc.rkt +++ b/collects/scribble/srcdoc.rkt @@ -1,6 +1,5 @@ #lang scheme/base - -(require scheme/contract +(require racket/contract/base (for-syntax scheme/base) "provide-doc-transform.rkt") diff --git a/collects/scribble/struct.rkt b/collects/scribble/struct.rkt index f3ff18f687..c9fa8cb6d4 100644 --- a/collects/scribble/struct.rkt +++ b/collects/scribble/struct.rkt @@ -7,7 +7,7 @@ "html-properties.rkt" scheme/provide-syntax scheme/struct-info - scheme/contract + racket/contract/base (for-syntax scheme/base)) (define-provide-syntax (compat**-out stx) diff --git a/collects/scribble/xref.rkt b/collects/scribble/xref.rkt index bb5918a084..1940786034 100644 --- a/collects/scribble/xref.rkt +++ b/collects/scribble/xref.rkt @@ -1,15 +1,11 @@ #lang scheme/base (require scribble/struct - scribble/manual-struct - scribble/decode-struct scribble/base-render scribble/search (prefix-in html: scribble/html-render) scheme/class - mzlib/serialize - scheme/path - setup/main-collects) + scheme/path) (provide load-xref xref? diff --git a/collects/syntax/boundmap.rkt b/collects/syntax/boundmap.rkt index 2b40cf9711..75a04ace16 100644 --- a/collects/syntax/boundmap.rkt +++ b/collects/syntax/boundmap.rkt @@ -1,6 +1,5 @@ - (module boundmap mzscheme - (require racket/contract + (require racket/contract/base "private/boundmap.rkt") (define-syntax provide/contract* diff --git a/collects/syntax/define.rkt b/collects/syntax/define.rkt index 844d376b79..04c3066a69 100644 --- a/collects/syntax/define.rkt +++ b/collects/syntax/define.rkt @@ -1,5 +1,3 @@ - -(module define scheme/base +(module define racket/base (require racket/private/norm-define) - (provide normalize-definition)) diff --git a/collects/syntax/docprovide.rkt b/collects/syntax/docprovide.rkt index 5ede56df3b..d5e6c2fa7c 100644 --- a/collects/syntax/docprovide.rkt +++ b/collects/syntax/docprovide.rkt @@ -1,5 +1,5 @@ -(module docprovide scheme/base - (require (for-syntax scheme/base +(module docprovide racket/base + (require (for-syntax racket/base "private/doctable.rkt")) (define-syntaxes (provide-and-document provide-and-document/wrap) diff --git a/collects/syntax/flatten-begin.rkt b/collects/syntax/flatten-begin.rkt index 5cb4b0e5b5..204f357468 100644 --- a/collects/syntax/flatten-begin.rkt +++ b/collects/syntax/flatten-begin.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (provide flatten-begin) (define (flatten-begin stx) diff --git a/collects/syntax/modcode.rkt b/collects/syntax/modcode.rkt index a722bceaee..199a2bad59 100644 --- a/collects/syntax/modcode.rkt +++ b/collects/syntax/modcode.rkt @@ -1,6 +1,5 @@ #lang racket/base - (require mzlib/port - racket/contract + (require racket/contract/base "modread.rkt") (provide moddep-current-open-input-file diff --git a/collects/syntax/modread.rkt b/collects/syntax/modread.rkt index 2a29d7bf90..21b6c2084e 100644 --- a/collects/syntax/modread.rkt +++ b/collects/syntax/modread.rkt @@ -1,5 +1,5 @@ (module modread mzscheme - (require racket/contract) + (require racket/contract/base) (provide with-module-reading-parameterization) (provide/contract diff --git a/collects/syntax/parse/define.rkt b/collects/syntax/parse/define.rkt index d31d8fc0bf..049551b7fc 100644 --- a/collects/syntax/parse/define.rkt +++ b/collects/syntax/parse/define.rkt @@ -1,8 +1,6 @@ #lang racket/base (require (for-syntax racket/base syntax/parse - "private/rep.rkt" - "private/rep-data.rkt" "private/sc.rkt")) (provide define-simple-macro (for-syntax (all-from-out syntax/parse))) diff --git a/collects/syntax/path-spec.rkt b/collects/syntax/path-spec.rkt index 57ed3935c3..3bb929dbb5 100644 --- a/collects/syntax/path-spec.rkt +++ b/collects/syntax/path-spec.rkt @@ -1,6 +1,5 @@ -(module path-spec scheme/base - (require (for-template scheme/base)) - (require "stx.rkt") +(module path-spec racket/base + (require (for-template racket/base)) (provide resolve-path-spec) diff --git a/collects/syntax/private/keyword.rkt b/collects/syntax/private/keyword.rkt index be810c58df..25a3d12500 100644 --- a/collects/syntax/private/keyword.rkt +++ b/collects/syntax/private/keyword.rkt @@ -1,9 +1,9 @@ -#lang scheme/base +#lang racket/base ;; No-contract version... (require syntax/stx - scheme/dict) + racket/private/dict) ;; no contracts (provide parse-keyword-options parse-keyword-options/eol options-select diff --git a/collects/syntax/private/template-runtime.rkt b/collects/syntax/private/template-runtime.rkt index 2b8a1b05a1..344a3a25b9 100644 --- a/collects/syntax/private/template-runtime.rkt +++ b/collects/syntax/private/template-runtime.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require "../stx.rkt" unstable/struct) diff --git a/collects/syntax/private/util/expand.rkt b/collects/syntax/private/util/expand.rkt index 5e8a6b99ca..1de1270135 100644 --- a/collects/syntax/private/util/expand.rkt +++ b/collects/syntax/private/util/expand.rkt @@ -1,4 +1,4 @@ -#lang scheme/base +#lang racket/base (require syntax/kerncase syntax/stx) (provide head-local-expand-and-categorize-syntaxes diff --git a/collects/syntax/struct.rkt b/collects/syntax/struct.rkt index 2be275a84c..508980ef13 100644 --- a/collects/syntax/struct.rkt +++ b/collects/syntax/struct.rkt @@ -1,9 +1,8 @@ -(module struct scheme/base - (require (for-syntax scheme/base) - mzlib/etc - scheme/contract +(module struct racket/base + (require (for-syntax racket/base) + racket/contract/base "stx.rkt" - scheme/struct-info) + racket/struct-info) (require (for-template mzscheme)) (provide parse-define-struct diff --git a/collects/syntax/template.rkt b/collects/syntax/template.rkt index c337397dea..3351e30302 100644 --- a/collects/syntax/template.rkt +++ b/collects/syntax/template.rkt @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base (require "stx.rkt" unstable/struct - (for-template scheme/base + (for-template racket/base "private/template-runtime.rkt")) (provide transform-template) diff --git a/collects/syntax/toplevel.rkt b/collects/syntax/toplevel.rkt index 7602e52dfe..b35ba4fbde 100644 --- a/collects/syntax/toplevel.rkt +++ b/collects/syntax/toplevel.rkt @@ -1,4 +1,4 @@ -(module toplevel scheme/base +(module toplevel racket/base (require "kerncase.rkt") (provide eval-compile-time-part-of-top-level diff --git a/collects/unstable/bytes.rkt b/collects/unstable/bytes.rkt index b33d4f51a9..daf1e39e92 100644 --- a/collects/unstable/bytes.rkt +++ b/collects/unstable/bytes.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract +(require racket/contract/base racket/serialize) (provide/contract diff --git a/collects/unstable/debug.rkt b/collects/unstable/debug.rkt index ef5615fb94..7d613a5f2b 100644 --- a/collects/unstable/debug.rkt +++ b/collects/unstable/debug.rkt @@ -19,13 +19,12 @@ with-syntax*/debug parameterize/debug) -(require racket/block - racket/match +(require racket/match unstable/pretty syntax/srcloc syntax/location racket/syntax - (for-syntax racket/base racket/match syntax/parse racket/syntax)) + (for-syntax racket/base syntax/parse racket/syntax)) (define-syntax (let/debug stx) (syntax-parse stx diff --git a/collects/unstable/define.rkt b/collects/unstable/define.rkt index b58870fbde..a2c7cb01e4 100644 --- a/collects/unstable/define.rkt +++ b/collects/unstable/define.rkt @@ -5,9 +5,7 @@ racket/base racket/list racket/match - racket/block syntax/parse - syntax/kerncase racket/syntax unstable/syntax (for-syntax ;; phase 2! @@ -39,7 +37,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (define-syntax define-syntax-block - (block + (let () (define-syntax-class declaration #:attributes [internal external] @@ -55,7 +53,7 @@ (syntax-list decl.external ...)) "duplicate defined name" #'(define-syntaxes [decl.external ...] - (block body ... (values decl.internal ...)))]))) + (let () body ... (values decl.internal ...)))]))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; diff --git a/collects/unstable/dict.rkt b/collects/unstable/dict.rkt index e75b567537..82502d2c4c 100644 --- a/collects/unstable/dict.rkt +++ b/collects/unstable/dict.rkt @@ -1,6 +1,6 @@ #lang racket/base (require racket/dict - racket/contract) + racket/contract/base) (define (dict-empty? dict) (not (dict-iterate-first dict))) diff --git a/collects/unstable/exn.rkt b/collects/unstable/exn.rkt index edac8bf6c8..8f8820dbc8 100644 --- a/collects/unstable/exn.rkt +++ b/collects/unstable/exn.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract +(require racket/contract/base (for-syntax racket/base)) ;; network-error: symbol string . values -> void diff --git a/collects/unstable/file.rkt b/collects/unstable/file.rkt index 8a9680cd71..974f50e7cb 100644 --- a/collects/unstable/file.rkt +++ b/collects/unstable/file.rkt @@ -1,6 +1,6 @@ #lang racket/base ; Responsible: Jay McCarthy -(require racket/contract) +(require racket/contract/base) (define (exn:fail:filesystem:exists? x) (and (exn:fail:filesystem? x) diff --git a/collects/unstable/find.rkt b/collects/unstable/find.rkt index 0ca5a2366b..f7e401e896 100644 --- a/collects/unstable/find.rkt +++ b/collects/unstable/find.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract +(require racket/contract/base unstable/struct) (provide/contract diff --git a/collects/unstable/function.rkt b/collects/unstable/function.rkt index 3f83762f2f..79e2962c19 100644 --- a/collects/unstable/function.rkt +++ b/collects/unstable/function.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/dict racket/match +(require racket/match (for-syntax racket/base racket/list)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/collects/unstable/gui/language-level.rkt b/collects/unstable/gui/language-level.rkt index b75f4917cb..6f58381867 100644 --- a/collects/unstable/gui/language-level.rkt +++ b/collects/unstable/gui/language-level.rkt @@ -1,5 +1,10 @@ -#lang racket/gui -(require drracket/tool +#lang racket/base +(require racket/class + racket/file + racket/dict + racket/unit + racket/gui/base + drracket/tool string-constants (only-in test-engine/scheme-gui make-formatter) (only-in test-engine/scheme-tests diff --git a/collects/unstable/gui/notify.rkt b/collects/unstable/gui/notify.rkt index ff6f01d64a..13808ed44d 100644 --- a/collects/unstable/gui/notify.rkt +++ b/collects/unstable/gui/notify.rkt @@ -1,7 +1,6 @@ #lang racket/base ;; owner: ryanc -(require racket/list - racket/class +(require racket/class racket/gui/base "../private/notify.rkt") (provide (all-from-out "../private/notify.rkt") diff --git a/collects/unstable/gui/pict.rkt b/collects/unstable/gui/pict.rkt index 058267e5e4..3ae1c1c5b4 100644 --- a/collects/unstable/gui/pict.rkt +++ b/collects/unstable/gui/pict.rkt @@ -1,9 +1,8 @@ #lang racket/base (require slideshow/pict - racket/contract racket/list racket/match + racket/contract/base racket/match racket/splicing racket/stxparam racket/draw racket/block racket/class - unstable/define (for-syntax racket/base) "private/blur.rkt") (provide (all-from-out "private/blur.rkt")) diff --git a/collects/unstable/gui/ppict.rkt b/collects/unstable/gui/ppict.rkt index 7f333ccf20..efdf0a7993 100644 --- a/collects/unstable/gui/ppict.rkt +++ b/collects/unstable/gui/ppict.rkt @@ -1,10 +1,9 @@ #lang racket/base (require (for-syntax racket/base - racket/syntax syntax/parse syntax/parse/experimental/contract "private/ppict-syntax.rkt") - racket/contract + racket/contract/base slideshow/pict "private/ppict.rkt" "private/tag-pict.rkt") diff --git a/collects/unstable/gui/prefs.rkt b/collects/unstable/gui/prefs.rkt index 80c14e4659..f25c0ecaad 100644 --- a/collects/unstable/gui/prefs.rkt +++ b/collects/unstable/gui/prefs.rkt @@ -1,7 +1,6 @@ #lang racket/base ;; owner: ryanc -(require (for-syntax racket/base syntax/parse) - framework/framework) +(require framework/preferences) (provide pref:get/set) (define (pref:get/set sym) diff --git a/collects/unstable/gui/private/blur.rkt b/collects/unstable/gui/private/blur.rkt index 7e5255cecd..0df882576e 100644 --- a/collects/unstable/gui/private/blur.rkt +++ b/collects/unstable/gui/private/blur.rkt @@ -1,11 +1,9 @@ #lang racket/base (require (for-syntax racket/base) racket/unsafe/ops - racket/contract + racket/contract/base racket/class racket/draw - racket/pretty - racket/math unstable/future slideshow/pict) diff --git a/collects/unstable/gui/private/ppict-syntax.rkt b/collects/unstable/gui/private/ppict-syntax.rkt index 13cd00bec6..58fab48b87 100644 --- a/collects/unstable/gui/private/ppict-syntax.rkt +++ b/collects/unstable/gui/private/ppict-syntax.rkt @@ -1,7 +1,7 @@ #lang racket/base (require syntax/parse syntax/parse/experimental/contract (for-template racket/base - racket/contract + racket/contract/base racket/stxparam slideshow/pict "ppict.rkt")) diff --git a/collects/unstable/gui/private/ppict.rkt b/collects/unstable/gui/private/ppict.rkt index 323528fad4..28e193559f 100644 --- a/collects/unstable/gui/private/ppict.rkt +++ b/collects/unstable/gui/private/ppict.rkt @@ -3,7 +3,7 @@ racket/list racket/class racket/stxparam - racket/contract + racket/contract/base slideshow/pict "tag-pict.rkt") diff --git a/collects/unstable/gui/pslide.rkt b/collects/unstable/gui/pslide.rkt index bec051ffb2..6ffe92996f 100644 --- a/collects/unstable/gui/pslide.rkt +++ b/collects/unstable/gui/pslide.rkt @@ -1,11 +1,8 @@ #lang racket/base (require (for-syntax racket/base syntax/parse - syntax/parse/experimental/contract "private/ppict-syntax.rkt") - racket/list - racket/contract - racket/gui/base + racket/contract/base slideshow/base slideshow/pict "private/ppict.rkt") diff --git a/collects/unstable/gui/slideshow.rkt b/collects/unstable/gui/slideshow.rkt index fddee0ee26..0bcfa12b0b 100644 --- a/collects/unstable/gui/slideshow.rkt +++ b/collects/unstable/gui/slideshow.rkt @@ -1,8 +1,6 @@ #lang racket/base (require slideshow/base slideshow/pict - racket/contract racket/list racket/match - racket/splicing racket/stxparam racket/gui/base - racket/block racket/class + racket/contract/base racket/list racket/match unstable/define (for-syntax racket/base) "pict.rkt") diff --git a/collects/unstable/hash.rkt b/collects/unstable/hash.rkt index a4bfab8469..e4a6f5e2b1 100644 --- a/collects/unstable/hash.rkt +++ b/collects/unstable/hash.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract) +(require racket/contract/base) ;; Eli: See comment for `dict-union' and `dict-union!' -- these two do ;; make sense, but if they're in, then generalizing them to dictionaries diff --git a/collects/unstable/list.rkt b/collects/unstable/list.rkt index 206a8c58bf..5135a59f81 100644 --- a/collects/unstable/list.rkt +++ b/collects/unstable/list.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract +(require racket/contract/base racket/dict (for-syntax racket/base)) diff --git a/collects/unstable/logging.rkt b/collects/unstable/logging.rkt index 37793d618c..49aa414662 100644 --- a/collects/unstable/logging.rkt +++ b/collects/unstable/logging.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require racket/contract) +(require racket/contract/base) (define level/c (or/c 'fatal 'error 'warning 'info 'debug)) (define log-message/c (vector/c level/c string? any/c)) diff --git a/collects/unstable/markparam.rkt b/collects/unstable/markparam.rkt index 5ab8964e8e..29763d8f16 100644 --- a/collects/unstable/markparam.rkt +++ b/collects/unstable/markparam.rkt @@ -1,7 +1,7 @@ #lang racket/base (require racket/serialize racket/function - racket/contract + racket/contract/base (for-syntax racket/base)) (define mark-parameter-first diff --git a/collects/unstable/net/url.rkt b/collects/unstable/net/url.rkt index f53d6e69f7..03344fc689 100644 --- a/collects/unstable/net/url.rkt +++ b/collects/unstable/net/url.rkt @@ -1,7 +1,7 @@ #lang racket/base (require racket/list - racket/contract - net/url) + racket/contract/base + net/url-structs) (provide/contract [url-replace-path (((listof path/param?) . -> . (listof path/param?)) url? . -> . url?)] diff --git a/collects/unstable/path.rkt b/collects/unstable/path.rkt index a846629b20..c7d489b4be 100644 --- a/collects/unstable/path.rkt +++ b/collects/unstable/path.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract +(require racket/contract/base unstable/list unstable/contract) diff --git a/collects/unstable/port.rkt b/collects/unstable/port.rkt index eee186bad8..9584a1bac6 100644 --- a/collects/unstable/port.rkt +++ b/collects/unstable/port.rkt @@ -1,6 +1,6 @@ #lang racket/base (require racket/match - racket/contract + racket/contract/base syntax/srcloc) (define (port->srcloc port [source (object-name port)] [span 0]) diff --git a/collects/unstable/private/notify.rkt b/collects/unstable/private/notify.rkt index 4ea2a8d82b..fa63a89098 100644 --- a/collects/unstable/private/notify.rkt +++ b/collects/unstable/private/notify.rkt @@ -1,7 +1,6 @@ #lang racket/base ;; owner: ryanc (require (for-syntax racket/base syntax/parse racket/syntax) - racket/list racket/class) (provide define-notify notify-box% diff --git a/collects/unstable/string.rkt b/collects/unstable/string.rkt index 870653657c..9fed06bbcb 100644 --- a/collects/unstable/string.rkt +++ b/collects/unstable/string.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require racket/contract +(require racket/contract/base racket/serialize) (define (read/string str)