From 7917f32d0c79ec71095e2e42bb41e981708129cc Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Wed, 26 Jun 2013 11:52:28 -0400 Subject: [PATCH] Move much of `mzlib` to `compatibility-lib` package. --- .../compatibility-lib}/mzlib/a-signature.rkt | 0 .../compatibility-lib}/mzlib/a-unit.rkt | 0 .../mzlib/async-channel.rkt | 0 .../compatibility-lib}/mzlib/awk.rkt | 0 .../compatibility-lib}/mzlib/class.rkt | 0 .../compatibility-lib}/mzlib/class100.rkt | 0 .../mzlib/cm-accomplice.rkt | 0 .../compatibility-lib}/mzlib/cm.rkt | 0 .../compatibility-lib}/mzlib/cmdline.rkt | 0 .../compatibility-lib}/mzlib/cml.rkt | 0 .../compatibility-lib}/mzlib/compat.rkt | 0 .../compatibility-lib}/mzlib/control.rkt | 0 .../compatibility-lib}/mzlib/date.rkt | 0 .../compatibility-lib}/mzlib/deflate.rkt | 0 .../compatibility-lib}/mzlib/etc.rkt | 0 .../compatibility-lib}/mzlib/file.rkt | 0 .../compatibility-lib}/mzlib/for.rkt | 0 .../compatibility-lib}/mzlib/foreign.rkt | 0 .../compatibility-lib}/mzlib/include.rkt | 2 +- .../compatibility-lib}/mzlib/inflate.rkt | 0 .../compatibility-lib}/mzlib/integer-set.rkt | 0 .../compatibility-lib}/mzlib/kw.rkt | 0 .../compatibility-lib}/mzlib/list.rkt | 0 .../compatibility-lib}/mzlib/match.rkt | 0 .../compatibility-lib}/mzlib/math.rkt | 0 .../compatibility-lib}/mzlib/md5.rkt | 0 .../compatibility-lib}/mzlib/os.rkt | 0 .../compatibility-lib}/mzlib/plt-match.rkt | 0 .../compatibility-lib}/mzlib/port.rkt | 0 .../compatibility-lib}/mzlib/pregexp.rkt | 0 .../compatibility-lib}/mzlib/pretty.rkt | 0 .../mzlib/private/package-helper.rkt | 0 .../mzlib/private/structure-helper.rkt | 0 .../mzlib/private/stxparamkey.rkt | 0 .../mzlib/private/stxset.rkt | 0 .../compatibility-lib}/mzlib/process.rkt | 0 .../compatibility-lib}/mzlib/restart.rkt | 0 .../compatibility-lib}/mzlib/runtime-path.rkt | 0 .../compatibility-lib}/mzlib/sendevent.rkt | 0 .../compatibility-lib}/mzlib/serialize.rkt | 0 .../compatibility-lib}/mzlib/shared.rkt | 0 .../compatibility-lib}/mzlib/string.rkt | 0 .../compatibility-lib}/mzlib/struct.rkt | 0 .../compatibility-lib}/mzlib/stxparam.rkt | 0 .../compatibility-lib}/mzlib/surrogate.rkt | 0 .../compatibility-lib}/mzlib/tar.rkt | 0 .../compatibility-lib}/mzlib/thread.rkt | 2 +- .../compatibility-lib}/mzlib/trace.rkt | 0 .../compatibility-lib}/mzlib/traceld.rkt | 0 .../compatibility-lib}/mzlib/trait.rkt | 0 .../compatibility-lib}/mzlib/transcr.rkt | 0 .../compatibility-lib}/mzlib/unit-exptime.rkt | 0 .../compatibility-lib}/mzlib/unit.rkt | 0 .../compatibility-lib}/mzlib/unitsig.rkt | 0 .../compatibility-lib}/mzlib/zip.rkt | 0 pkgs/pconvert-lib/mzlib/pconvert.rkt | 2 +- racket/lib/collects/compiler/bundle-dist.rkt | 13 +++--- .../lib/collects/compiler/commands/ctool.rkt | 2 +- racket/lib/collects/compiler/compiler.rkt | 2 +- racket/lib/collects/compiler/distribute.rkt | 2 +- racket/lib/collects/compiler/embed-sig.rkt | 2 +- racket/lib/collects/compiler/main.rkt | 2 +- racket/lib/collects/compiler/option-unit.rkt | 2 +- racket/lib/collects/compiler/option.rkt | 2 +- .../collects/compiler/private/configdir.rkt | 2 +- .../lib/collects/compiler/private/macfw.rkt | 5 ++- .../collects/compiler/private/windlldir.rkt | 2 +- .../lib/collects/compiler/private/xform.rkt | 8 ++-- racket/lib/collects/compiler/sig.rkt | 2 +- racket/lib/collects/compiler/zo-structs.rkt | 3 +- racket/lib/collects/dynext/compile-sig.rkt | 3 +- racket/lib/collects/dynext/compile-unit.rkt | 5 +-- racket/lib/collects/dynext/compile.rkt | 2 +- racket/lib/collects/dynext/file-sig.rkt | 2 +- racket/lib/collects/dynext/file.rkt | 2 +- racket/lib/collects/dynext/link-sig.rkt | 3 +- racket/lib/collects/dynext/link-unit.rkt | 5 +-- racket/lib/collects/dynext/link.rkt | 2 +- racket/lib/collects/file/zip.rkt | 5 ++- .../collects/planet/private/cmdline-tool.rkt | 6 ++- .../lib/collects/planet/private/parsereq.rkt | 40 +++++++++---------- .../collects/planet/private/planet-shared.rkt | 2 +- .../lib/collects/planet/private/version.rkt | 1 - racket/lib/collects/racket/include.rkt | 2 +- .../racket/private/class-internal.rkt | 11 +++-- .../{mzlib => racket}/private/increader.rkt | 0 racket/lib/collects/racket/trait.rkt | 31 +++++++------- racket/lib/collects/setup/option-sig.rkt | 2 +- racket/lib/collects/setup/setup-go.rkt | 2 +- racket/lib/collects/setup/winvers.rkt | 2 +- racket/lib/collects/srfi/13/string.rkt | 33 ++++++++------- racket/lib/collects/srfi/14/char-set.rkt | 14 +++---- racket/lib/collects/srfi/29/localization.rkt | 8 ++-- racket/lib/collects/syntax/to-string.rkt | 2 +- racket/lib/collects/syntax/trusted-xforms.rkt | 2 +- 95 files changed, 121 insertions(+), 121 deletions(-) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/a-signature.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/a-unit.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/async-channel.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/awk.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/class.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/class100.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/cm-accomplice.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/cm.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/cmdline.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/cml.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/compat.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/control.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/date.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/deflate.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/etc.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/file.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/for.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/foreign.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/include.rkt (99%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/inflate.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/integer-set.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/kw.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/list.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/match.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/math.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/md5.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/os.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/plt-match.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/port.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/pregexp.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/pretty.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/private/package-helper.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/private/structure-helper.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/private/stxparamkey.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/private/stxset.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/process.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/restart.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/runtime-path.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/sendevent.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/serialize.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/shared.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/string.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/struct.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/stxparam.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/surrogate.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/tar.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/thread.rkt (99%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/trace.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/traceld.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/trait.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/transcr.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/unit-exptime.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/unit.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/unitsig.rkt (100%) rename {racket/lib/collects => pkgs/compatibility-lib}/mzlib/zip.rkt (100%) rename racket/lib/collects/{mzlib => racket}/private/increader.rkt (100%) diff --git a/racket/lib/collects/mzlib/a-signature.rkt b/pkgs/compatibility-lib/mzlib/a-signature.rkt similarity index 100% rename from racket/lib/collects/mzlib/a-signature.rkt rename to pkgs/compatibility-lib/mzlib/a-signature.rkt diff --git a/racket/lib/collects/mzlib/a-unit.rkt b/pkgs/compatibility-lib/mzlib/a-unit.rkt similarity index 100% rename from racket/lib/collects/mzlib/a-unit.rkt rename to pkgs/compatibility-lib/mzlib/a-unit.rkt diff --git a/racket/lib/collects/mzlib/async-channel.rkt b/pkgs/compatibility-lib/mzlib/async-channel.rkt similarity index 100% rename from racket/lib/collects/mzlib/async-channel.rkt rename to pkgs/compatibility-lib/mzlib/async-channel.rkt diff --git a/racket/lib/collects/mzlib/awk.rkt b/pkgs/compatibility-lib/mzlib/awk.rkt similarity index 100% rename from racket/lib/collects/mzlib/awk.rkt rename to pkgs/compatibility-lib/mzlib/awk.rkt diff --git a/racket/lib/collects/mzlib/class.rkt b/pkgs/compatibility-lib/mzlib/class.rkt similarity index 100% rename from racket/lib/collects/mzlib/class.rkt rename to pkgs/compatibility-lib/mzlib/class.rkt diff --git a/racket/lib/collects/mzlib/class100.rkt b/pkgs/compatibility-lib/mzlib/class100.rkt similarity index 100% rename from racket/lib/collects/mzlib/class100.rkt rename to pkgs/compatibility-lib/mzlib/class100.rkt diff --git a/racket/lib/collects/mzlib/cm-accomplice.rkt b/pkgs/compatibility-lib/mzlib/cm-accomplice.rkt similarity index 100% rename from racket/lib/collects/mzlib/cm-accomplice.rkt rename to pkgs/compatibility-lib/mzlib/cm-accomplice.rkt diff --git a/racket/lib/collects/mzlib/cm.rkt b/pkgs/compatibility-lib/mzlib/cm.rkt similarity index 100% rename from racket/lib/collects/mzlib/cm.rkt rename to pkgs/compatibility-lib/mzlib/cm.rkt diff --git a/racket/lib/collects/mzlib/cmdline.rkt b/pkgs/compatibility-lib/mzlib/cmdline.rkt similarity index 100% rename from racket/lib/collects/mzlib/cmdline.rkt rename to pkgs/compatibility-lib/mzlib/cmdline.rkt diff --git a/racket/lib/collects/mzlib/cml.rkt b/pkgs/compatibility-lib/mzlib/cml.rkt similarity index 100% rename from racket/lib/collects/mzlib/cml.rkt rename to pkgs/compatibility-lib/mzlib/cml.rkt diff --git a/racket/lib/collects/mzlib/compat.rkt b/pkgs/compatibility-lib/mzlib/compat.rkt similarity index 100% rename from racket/lib/collects/mzlib/compat.rkt rename to pkgs/compatibility-lib/mzlib/compat.rkt diff --git a/racket/lib/collects/mzlib/control.rkt b/pkgs/compatibility-lib/mzlib/control.rkt similarity index 100% rename from racket/lib/collects/mzlib/control.rkt rename to pkgs/compatibility-lib/mzlib/control.rkt diff --git a/racket/lib/collects/mzlib/date.rkt b/pkgs/compatibility-lib/mzlib/date.rkt similarity index 100% rename from racket/lib/collects/mzlib/date.rkt rename to pkgs/compatibility-lib/mzlib/date.rkt diff --git a/racket/lib/collects/mzlib/deflate.rkt b/pkgs/compatibility-lib/mzlib/deflate.rkt similarity index 100% rename from racket/lib/collects/mzlib/deflate.rkt rename to pkgs/compatibility-lib/mzlib/deflate.rkt diff --git a/racket/lib/collects/mzlib/etc.rkt b/pkgs/compatibility-lib/mzlib/etc.rkt similarity index 100% rename from racket/lib/collects/mzlib/etc.rkt rename to pkgs/compatibility-lib/mzlib/etc.rkt diff --git a/racket/lib/collects/mzlib/file.rkt b/pkgs/compatibility-lib/mzlib/file.rkt similarity index 100% rename from racket/lib/collects/mzlib/file.rkt rename to pkgs/compatibility-lib/mzlib/file.rkt diff --git a/racket/lib/collects/mzlib/for.rkt b/pkgs/compatibility-lib/mzlib/for.rkt similarity index 100% rename from racket/lib/collects/mzlib/for.rkt rename to pkgs/compatibility-lib/mzlib/for.rkt diff --git a/racket/lib/collects/mzlib/foreign.rkt b/pkgs/compatibility-lib/mzlib/foreign.rkt similarity index 100% rename from racket/lib/collects/mzlib/foreign.rkt rename to pkgs/compatibility-lib/mzlib/foreign.rkt diff --git a/racket/lib/collects/mzlib/include.rkt b/pkgs/compatibility-lib/mzlib/include.rkt similarity index 99% rename from racket/lib/collects/mzlib/include.rkt rename to pkgs/compatibility-lib/mzlib/include.rkt index e566060014..37618216ad 100644 --- a/racket/lib/collects/mzlib/include.rkt +++ b/pkgs/compatibility-lib/mzlib/include.rkt @@ -1,7 +1,7 @@ (module include mzscheme (require-for-syntax syntax/stx - "private/increader.rkt" + racket/private/increader "cm-accomplice.rkt") (require mzlib/etc) diff --git a/racket/lib/collects/mzlib/inflate.rkt b/pkgs/compatibility-lib/mzlib/inflate.rkt similarity index 100% rename from racket/lib/collects/mzlib/inflate.rkt rename to pkgs/compatibility-lib/mzlib/inflate.rkt diff --git a/racket/lib/collects/mzlib/integer-set.rkt b/pkgs/compatibility-lib/mzlib/integer-set.rkt similarity index 100% rename from racket/lib/collects/mzlib/integer-set.rkt rename to pkgs/compatibility-lib/mzlib/integer-set.rkt diff --git a/racket/lib/collects/mzlib/kw.rkt b/pkgs/compatibility-lib/mzlib/kw.rkt similarity index 100% rename from racket/lib/collects/mzlib/kw.rkt rename to pkgs/compatibility-lib/mzlib/kw.rkt diff --git a/racket/lib/collects/mzlib/list.rkt b/pkgs/compatibility-lib/mzlib/list.rkt similarity index 100% rename from racket/lib/collects/mzlib/list.rkt rename to pkgs/compatibility-lib/mzlib/list.rkt diff --git a/racket/lib/collects/mzlib/match.rkt b/pkgs/compatibility-lib/mzlib/match.rkt similarity index 100% rename from racket/lib/collects/mzlib/match.rkt rename to pkgs/compatibility-lib/mzlib/match.rkt diff --git a/racket/lib/collects/mzlib/math.rkt b/pkgs/compatibility-lib/mzlib/math.rkt similarity index 100% rename from racket/lib/collects/mzlib/math.rkt rename to pkgs/compatibility-lib/mzlib/math.rkt diff --git a/racket/lib/collects/mzlib/md5.rkt b/pkgs/compatibility-lib/mzlib/md5.rkt similarity index 100% rename from racket/lib/collects/mzlib/md5.rkt rename to pkgs/compatibility-lib/mzlib/md5.rkt diff --git a/racket/lib/collects/mzlib/os.rkt b/pkgs/compatibility-lib/mzlib/os.rkt similarity index 100% rename from racket/lib/collects/mzlib/os.rkt rename to pkgs/compatibility-lib/mzlib/os.rkt diff --git a/racket/lib/collects/mzlib/plt-match.rkt b/pkgs/compatibility-lib/mzlib/plt-match.rkt similarity index 100% rename from racket/lib/collects/mzlib/plt-match.rkt rename to pkgs/compatibility-lib/mzlib/plt-match.rkt diff --git a/racket/lib/collects/mzlib/port.rkt b/pkgs/compatibility-lib/mzlib/port.rkt similarity index 100% rename from racket/lib/collects/mzlib/port.rkt rename to pkgs/compatibility-lib/mzlib/port.rkt diff --git a/racket/lib/collects/mzlib/pregexp.rkt b/pkgs/compatibility-lib/mzlib/pregexp.rkt similarity index 100% rename from racket/lib/collects/mzlib/pregexp.rkt rename to pkgs/compatibility-lib/mzlib/pregexp.rkt diff --git a/racket/lib/collects/mzlib/pretty.rkt b/pkgs/compatibility-lib/mzlib/pretty.rkt similarity index 100% rename from racket/lib/collects/mzlib/pretty.rkt rename to pkgs/compatibility-lib/mzlib/pretty.rkt diff --git a/racket/lib/collects/mzlib/private/package-helper.rkt b/pkgs/compatibility-lib/mzlib/private/package-helper.rkt similarity index 100% rename from racket/lib/collects/mzlib/private/package-helper.rkt rename to pkgs/compatibility-lib/mzlib/private/package-helper.rkt diff --git a/racket/lib/collects/mzlib/private/structure-helper.rkt b/pkgs/compatibility-lib/mzlib/private/structure-helper.rkt similarity index 100% rename from racket/lib/collects/mzlib/private/structure-helper.rkt rename to pkgs/compatibility-lib/mzlib/private/structure-helper.rkt diff --git a/racket/lib/collects/mzlib/private/stxparamkey.rkt b/pkgs/compatibility-lib/mzlib/private/stxparamkey.rkt similarity index 100% rename from racket/lib/collects/mzlib/private/stxparamkey.rkt rename to pkgs/compatibility-lib/mzlib/private/stxparamkey.rkt diff --git a/racket/lib/collects/mzlib/private/stxset.rkt b/pkgs/compatibility-lib/mzlib/private/stxset.rkt similarity index 100% rename from racket/lib/collects/mzlib/private/stxset.rkt rename to pkgs/compatibility-lib/mzlib/private/stxset.rkt diff --git a/racket/lib/collects/mzlib/process.rkt b/pkgs/compatibility-lib/mzlib/process.rkt similarity index 100% rename from racket/lib/collects/mzlib/process.rkt rename to pkgs/compatibility-lib/mzlib/process.rkt diff --git a/racket/lib/collects/mzlib/restart.rkt b/pkgs/compatibility-lib/mzlib/restart.rkt similarity index 100% rename from racket/lib/collects/mzlib/restart.rkt rename to pkgs/compatibility-lib/mzlib/restart.rkt diff --git a/racket/lib/collects/mzlib/runtime-path.rkt b/pkgs/compatibility-lib/mzlib/runtime-path.rkt similarity index 100% rename from racket/lib/collects/mzlib/runtime-path.rkt rename to pkgs/compatibility-lib/mzlib/runtime-path.rkt diff --git a/racket/lib/collects/mzlib/sendevent.rkt b/pkgs/compatibility-lib/mzlib/sendevent.rkt similarity index 100% rename from racket/lib/collects/mzlib/sendevent.rkt rename to pkgs/compatibility-lib/mzlib/sendevent.rkt diff --git a/racket/lib/collects/mzlib/serialize.rkt b/pkgs/compatibility-lib/mzlib/serialize.rkt similarity index 100% rename from racket/lib/collects/mzlib/serialize.rkt rename to pkgs/compatibility-lib/mzlib/serialize.rkt diff --git a/racket/lib/collects/mzlib/shared.rkt b/pkgs/compatibility-lib/mzlib/shared.rkt similarity index 100% rename from racket/lib/collects/mzlib/shared.rkt rename to pkgs/compatibility-lib/mzlib/shared.rkt diff --git a/racket/lib/collects/mzlib/string.rkt b/pkgs/compatibility-lib/mzlib/string.rkt similarity index 100% rename from racket/lib/collects/mzlib/string.rkt rename to pkgs/compatibility-lib/mzlib/string.rkt diff --git a/racket/lib/collects/mzlib/struct.rkt b/pkgs/compatibility-lib/mzlib/struct.rkt similarity index 100% rename from racket/lib/collects/mzlib/struct.rkt rename to pkgs/compatibility-lib/mzlib/struct.rkt diff --git a/racket/lib/collects/mzlib/stxparam.rkt b/pkgs/compatibility-lib/mzlib/stxparam.rkt similarity index 100% rename from racket/lib/collects/mzlib/stxparam.rkt rename to pkgs/compatibility-lib/mzlib/stxparam.rkt diff --git a/racket/lib/collects/mzlib/surrogate.rkt b/pkgs/compatibility-lib/mzlib/surrogate.rkt similarity index 100% rename from racket/lib/collects/mzlib/surrogate.rkt rename to pkgs/compatibility-lib/mzlib/surrogate.rkt diff --git a/racket/lib/collects/mzlib/tar.rkt b/pkgs/compatibility-lib/mzlib/tar.rkt similarity index 100% rename from racket/lib/collects/mzlib/tar.rkt rename to pkgs/compatibility-lib/mzlib/tar.rkt diff --git a/racket/lib/collects/mzlib/thread.rkt b/pkgs/compatibility-lib/mzlib/thread.rkt similarity index 99% rename from racket/lib/collects/mzlib/thread.rkt rename to pkgs/compatibility-lib/mzlib/thread.rkt index a87030814a..c93506a5e9 100644 --- a/racket/lib/collects/mzlib/thread.rkt +++ b/pkgs/compatibility-lib/mzlib/thread.rkt @@ -1,6 +1,6 @@ (module thread mzscheme - (require "kw.rkt" "contract.rkt" racket/engine) + (require mzlib/kw mzlib/contract racket/engine) (provide run-server consumer-thread diff --git a/racket/lib/collects/mzlib/trace.rkt b/pkgs/compatibility-lib/mzlib/trace.rkt similarity index 100% rename from racket/lib/collects/mzlib/trace.rkt rename to pkgs/compatibility-lib/mzlib/trace.rkt diff --git a/racket/lib/collects/mzlib/traceld.rkt b/pkgs/compatibility-lib/mzlib/traceld.rkt similarity index 100% rename from racket/lib/collects/mzlib/traceld.rkt rename to pkgs/compatibility-lib/mzlib/traceld.rkt diff --git a/racket/lib/collects/mzlib/trait.rkt b/pkgs/compatibility-lib/mzlib/trait.rkt similarity index 100% rename from racket/lib/collects/mzlib/trait.rkt rename to pkgs/compatibility-lib/mzlib/trait.rkt diff --git a/racket/lib/collects/mzlib/transcr.rkt b/pkgs/compatibility-lib/mzlib/transcr.rkt similarity index 100% rename from racket/lib/collects/mzlib/transcr.rkt rename to pkgs/compatibility-lib/mzlib/transcr.rkt diff --git a/racket/lib/collects/mzlib/unit-exptime.rkt b/pkgs/compatibility-lib/mzlib/unit-exptime.rkt similarity index 100% rename from racket/lib/collects/mzlib/unit-exptime.rkt rename to pkgs/compatibility-lib/mzlib/unit-exptime.rkt diff --git a/racket/lib/collects/mzlib/unit.rkt b/pkgs/compatibility-lib/mzlib/unit.rkt similarity index 100% rename from racket/lib/collects/mzlib/unit.rkt rename to pkgs/compatibility-lib/mzlib/unit.rkt diff --git a/racket/lib/collects/mzlib/unitsig.rkt b/pkgs/compatibility-lib/mzlib/unitsig.rkt similarity index 100% rename from racket/lib/collects/mzlib/unitsig.rkt rename to pkgs/compatibility-lib/mzlib/unitsig.rkt diff --git a/racket/lib/collects/mzlib/zip.rkt b/pkgs/compatibility-lib/mzlib/zip.rkt similarity index 100% rename from racket/lib/collects/mzlib/zip.rkt rename to pkgs/compatibility-lib/mzlib/zip.rkt diff --git a/pkgs/pconvert-lib/mzlib/pconvert.rkt b/pkgs/pconvert-lib/mzlib/pconvert.rkt index 0557cbe0a9..51f6788c12 100644 --- a/pkgs/pconvert-lib/mzlib/pconvert.rkt +++ b/pkgs/pconvert-lib/mzlib/pconvert.rkt @@ -4,7 +4,7 @@ (require (only racket/base sort) compatibility/mlist "pconvert-prop.rkt" - "class.rkt") + racket/class) (provide show-sharing constructor-style-printing diff --git a/racket/lib/collects/compiler/bundle-dist.rkt b/racket/lib/collects/compiler/bundle-dist.rkt index 02a671be4f..e7b596d260 100644 --- a/racket/lib/collects/compiler/bundle-dist.rkt +++ b/racket/lib/collects/compiler/bundle-dist.rkt @@ -1,10 +1,11 @@ (module bundle-dist mzscheme - (require mzlib/etc - mzlib/file - mzlib/process - mzlib/zip - mzlib/tar) + (require racket/file + (only racket/base lambda) + racket/path + racket/system + file/zip + file/tar) (provide bundle-put-file-extension+style+filters bundle-directory) @@ -61,7 +62,7 @@ (lambda () (delete-directory/files temp-dir)))))) (define bundle-directory - (opt-lambda (target dir [for-exe? #f]) + (lambda (target dir [for-exe? #f]) (let ([target (add-suffix target (bundle-file-suffix))]) (case (system-type) [(macosx) diff --git a/racket/lib/collects/compiler/commands/ctool.rkt b/racket/lib/collects/compiler/commands/ctool.rkt index 9c8163ff11..210f241d9b 100644 --- a/racket/lib/collects/compiler/commands/ctool.rkt +++ b/racket/lib/collects/compiler/commands/ctool.rkt @@ -8,7 +8,7 @@ (require (prefix-in compiler:option: "../option.rkt") "../compiler.rkt" raco/command-name - mzlib/cmdline + racket/cmdline dynext/file dynext/compile dynext/link diff --git a/racket/lib/collects/compiler/compiler.rkt b/racket/lib/collects/compiler/compiler.rkt index aeb379927c..044ae7fb57 100644 --- a/racket/lib/collects/compiler/compiler.rkt +++ b/racket/lib/collects/compiler/compiler.rkt @@ -1,5 +1,5 @@ (module compiler mzscheme - (require mzlib/unit) + (require racket/unit) (require "sig.rkt") diff --git a/racket/lib/collects/compiler/distribute.rkt b/racket/lib/collects/compiler/distribute.rkt index 18f23625c1..ec2fd3df91 100644 --- a/racket/lib/collects/compiler/distribute.rkt +++ b/racket/lib/collects/compiler/distribute.rkt @@ -2,7 +2,7 @@ (require scheme/file scheme/path setup/dirs - mzlib/list + racket/list setup/variant dynext/filename-version "private/macfw.rkt" diff --git a/racket/lib/collects/compiler/embed-sig.rkt b/racket/lib/collects/compiler/embed-sig.rkt index a5e949c9a8..e7cac31ad2 100644 --- a/racket/lib/collects/compiler/embed-sig.rkt +++ b/racket/lib/collects/compiler/embed-sig.rkt @@ -1,6 +1,6 @@ (module embed-sig mzscheme - (require mzlib/unit) + (require racket/unit) (provide compiler:embed^) (define-signature compiler:embed^ diff --git a/racket/lib/collects/compiler/main.rkt b/racket/lib/collects/compiler/main.rkt index 509ea59b6a..e33b27da57 100644 --- a/racket/lib/collects/compiler/main.rkt +++ b/racket/lib/collects/compiler/main.rkt @@ -25,7 +25,7 @@ "compiler.rkt") ;; Read argv array for arguments and input file name -(require mzlib/cmdline +(require racket/cmdline dynext/file dynext/compile dynext/link diff --git a/racket/lib/collects/compiler/option-unit.rkt b/racket/lib/collects/compiler/option-unit.rkt index f88eade616..c50abf4c4b 100644 --- a/racket/lib/collects/compiler/option-unit.rkt +++ b/racket/lib/collects/compiler/option-unit.rkt @@ -1,6 +1,6 @@ #lang mzscheme -(require mzlib/unit) +(require racket/unit) (require "sig.rkt") (provide compiler:option@) diff --git a/racket/lib/collects/compiler/option.rkt b/racket/lib/collects/compiler/option.rkt index 86d93efb59..debd346a87 100644 --- a/racket/lib/collects/compiler/option.rkt +++ b/racket/lib/collects/compiler/option.rkt @@ -1,5 +1,5 @@ (module option mzscheme - (require mzlib/unit) + (require racket/unit) (require "sig.rkt" "option-unit.rkt") diff --git a/racket/lib/collects/compiler/private/configdir.rkt b/racket/lib/collects/compiler/private/configdir.rkt index ba2d024044..4ef24658b5 100644 --- a/racket/lib/collects/compiler/private/configdir.rkt +++ b/racket/lib/collects/compiler/private/configdir.rkt @@ -1,5 +1,5 @@ #lang racket/base -(require mzlib/port) +(require racket/port) (provide update-config-dir get-current-config-dir) diff --git a/racket/lib/collects/compiler/private/macfw.rkt b/racket/lib/collects/compiler/private/macfw.rkt index 374fd19527..10680dc2fa 100644 --- a/racket/lib/collects/compiler/private/macfw.rkt +++ b/racket/lib/collects/compiler/private/macfw.rkt @@ -1,7 +1,8 @@ (module macfw mzscheme (require "mach-o.rkt" - mzlib/string - mzlib/process) + racket/string + (only racket/base regexp-quote) + racket/system) (provide update-framework-path get-current-framework-path diff --git a/racket/lib/collects/compiler/private/windlldir.rkt b/racket/lib/collects/compiler/private/windlldir.rkt index afe93380fc..54a565ab7a 100644 --- a/racket/lib/collects/compiler/private/windlldir.rkt +++ b/racket/lib/collects/compiler/private/windlldir.rkt @@ -1,5 +1,5 @@ (module windlldir mzscheme - (require mzlib/port + (require racket/port "winutf16.rkt") (provide update-dll-dir diff --git a/racket/lib/collects/compiler/private/xform.rkt b/racket/lib/collects/compiler/private/xform.rkt index 739346e60b..05ce53a148 100644 --- a/racket/lib/collects/compiler/private/xform.rkt +++ b/racket/lib/collects/compiler/private/xform.rkt @@ -1,7 +1,7 @@ (module xform mzscheme - (require mzlib/list - mzlib/etc - mzlib/process) + (require racket/list + (only racket/base sort filter remove let) + racket/system) (provide xform) @@ -17,7 +17,7 @@ (parameterize ([current-output-port (current-output-port)] ; because we mutate these... [error-escape-handler (error-escape-handler)] [current-inspector (current-inspector)]) - (begin-with-definitions + (let () (define power-inspector (current-inspector)) (current-inspector (make-inspector)) diff --git a/racket/lib/collects/compiler/sig.rkt b/racket/lib/collects/compiler/sig.rkt index 63267b13c5..860a07eb70 100644 --- a/racket/lib/collects/compiler/sig.rkt +++ b/racket/lib/collects/compiler/sig.rkt @@ -1,7 +1,7 @@ #lang mzscheme -(require mzlib/unit) +(require racket/unit) (provide compiler:option^ compiler^) diff --git a/racket/lib/collects/compiler/zo-structs.rkt b/racket/lib/collects/compiler/zo-structs.rkt index 1221cdad02..52be542051 100644 --- a/racket/lib/collects/compiler/zo-structs.rkt +++ b/racket/lib/collects/compiler/zo-structs.rkt @@ -1,6 +1,5 @@ #lang scheme/base -(require mzlib/etc - scheme/match +(require scheme/match scheme/contract scheme/list racket/set) diff --git a/racket/lib/collects/dynext/compile-sig.rkt b/racket/lib/collects/dynext/compile-sig.rkt index 722b4fab43..4a82b1dc57 100644 --- a/racket/lib/collects/dynext/compile-sig.rkt +++ b/racket/lib/collects/dynext/compile-sig.rkt @@ -1,6 +1,5 @@ - (module compile-sig mzscheme - (require mzlib/unit) + (require racket/unit) (provide dynext:compile^) diff --git a/racket/lib/collects/dynext/compile-unit.rkt b/racket/lib/collects/dynext/compile-unit.rkt index c602b70eab..39b2e8a955 100644 --- a/racket/lib/collects/dynext/compile-unit.rkt +++ b/racket/lib/collects/dynext/compile-unit.rkt @@ -1,7 +1,6 @@ (module compile-unit mzscheme - (require mzlib/unit - mzlib/process - mzlib/sendevent + (require racket/unit + racket/system "private/dirs.rkt" "private/stdio.rkt" "private/cmdargs.rkt") diff --git a/racket/lib/collects/dynext/compile.rkt b/racket/lib/collects/dynext/compile.rkt index 8770b80aab..e788c31209 100644 --- a/racket/lib/collects/dynext/compile.rkt +++ b/racket/lib/collects/dynext/compile.rkt @@ -1,5 +1,5 @@ (module compile mzscheme - (require mzlib/unit) + (require racket/unit) (require "compile-sig.rkt" "compile-unit.rkt") diff --git a/racket/lib/collects/dynext/file-sig.rkt b/racket/lib/collects/dynext/file-sig.rkt index 28ae608450..27c53282d8 100644 --- a/racket/lib/collects/dynext/file-sig.rkt +++ b/racket/lib/collects/dynext/file-sig.rkt @@ -1,6 +1,6 @@ (module file-sig mzscheme - (require mzlib/unit) + (require racket/unit) (provide dynext:file^) diff --git a/racket/lib/collects/dynext/file.rkt b/racket/lib/collects/dynext/file.rkt index ce1d1abd19..80469f122d 100644 --- a/racket/lib/collects/dynext/file.rkt +++ b/racket/lib/collects/dynext/file.rkt @@ -1,5 +1,5 @@ (module file mzscheme - (require mzlib/unit) + (require racket/unit) (require "file-sig.rkt" "file-unit.rkt") diff --git a/racket/lib/collects/dynext/link-sig.rkt b/racket/lib/collects/dynext/link-sig.rkt index e2ad5a4dbd..3c659ae29d 100644 --- a/racket/lib/collects/dynext/link-sig.rkt +++ b/racket/lib/collects/dynext/link-sig.rkt @@ -1,6 +1,5 @@ - (module link-sig mzscheme - (require mzlib/unit) + (require racket/unit) (provide dynext:link^) diff --git a/racket/lib/collects/dynext/link-unit.rkt b/racket/lib/collects/dynext/link-unit.rkt index 740484d7c2..2fad99f61d 100644 --- a/racket/lib/collects/dynext/link-unit.rkt +++ b/racket/lib/collects/dynext/link-unit.rkt @@ -1,7 +1,6 @@ (module link-unit mzscheme - (require mzlib/unit - mzlib/process - mzlib/sendevent + (require racket/unit + racket/system "private/dirs.rkt" "private/stdio.rkt" "private/cmdargs.rkt" diff --git a/racket/lib/collects/dynext/link.rkt b/racket/lib/collects/dynext/link.rkt index c330b86a1e..f0cb941cb5 100644 --- a/racket/lib/collects/dynext/link.rkt +++ b/racket/lib/collects/dynext/link.rkt @@ -1,5 +1,5 @@ (module link mzscheme - (require mzlib/unit) + (require racket/unit) (require "link-sig.rkt" "link-unit.rkt") diff --git a/racket/lib/collects/file/zip.rkt b/racket/lib/collects/file/zip.rkt index 03c2b5fe2d..9d6e53a046 100644 --- a/racket/lib/collects/file/zip.rkt +++ b/racket/lib/collects/file/zip.rkt @@ -1,7 +1,8 @@ ;; A modification of Dave Herman's zip module (module zip mzscheme - (require mzlib/deflate racket/file mzlib/kw) + (require file/gzip racket/file + (only racket/base define)) ;; =========================================================================== ;; DATA DEFINITIONS @@ -246,7 +247,7 @@ ;; zip-write : (listof relative-path) -> ;; writes a zip file to current-output-port (provide zip->output) - (define/kw (zip->output files #:optional [out (current-output-port)]) + (define (zip->output files [out (current-output-port)]) (parameterize ([current-output-port out]) (let* ([seekable? (seekable-port? (current-output-port))] [headers ; note: Racket's `map' is always left-to-right diff --git a/racket/lib/collects/planet/private/cmdline-tool.rkt b/racket/lib/collects/planet/private/cmdline-tool.rkt index be7dfd4626..cea885b1b0 100644 --- a/racket/lib/collects/planet/private/cmdline-tool.rkt +++ b/racket/lib/collects/planet/private/cmdline-tool.rkt @@ -11,7 +11,6 @@ PLANNED FEATURES: racket/file racket/match raco/command-name - (only-in mzlib/string read-from-string) "../config.rkt" "planet-shared.rkt" @@ -22,6 +21,11 @@ PLANNED FEATURES: (define erase? (make-parameter #f)) (define displayer (make-parameter (λ () (show-installed-packages)))) (define quiet-unlink? (make-parameter #f)) + + (define (read-from-string str) + (read + (if (bytes? str) (open-input-bytes str) (open-input-string str)))) + (define (start raco?) diff --git a/racket/lib/collects/planet/private/parsereq.rkt b/racket/lib/collects/planet/private/parsereq.rkt index f83cc588fe..af66ccf5a9 100644 --- a/racket/lib/collects/planet/private/parsereq.rkt +++ b/racket/lib/collects/planet/private/parsereq.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require mzlib/match +(require racket/match "short-syntax-helpers.rkt" "data.rkt") @@ -52,7 +52,7 @@ ;; maps the given require spec to a planet package request structure (define (spec->req spec stx) (match (cdr spec) - [(file-name pkg-spec path ...) + [(list file-name pkg-spec path ...) (unless (string? file-name) (raise-syntax-error #f (format "File name: expected a string, received: ~s" file-name) stx)) (unless (andmap string? path) @@ -63,7 +63,7 @@ (make-request (pkg-spec->full-pkg-spec pkg-spec stx) file-name path)] - [((? (lambda (x) (or (symbol? x) (string? x))) s)) + [(list (? (lambda (x) (or (symbol? x) (string? x))) s)) (let ([str (if (symbol? s) (symbol->string s) s)]) (define (yell msg) (λ (str) (raise-syntax-error #f (format msg str) stx))) (let* ([pkg-spec/tail (short-pkg-string->spec str yell)] @@ -101,12 +101,12 @@ (fail* (format "Invalid PLaneT package specifier: ~e" spec))) (match spec - [((? string? owner) (? string? package) ver-spec ...) - (match-let ([(maj min-lo min-hi) (version->bounds ver-spec fail*)]) + [(list (? string? owner) (? string? package) ver-spec ...) + (match-let ([(list maj min-lo min-hi) (version->bounds ver-spec fail*)]) (pkg package maj min-lo min-hi (list owner)))] - [((? (o not string?) owner) _ ...) + [(list (? (o not string?) owner) _ ...) (fail* (format "Expected string [package owner] in first position, received: ~e" owner))] - [(_ (? (o not string?) pkg) _ ...) + [(list _ (? (o not string?) pkg) _ ...) (fail* (format "Expected string [package name] in second position, received: ~e" pkg))] [_ (fail)])) @@ -117,37 +117,37 @@ ;; be in a list by itself, because that's slightly more convenient for the above fn] (define (version->bounds spec-list fail) (match spec-list - [() (list #f 0 #f)] + [(list) (list #f 0 #f)] [(? number? maj) (version->bounds (list maj))] - [((? number? maj)) (list maj 0 #f)] - [((? number? maj) min-spec) + [(list (? number? maj)) (list maj 0 #f)] + [(list (? number? maj) min-spec) (let ((pkg (lambda (min max) (list maj min max)))) (match min-spec [(? number? min) (pkg min #f)] - [((? number? lo) (? number? hi)) (pkg lo hi)] - [('= (? number? min)) (pkg min min)] - [('+ (? number? min)) (pkg min #f)] - [('- (? number? min)) (pkg 0 min)] + [(list (? number? lo) (? number? hi)) (pkg lo hi)] + [(list '= (? number? min)) (pkg min min)] + [(list '+ (? number? min)) (pkg min #f)] + [(list '- (? number? min)) (pkg 0 min)] ;; failure cases [(? (o/and (o not number?) (o/or (o not list?) (λ (x) (not (= (length x) 2)))))) (fail (format "Expected number or version range specifier for minor version specification, received: ~e" min-spec))] - [((? (λ (x) - (and (not (number? x)) - (not (memq x '(= + -))))) - range) + [(list (? (λ (x) + (and (not (number? x)) + (not (memq x '(= + -))))) + range) _) (fail (format "Illegal range specifier in minor version specification. Legal range specifiers are numbers, =, +, -; given: ~e" range))] - [(_ (? (o not number?) bnd)) + [(list _ (? (o not number?) bnd)) (fail (format "Expected number as range bound in minor version specification, given: ~e" bnd))] [_ (fail (format "Illegal minor version specification: ~e" min-spec))]))] ;; failure cases [(? (o/and (o not number?) (o not list?)) v) (fail (format "Version specification expected number or sequence, received: ~e" v))] - [((? (o not number?) maj) _ ...) + [(list (? (o not number?) maj) _ ...) (fail (format "Version specification expected number for major version, received: ~e" maj))] [_ (fail "Invalid version specification")])) diff --git a/racket/lib/collects/planet/private/planet-shared.rkt b/racket/lib/collects/planet/private/planet-shared.rkt index c6c279e4d7..01d044ad7e 100644 --- a/racket/lib/collects/planet/private/planet-shared.rkt +++ b/racket/lib/collects/planet/private/planet-shared.rkt @@ -6,7 +6,7 @@ Various common pieces of code that both the client and server need to access |# (require (only-in racket/path path-only) - mzlib/port + racket/port racket/file setup/getinfo (prefix-in srfi1: srfi/1) diff --git a/racket/lib/collects/planet/private/version.rkt b/racket/lib/collects/planet/private/version.rkt index 82eb855da9..ff06d0888c 100644 --- a/racket/lib/collects/planet/private/version.rkt +++ b/racket/lib/collects/planet/private/version.rkt @@ -4,7 +4,6 @@ racket/match unstable/syntax racket/syntax - mzlib/etc "../planet-archives.rkt") (provide this-package-version diff --git a/racket/lib/collects/racket/include.rkt b/racket/lib/collects/racket/include.rkt index 9f0aabfe79..be0a869e98 100644 --- a/racket/lib/collects/racket/include.rkt +++ b/racket/lib/collects/racket/include.rkt @@ -2,7 +2,7 @@ (require (for-syntax racket/base syntax/path-spec - mzlib/private/increader + "private/increader.rkt" compiler/cm-accomplice)) (provide include diff --git a/racket/lib/collects/racket/private/class-internal.rkt b/racket/lib/collects/racket/private/class-internal.rkt index ad46528c83..c6fb9b80ee 100644 --- a/racket/lib/collects/racket/private/class-internal.rkt +++ b/racket/lib/collects/racket/private/class-internal.rkt @@ -1,6 +1,5 @@ #lang racket/base (require (for-syntax racket/base) - mzlib/etc racket/contract/base racket/contract/combinator (only-in racket/contract/region current-contract-region) @@ -2455,9 +2454,9 @@ (vector-set! super-methods index method) (vector-set! int-methods index (vector method)) (vector-set! beta-methods index (vector)) - (vector-set! inner-projs index identity) + (vector-set! inner-projs index values) (vector-set! dynamic-idxs index 0) - (vector-set! dynamic-projs index (vector identity))) + (vector-set! dynamic-projs index (vector values))) (append new-augonly-indices new-final-indices new-abstract-indices new-normal-indices) new-methods) @@ -2517,7 +2516,7 @@ (let ([v (list->vector (append (vector->list (vector-ref beta-methods index)) (list #f)))]) ;; Since this starts a new part of the chain, reset the projection. - (vector-set! inner-projs index identity) + (vector-set! inner-projs index values) (vector-set! beta-methods index v)))) augonly-names) ;; Mark final methods: @@ -3114,7 +3113,7 @@ An example [old-int-vec (vector-ref int-methods i)]) (vector-set! dynamic-idxs i new-idx) (vector-copy! new-proj-vec 0 old-proj-vec) - (vector-set! new-proj-vec new-idx identity) + (vector-set! new-proj-vec new-idx values) (vector-set! dynamic-projs i new-proj-vec) (vector-copy! new-int-vec 0 old-int-vec) ;; Just copy over the last entry here. We'll @@ -4760,7 +4759,7 @@ An example "class" c))) (define object->vector - (opt-lambda (in-o [opaque-v '...]) + (lambda (in-o [opaque-v '...]) (unless (object? in-o) (raise-argument-error 'object->vector "object?" in-o)) (let ([o in-o]) diff --git a/racket/lib/collects/mzlib/private/increader.rkt b/racket/lib/collects/racket/private/increader.rkt similarity index 100% rename from racket/lib/collects/mzlib/private/increader.rkt rename to racket/lib/collects/racket/private/increader.rkt diff --git a/racket/lib/collects/racket/trait.rkt b/racket/lib/collects/racket/trait.rkt index 8097ea732e..875fe94b50 100644 --- a/racket/lib/collects/racket/trait.rkt +++ b/racket/lib/collects/racket/trait.rkt @@ -1,8 +1,9 @@ (module trait mzscheme - (require mzlib/class - mzlib/list - mzlib/struct) - (require-for-syntax mzlib/list + (require racket/class + racket/list + (only racket/base sort filter struct-copy)) + (require-for-syntax racket/list + (only racket/base filter) syntax/stx syntax/boundmap syntax/kerncase @@ -657,8 +658,8 @@ (validate-trait 'trait-alias (make-trait - (cons (copy-struct method m - [method-name new-name]) + (cons (struct-copy method m + [name new-name]) (trait-methods t)) (trait-fields t))))) @@ -673,11 +674,11 @@ 'trait-rename (make-trait (map (lambda (m) - (copy-struct method m - [method-name (rename (method-name m))] - [method-need-inherit (map rename (method-need-inherit m))] - [method-need-super (map rename (method-need-super m))] - [method-need-inner (map rename (method-need-inner m))])) + (struct-copy method m + [name (rename (method-name m))] + [need-inherit (map rename (method-need-inherit m))] + [need-super (map rename (method-need-super m))] + [need-inner (map rename (method-need-inner m))])) (trait-methods t)) (trait-fields t))))) @@ -692,12 +693,12 @@ 'trait-rename (make-trait (map (lambda (m) - (copy-struct method m - [method-need-field (map rename (method-need-field m))])) + (struct-copy method m + [need-field (map rename (method-need-field m))])) (trait-methods t)) (map (lambda (f) - (copy-struct feeld f - [feeld-name (rename (feeld-name f))])) + (struct-copy feeld f + [name (rename (feeld-name f))])) (trait-fields t)))))) (define-syntax define-trait-alias diff --git a/racket/lib/collects/setup/option-sig.rkt b/racket/lib/collects/setup/option-sig.rkt index aa4f6abb4c..8dad393247 100644 --- a/racket/lib/collects/setup/option-sig.rkt +++ b/racket/lib/collects/setup/option-sig.rkt @@ -1,6 +1,6 @@ (module option-sig mzscheme - (require mzlib/unit) + (require racket/unit) (provide setup-option^) diff --git a/racket/lib/collects/setup/setup-go.rkt b/racket/lib/collects/setup/setup-go.rkt index 24f72ab735..eeb68160f5 100644 --- a/racket/lib/collects/setup/setup-go.rkt +++ b/racket/lib/collects/setup/setup-go.rkt @@ -1,6 +1,6 @@ (module setup-go mzscheme (require "setup-cmdline.rkt" - mzlib/unit + racket/unit "option-sig.rkt" "setup-unit.rkt" diff --git a/racket/lib/collects/setup/winvers.rkt b/racket/lib/collects/setup/winvers.rkt index 7d9dcd907d..0c8a96e43d 100644 --- a/racket/lib/collects/setup/winvers.rkt +++ b/racket/lib/collects/setup/winvers.rkt @@ -3,7 +3,7 @@ #lang scheme/base -(require mzlib/file "main-collects.rkt" "dirs.rkt") +(require racket/file "main-collects.rkt" "dirs.rkt") (define (make-copy) (let* ([tmpdir (find-system-path 'temp-dir)] diff --git a/racket/lib/collects/srfi/13/string.rkt b/racket/lib/collects/srfi/13/string.rkt index 40cdb5e600..c970ed2b5c 100644 --- a/racket/lib/collects/srfi/13/string.rkt +++ b/racket/lib/collects/srfi/13/string.rkt @@ -88,10 +88,9 @@ #lang mzscheme (require srfi/optional + (only racket/base lambda) srfi/8/receive - srfi/14/char-set - mzlib/etc ; for opt-lambda (instead of let-optionals*) - ) + srfi/14/char-set) (provide ;; String procedures: string-map string-map! @@ -397,7 +396,7 @@ ;; chars over from the chunk buffers. (define string-unfold - (opt-lambda (p f g seed (base "") (make-final (lambda (x) ""))) + (lambda (p f g seed (base "") (make-final (lambda (x) ""))) (check-arg procedure? p 'string-unfold) (check-arg procedure? f 'string-unfold) (check-arg procedure? g 'string-unfold) @@ -445,7 +444,7 @@ ans)))))) (define string-unfold-right - (opt-lambda (p f g seed (base "") (make-final (lambda (x) ""))) + (lambda (p f g seed (base "") (make-final (lambda (x) ""))) (check-arg string? base 'string-unfold-right) (check-arg procedure? make-final 'string-unfold-right) (let lp ((chunks '()) ; Previously filled chunks @@ -897,7 +896,7 @@ ;; Hash (define string-hash - (opt-lambda (s (bound 0) . rest) + (lambda (s (bound 0) . rest) (check-arg (lambda (x) (and (integer? x) (exact? x) @@ -913,7 +912,7 @@ (apply substring/shared s rest)))))) (define string-hash-ci - (opt-lambda (s (bound 0) . rest) + (lambda (s (bound 0) . rest) (check-arg (lambda (x) (and (integer? x) (exact? x) @@ -1031,21 +1030,21 @@ (define string-trim - (opt-lambda (s (criterion char-set:whitespace) . rest) + (lambda (s (criterion char-set:whitespace) . rest) (let-string-start+end (start end) 'string-trim s rest (cond ((string-skip s criterion start end) => (lambda (i) (%substring/shared s i end))) (else ""))))) (define string-trim-right - (opt-lambda (s (criterion char-set:whitespace) . rest) + (lambda (s (criterion char-set:whitespace) . rest) (let-string-start+end (start end) 'string-trim-right s rest (cond ((string-skip-right s criterion start end) => (lambda (i) (%substring/shared s 0 (+ 1 i)))) (else ""))))) (define string-trim-both - (opt-lambda (s (criterion char-set:whitespace) . rest) + (lambda (s (criterion char-set:whitespace) . rest) (let-string-start+end (start end) 'string-trim-both s rest (cond ((string-skip s criterion start end) => (lambda (i) @@ -1053,7 +1052,7 @@ (else ""))))) (define string-pad-right - (opt-lambda (s n (char #\space) . rest) + (lambda (s n (char #\space) . rest) (check-arg char? char 'string-pad-right) (let-string-start+end (start end) 'string-pad-right s rest (check-arg (lambda (n) (and (integer? n) (exact? n) (<= 0 n))) @@ -1066,7 +1065,7 @@ ans)))))) (define string-pad - (opt-lambda (s n (char #\space) . rest) + (lambda (s n (char #\space) . rest) (check-arg char? char 'string-pad) (let-string-start+end (start end) 'string-pad s rest (check-arg (lambda (n) (and (integer? n) (exact? n) (<= 0 n))) @@ -1454,7 +1453,7 @@ ;; for speed. (define string-kmp-partial-search - (opt-lambda (pat rv s i (c= char=?) (p-start 0) . start+end) + (lambda (pat rv s i (c= char=?) (p-start 0) . start+end) (check-arg procedure? c= 'string-kmp-partial-search) (check-arg vector? rv 'string-kmp-partial-search) (check-arg (lambda (x) @@ -1609,7 +1608,7 @@ ;; (cons (substring final-string 0 end) string-list))) (define string-concatenate-reverse - (opt-lambda (string-list (final "") (end (string-length final))) + (lambda (string-list (final "") (end (string-length final))) (check-arg string? final 'string-concatenate-reverse) (check-arg (lambda (x) (and (integer? x) (exact? x) (<= 0 x (string-length final)))) @@ -1622,7 +1621,7 @@ (%finish-string-concatenate-reverse len string-list final end)))) (define string-concatenate-reverse/shared - (opt-lambda (string-list (final "") (end (string-length final))) + (lambda (string-list (final "") (end (string-length final))) (check-arg string? final 'string-concatenate-reverse/shared) (check-arg (lambda (x) (and (integer? x) (exact? x) (<= 0 x (string-length final)))) @@ -1686,7 +1685,7 @@ ;; (string-tokenize "hello, world") => ("hello," "world") (define string-tokenize - (opt-lambda (s (token-chars char-set:graphic) . rest) + (lambda (s (token-chars char-set:graphic) . rest) (check-arg char-set? token-chars 'string-tokenize) (let-string-start+end (start end) 'string-tokenize s rest (let lp ((i end) (ans '())) @@ -1842,7 +1841,7 @@ ;; STRING-CONCATENATE is less efficient. (define string-join - (opt-lambda (strings (delim " ") (grammar 'infix)) + (lambda (strings (delim " ") (grammar 'infix)) (check-arg string? delim 'string-join) (let ((buildit (lambda (lis final) (let recur ((lis lis)) diff --git a/racket/lib/collects/srfi/14/char-set.rkt b/racket/lib/collects/srfi/14/char-set.rkt index cbdeed27f7..2a889d9d04 100644 --- a/racket/lib/collects/srfi/14/char-set.rkt +++ b/racket/lib/collects/srfi/14/char-set.rkt @@ -4,7 +4,7 @@ ;; the code and tests are a lot better than they would be. (module char-set mzscheme - (require mzlib/integer-set + (require data/integer-set racket/contract) ;; Data defn ---------------------------------------- @@ -237,15 +237,15 @@ (case-lambda [(cs char1) (let ([v (char->integer char1)]) - (make-char-set (difference (char-set-set cs) - (make-integer-set (list (cons v v))))))] + (make-char-set (subtract (char-set-set cs) + (make-integer-set (list (cons v v))))))] [(cs . more) (fold-set char-set-delete cs more)])) (define (char-set-complement cs) (make-char-set - (difference (complement (char-set-set cs) 0 #x10FFFF) - (make-range #xD800 #xDFFF)))) + (subtract (complement (char-set-set cs) 0 #x10FFFF) + (make-range #xD800 #xDFFF)))) (define-syntax define-set-op (syntax-rules () @@ -264,10 +264,10 @@ (define char-set-difference (case-lambda [(cs1 cs2) - (make-char-set (difference (char-set-set cs1) (char-set-set cs2)))] + (make-char-set (subtract (char-set-set cs1) (char-set-set cs2)))] [(cs1 . more) (fold-set char-set-difference cs1 more)])) - (define-set-op char-set-xor xor char-set:empty) + (define-set-op char-set-xor symmetric-difference char-set:empty) (define char-set-diff+intersection (case-lambda diff --git a/racket/lib/collects/srfi/29/localization.rkt b/racket/lib/collects/srfi/29/localization.rkt index 4312486682..8065183b35 100644 --- a/racket/lib/collects/srfi/29/localization.rkt +++ b/racket/lib/collects/srfi/29/localization.rkt @@ -1,9 +1,9 @@ (module localization mzscheme (require mzlib/contract - mzlib/file - mzlib/runtime-path - mzlib/string + racket/file + (only racket/runtime-path define-runtime-path) + racket/string racket/format syntax/modread) (provide/contract (current-language (parameter/c symbol?)) @@ -55,7 +55,7 @@ (define (make-name bundle-specifier) (string->symbol (string-append "srfi-29:" - (expr->string bundle-specifier)))) + (~v bundle-specifier)))) (define (declare-bundle! bundle-specifier bundle-assoc-list) (hash-table-put! *localization-bundles* bundle-specifier bundle-assoc-list)) diff --git a/racket/lib/collects/syntax/to-string.rkt b/racket/lib/collects/syntax/to-string.rkt index eaaa2e9e88..e68de1388c 100644 --- a/racket/lib/collects/syntax/to-string.rkt +++ b/racket/lib/collects/syntax/to-string.rkt @@ -2,7 +2,7 @@ (require mzlib/contract syntax/stx) - (require mzlib/list) + (require racket/list) (define (syntax->string c) (let* ([s (open-output-string)] diff --git a/racket/lib/collects/syntax/trusted-xforms.rkt b/racket/lib/collects/syntax/trusted-xforms.rkt index 18b70ad8bc..40af01ac14 100644 --- a/racket/lib/collects/syntax/trusted-xforms.rkt +++ b/racket/lib/collects/syntax/trusted-xforms.rkt @@ -1,2 +1,2 @@ (module trusted-xforms mzscheme - (require mzlib/class)) + (require racket/class))