From 636adcc142d20e62a9d18ec1c971894cd6956bd7 Mon Sep 17 00:00:00 2001 From: Stevie Strickland Date: Thu, 17 Sep 2009 20:55:37 +0000 Subject: [PATCH] Refactoring all the private contract stuff into its own playpen. svn: r16052 --- collects/mzlib/contract.ss | 22 ++++++------ collects/mzlib/private/contract-arr-checks.ss | 2 +- .../mzlib/private/contract-arr-obj-helpers.ss | 2 +- collects/mzlib/private/contract-arrow.ss | 8 ++--- collects/mzlib/private/contract-define.ss | 2 +- collects/mzlib/private/contract-object.ss | 4 +-- collects/scheme/class.ss | 4 +-- collects/scheme/contract.ss | 36 +++++++++---------- collects/scheme/contract/base.ss | 30 ++++++++-------- .../contract-exists.ss => contract/exists.ss} | 4 +-- .../private/arrow.ss} | 8 ++--- .../private/base.ss} | 6 ++-- .../private/basic-opters.ss} | 8 ++--- .../private/ds-helpers.ss} | 2 +- .../contract-ds.ss => contract/private/ds.ss} | 10 +++--- .../private/guts.ss} | 4 +-- .../private/helpers.ss} | 0 .../private/misc.ss} | 8 ++--- .../private/object.ss} | 6 ++-- .../private/opt-guts.ss} | 2 +- .../private/opt.ss} | 4 +-- .../private/provide.ss} | 10 +++--- .../regions.ss} | 8 ++--- collects/scheme/exists/lang.ss | 2 +- .../scribblings/reference/contracts.scrbl | 6 ++-- collects/syntax/private/stxparse/lib.ss | 2 +- .../tests/macro-debugger/tests/collects.ss | 22 ++++++------ collects/tests/mzscheme/contract-test.ss | 2 +- 28 files changed, 112 insertions(+), 112 deletions(-) rename collects/scheme/{private/contract-exists.ss => contract/exists.ss} (96%) rename collects/scheme/{private/contract-arrow.ss => contract/private/arrow.ss} (99%) rename collects/scheme/{private/contract-base.ss => contract/private/base.ss} (96%) rename collects/scheme/{private/contract-basic-opters.ss => contract/private/basic-opters.ss} (96%) rename collects/scheme/{private/contract-ds-helpers.ss => contract/private/ds-helpers.ss} (99%) rename collects/scheme/{private/contract-ds.ss => contract/private/ds.ss} (99%) rename collects/scheme/{private/contract-guts.ss => contract/private/guts.ss} (99%) rename collects/scheme/{private/contract-helpers.ss => contract/private/helpers.ss} (100%) rename collects/scheme/{private/contract-misc.ss => contract/private/misc.ss} (99%) rename collects/scheme/{private/contract-object.ss => contract/private/object.ss} (98%) rename collects/scheme/{private/contract-opt-guts.ss => contract/private/opt-guts.ss} (99%) rename collects/scheme/{private/contract-opt.ss => contract/private/opt.ss} (99%) rename collects/scheme/{private/contract-provide.ss => contract/private/provide.ss} (99%) rename collects/scheme/{private/contract-regions.ss => contract/regions.ss} (99%) diff --git a/collects/mzlib/contract.ss b/collects/mzlib/contract.ss index f69ba69953..64d02c4dab 100644 --- a/collects/mzlib/contract.ss +++ b/collects/mzlib/contract.ss @@ -29,22 +29,22 @@ ;; except the arrow contracts ;; -(require scheme/private/contract-base - scheme/private/contract-misc - scheme/private/contract-provide - scheme/private/contract-guts - scheme/private/contract-ds - scheme/private/contract-opt - scheme/private/contract-basic-opters) +(require scheme/contract/private/base + scheme/contract/private/misc + scheme/contract/private/provide + scheme/contract/private/guts + scheme/contract/private/ds + scheme/contract/private/opt + scheme/contract/private/basic-opters) (provide opt/c define-opt/c ;(all-from "private/contract-opt.ss") - (except-out (all-from-out scheme/private/contract-ds) + (except-out (all-from-out scheme/contract/private/ds) lazy-depth-to-look) - (all-from-out scheme/private/contract-base) - (all-from-out scheme/private/contract-provide) - (except-out (all-from-out scheme/private/contract-misc) + (all-from-out scheme/contract/private/base) + (all-from-out scheme/contract/private/provide) + (except-out (all-from-out scheme/contract/private/misc) check-between/c string-len/c check-unary-between/c) diff --git a/collects/mzlib/private/contract-arr-checks.ss b/collects/mzlib/private/contract-arr-checks.ss index 57ac711eb5..547d814a63 100644 --- a/collects/mzlib/private/contract-arr-checks.ss +++ b/collects/mzlib/private/contract-arr-checks.ss @@ -1,7 +1,7 @@ #lang scheme/base (provide (all-defined-out)) -(require scheme/private/contract-guts) +(require scheme/contract/private/guts) (define empty-case-lambda/c (flat-named-contract '(case->) diff --git a/collects/mzlib/private/contract-arr-obj-helpers.ss b/collects/mzlib/private/contract-arr-obj-helpers.ss index 3e4516f2b7..9d4d9800e8 100644 --- a/collects/mzlib/private/contract-arr-obj-helpers.ss +++ b/collects/mzlib/private/contract-arr-obj-helpers.ss @@ -4,7 +4,7 @@ (require (for-syntax scheme/base)) (require (for-template scheme/base) - (for-template scheme/private/contract-guts) + (for-template scheme/contract/private/guts) (for-template "contract-arr-checks.ss")) (provide make-/proc ->/h ->*/h ->d/h ->d*/h ->r/h diff --git a/collects/mzlib/private/contract-arrow.ss b/collects/mzlib/private/contract-arrow.ss index 6937f9c197..757622b8b6 100644 --- a/collects/mzlib/private/contract-arrow.ss +++ b/collects/mzlib/private/contract-arrow.ss @@ -1,11 +1,11 @@ #lang scheme/base -(require scheme/private/contract-guts - scheme/private/contract-opt +(require scheme/contract/private/guts + scheme/contract/private/opt "contract-arr-checks.ss") (require (for-syntax scheme/base) - (for-syntax scheme/private/contract-opt-guts) - (for-syntax scheme/private/contract-helpers) + (for-syntax scheme/contract/private/opt-guts) + (for-syntax scheme/contract/private/helpers) (for-syntax "contract-arr-obj-helpers.ss") (for-syntax syntax/stx) (for-syntax syntax/name)) diff --git a/collects/mzlib/private/contract-define.ss b/collects/mzlib/private/contract-define.ss index 12891e145a..9bc54bd3a7 100644 --- a/collects/mzlib/private/contract-define.ss +++ b/collects/mzlib/private/contract-define.ss @@ -4,7 +4,7 @@ (require (for-syntax scheme/base) (only-in scheme/contract contract) - (for-syntax (prefix-in a: scheme/private/contract-helpers))) + (for-syntax (prefix-in a: scheme/contract/private/helpers))) ;; First, we have the old define/contract implementation, which ;; is still used in mzlib/contract. diff --git a/collects/mzlib/private/contract-object.ss b/collects/mzlib/private/contract-object.ss index c98cabf0ae..c0166dceac 100644 --- a/collects/mzlib/private/contract-object.ss +++ b/collects/mzlib/private/contract-object.ss @@ -1,11 +1,11 @@ #lang scheme/base (require "contract-arrow.ss" - scheme/private/contract-guts + scheme/contract/private/guts scheme/private/class-internal "contract-arr-checks.ss") (require (for-syntax scheme/base - scheme/private/contract-helpers + scheme/contract/private/helpers "contract-arr-obj-helpers.ss")) (provide mixin-contract diff --git a/collects/scheme/class.ss b/collects/scheme/class.ss index 3375685b7a..a46c4b6c96 100644 --- a/collects/scheme/class.ss +++ b/collects/scheme/class.ss @@ -1,7 +1,7 @@ (module class mzscheme - (require "private/contract-object.ss") - (provide (all-from "private/contract-object.ss")) + (require "contract/private/object.ss") + (provide (all-from "contract/private/object.ss")) ;; All of the implementation is actually in private/class-internal.ss, ;; which provides extra (private) functionality to contract.ss. diff --git a/collects/scheme/contract.ss b/collects/scheme/contract.ss index 48d341c78d..ff5d9d9c3c 100644 --- a/collects/scheme/contract.ss +++ b/collects/scheme/contract.ss @@ -9,34 +9,34 @@ differences from v3: |# -(require "private/contract-arrow.ss" - "private/contract-base.ss" - "private/contract-exists.ss" - "private/contract-misc.ss" - "private/contract-provide.ss" - "private/contract-regions.ss" - "private/contract-guts.ss" - "private/contract-ds.ss" - "private/contract-opt.ss" - "private/contract-basic-opters.ss") +(require "contract/private/arrow.ss" + "contract/private/base.ss" + scheme/contract/exists + "contract/private/misc.ss" + "contract/private/provide.ss" + scheme/contract/regions + "contract/private/guts.ss" + "contract/private/ds.ss" + "contract/private/opt.ss" + "contract/private/basic-opters.ss") (provide - opt/c define-opt/c ;(all-from-out "private/contract-opt.ss") - (except-out (all-from-out "private/contract-ds.ss") + opt/c define-opt/c ;(all-from-out "contract/private/opt.ss") + (except-out (all-from-out "contract/private/ds.ss") lazy-depth-to-look) - (except-out (all-from-out "private/contract-arrow.ss") + (except-out (all-from-out "contract/private/arrow.ss") making-a-method procedure-accepts-and-more? check-procedure check-procedure/more) - (except-out (all-from-out "private/contract-exists.ss") ∃?) - (except-out (all-from-out "private/contract-misc.ss") + (except-out (all-from-out scheme/contract/exists) ∃?) + (except-out (all-from-out "contract/private/misc.ss") check-between/c check-unary-between/c) - (all-from-out "private/contract-regions.ss") - (all-from-out "private/contract-provide.ss") - (all-from-out "private/contract-base.ss")) + (all-from-out scheme/contract/regions) + (all-from-out "contract/private/provide.ss") + (all-from-out "contract/private/base.ss")) ;; from contract-guts.ss diff --git a/collects/scheme/contract/base.ss b/collects/scheme/contract/base.ss index fae0e49c80..6b927bc985 100644 --- a/collects/scheme/contract/base.ss +++ b/collects/scheme/contract/base.ss @@ -3,31 +3,31 @@ ;; A stripped down version of scheme/contract for use in ;; the PLT code base where appropriate. -(require scheme/private/contract-arrow - scheme/private/contract-base - scheme/private/contract-misc - scheme/private/contract-provide - scheme/private/contract-guts - scheme/private/contract-ds - scheme/private/contract-opt) +(require "private/arrow.ss" + "private/base.ss" + "private/misc.ss" + "private/provide.ss" + "private/guts.ss" + "private/ds.ss" + "private/opt.ss") (provide - opt/c define-opt/c ;(all-from-out "private/contract-opt.ss") - (except-out (all-from-out scheme/private/contract-ds) + opt/c define-opt/c ;(all-from-out "private/opt.ss") + (except-out (all-from-out "private/ds.ss") lazy-depth-to-look) - (except-out (all-from-out scheme/private/contract-arrow) + (except-out (all-from-out "private/arrow.ss") making-a-method procedure-accepts-and-more? check-procedure check-procedure/more) - (except-out (all-from-out scheme/private/contract-misc) + (except-out (all-from-out "private/misc.ss") check-between/c check-unary-between/c) - (all-from-out scheme/private/contract-provide) - (all-from-out scheme/private/contract-base)) + (all-from-out "private/provide.ss") + (all-from-out "private/base.ss")) -;; from contract-guts.ss +;; from private/guts.ss (provide any and/c @@ -71,4 +71,4 @@ name-prop name-pred? name-get stronger-prop stronger-pred? stronger-get flat-prop flat-pred? flat-get - first-order-prop first-order-get) \ No newline at end of file + first-order-prop first-order-get) diff --git a/collects/scheme/private/contract-exists.ss b/collects/scheme/contract/exists.ss similarity index 96% rename from collects/scheme/private/contract-exists.ss rename to collects/scheme/contract/exists.ss index 19c3ef010f..5d35957e22 100644 --- a/collects/scheme/private/contract-exists.ss +++ b/collects/scheme/contract/exists.ss @@ -1,6 +1,6 @@ #lang scheme/base -(require "contract-guts.ss") +(require "private/guts.ss") (provide new-∃/c ∃?) @@ -35,4 +35,4 @@ (define name (string->symbol (format "~a/∃" raw-name))) (define-values (struct-type constructor predicate accessor mutator) (make-struct-type name struct:∃ 1 0)) - (make-∃/c constructor (λ (x) (accessor x 0)) predicate raw-name)) \ No newline at end of file + (make-∃/c constructor (λ (x) (accessor x 0)) predicate raw-name)) diff --git a/collects/scheme/private/contract-arrow.ss b/collects/scheme/contract/private/arrow.ss similarity index 99% rename from collects/scheme/private/contract-arrow.ss rename to collects/scheme/contract/private/arrow.ss index 47a72852f2..b96cf066e3 100644 --- a/collects/scheme/private/contract-arrow.ss +++ b/collects/scheme/contract/private/arrow.ss @@ -18,12 +18,12 @@ v4 todo: |# -(require "contract-guts.ss" - "contract-opt.ss" +(require "guts.ss" + "opt.ss" scheme/stxparam) (require (for-syntax scheme/base) - (for-syntax "contract-opt-guts.ss") - (for-syntax "contract-helpers.ss") + (for-syntax "opt-guts.ss") + (for-syntax "helpers.ss") (for-syntax syntax/stx) (for-syntax syntax/name)) diff --git a/collects/scheme/private/contract-base.ss b/collects/scheme/contract/private/base.ss similarity index 96% rename from collects/scheme/private/contract-base.ss rename to collects/scheme/contract/private/base.ss index ea588f0527..18316dce23 100644 --- a/collects/scheme/private/contract-base.ss +++ b/collects/scheme/contract/private/base.ss @@ -15,8 +15,8 @@ improve method arity mismatch contract violation error messages? (require (for-syntax scheme/base) scheme/stxparam - "contract-guts.ss" - "contract-helpers.ss") + "guts.ss" + "helpers.ss") (define-syntax-parameter current-contract-region (λ (stx) #'(#%variable-reference))) @@ -65,4 +65,4 @@ improve method arity mismatch contract violation error messages? (let ([proc (contract-proc ctc)]) (λ (val) ((proc pos-blame neg-blame src str positive-position?) val))))) - #f))])) \ No newline at end of file + #f))])) diff --git a/collects/scheme/private/contract-basic-opters.ss b/collects/scheme/contract/private/basic-opters.ss similarity index 96% rename from collects/scheme/private/contract-basic-opters.ss rename to collects/scheme/contract/private/basic-opters.ss index a8947d4279..23a7d7e7af 100644 --- a/collects/scheme/private/contract-basic-opters.ss +++ b/collects/scheme/contract/private/basic-opters.ss @@ -1,10 +1,10 @@ #lang scheme/base -(require "contract-guts.ss" - "contract-opt.ss" - "contract-base.ss") +(require "guts.ss" + "opt.ss" + "base.ss") (require (for-syntax scheme/base - "contract-opt-guts.ss")) + "opt-guts.ss")) ;; ;; opt/pred helper diff --git a/collects/scheme/private/contract-ds-helpers.ss b/collects/scheme/contract/private/ds-helpers.ss similarity index 99% rename from collects/scheme/private/contract-ds-helpers.ss rename to collects/scheme/contract/private/ds-helpers.ss index e1868c3262..988e31d97b 100644 --- a/collects/scheme/private/contract-ds-helpers.ss +++ b/collects/scheme/contract/private/ds-helpers.ss @@ -5,7 +5,7 @@ build-enforcer-clauses generate-arglists) -(require "contract-opt-guts.ss") +(require "opt-guts.ss") (require (for-template scheme/base) (for-syntax scheme/base)) diff --git a/collects/scheme/private/contract-ds.ss b/collects/scheme/contract/private/ds.ss similarity index 99% rename from collects/scheme/private/contract-ds.ss rename to collects/scheme/contract/private/ds.ss index 327dd25d2b..6568e52499 100644 --- a/collects/scheme/private/contract-ds.ss +++ b/collects/scheme/contract/private/ds.ss @@ -17,13 +17,13 @@ it around flattened out. |# -(require "contract-guts.ss" - "contract-opt.ss" +(require "guts.ss" + "opt.ss" mzlib/etc) (require (for-syntax scheme/base) - (for-syntax "contract-ds-helpers.ss") - (for-syntax "contract-helpers.ss") - (for-syntax "contract-opt-guts.ss") + (for-syntax "ds-helpers.ss") + (for-syntax "helpers.ss") + (for-syntax "opt-guts.ss") (for-syntax mzlib/etc)) (provide define-contract-struct diff --git a/collects/scheme/private/contract-guts.ss b/collects/scheme/contract/private/guts.ss similarity index 99% rename from collects/scheme/private/contract-guts.ss rename to collects/scheme/contract/private/guts.ss index ceaabf15d9..e6e1980217 100644 --- a/collects/scheme/private/contract-guts.ss +++ b/collects/scheme/contract/private/guts.ss @@ -1,10 +1,10 @@ #lang scheme/base -(require "contract-helpers.ss" +(require "helpers.ss" scheme/pretty) (require (for-syntax scheme/base - "contract-helpers.ss")) + "helpers.ss")) (provide raise-contract-error guilty-party diff --git a/collects/scheme/private/contract-helpers.ss b/collects/scheme/contract/private/helpers.ss similarity index 100% rename from collects/scheme/private/contract-helpers.ss rename to collects/scheme/contract/private/helpers.ss diff --git a/collects/scheme/private/contract-misc.ss b/collects/scheme/contract/private/misc.ss similarity index 99% rename from collects/scheme/private/contract-misc.ss rename to collects/scheme/contract/private/misc.ss index 297c3c4dbd..ce59ef2cdc 100644 --- a/collects/scheme/private/contract-misc.ss +++ b/collects/scheme/contract/private/misc.ss @@ -2,11 +2,11 @@ (require (for-syntax scheme/base scheme/struct-info - "contract-helpers.ss" - "contract-opt-guts.ss") + "helpers.ss" + "opt-guts.ss") scheme/promise - "contract-opt.ss" - "contract-guts.ss") + "opt.ss" + "guts.ss") (provide flat-rec-contract flat-murec-contract diff --git a/collects/scheme/private/contract-object.ss b/collects/scheme/contract/private/object.ss similarity index 98% rename from collects/scheme/private/contract-object.ss rename to collects/scheme/contract/private/object.ss index 23e8070c5f..a306e854f0 100644 --- a/collects/scheme/private/contract-object.ss +++ b/collects/scheme/contract/private/object.ss @@ -1,7 +1,7 @@ #lang scheme/base -(require "contract-arrow.ss" - "contract-guts.ss" - "class-internal.ss" +(require "arrow.ss" + "guts.ss" + scheme/private/class-internal scheme/stxparam) (require (for-syntax scheme/base)) diff --git a/collects/scheme/private/contract-opt-guts.ss b/collects/scheme/contract/private/opt-guts.ss similarity index 99% rename from collects/scheme/private/contract-opt-guts.ss rename to collects/scheme/contract/private/opt-guts.ss index c4be208d7c..d7efff5ecc 100644 --- a/collects/scheme/private/contract-opt-guts.ss +++ b/collects/scheme/contract/private/opt-guts.ss @@ -1,7 +1,7 @@ #lang scheme/base (require syntax/private/boundmap ;; needs to be the private one, since the public one has contracts (for-template scheme/base) - (for-template "contract-guts.ss") + (for-template "guts.ss") (for-syntax scheme/base)) (provide get-opter reg-opter! opter diff --git a/collects/scheme/private/contract-opt.ss b/collects/scheme/contract/private/opt.ss similarity index 99% rename from collects/scheme/private/contract-opt.ss rename to collects/scheme/contract/private/opt.ss index 814767322e..d0383f4920 100644 --- a/collects/scheme/private/contract-opt.ss +++ b/collects/scheme/contract/private/opt.ss @@ -1,9 +1,9 @@ #lang scheme/base -(require "contract-guts.ss" +(require "guts.ss" scheme/stxparam mzlib/etc) (require (for-syntax scheme/base) - (for-syntax "contract-opt-guts.ss") + (for-syntax "opt-guts.ss") (for-syntax mzlib/etc) (for-syntax scheme/stxparam)) diff --git a/collects/scheme/private/contract-provide.ss b/collects/scheme/contract/private/provide.ss similarity index 99% rename from collects/scheme/private/contract-provide.ss rename to collects/scheme/contract/private/provide.ss index 617aedb659..568b0796f8 100644 --- a/collects/scheme/private/contract-provide.ss +++ b/collects/scheme/contract/private/provide.ss @@ -4,11 +4,11 @@ (require (for-syntax scheme/base scheme/list - (prefix-in a: "contract-helpers.ss")) - "contract-arrow.ss" - "contract-base.ss" - "contract-exists.ss" - "contract-guts.ss") + (prefix-in a: "helpers.ss")) + "arrow.ss" + "base.ss" + scheme/contract/exists + "guts.ss") (define-syntax (verify-contract stx) (syntax-case stx () diff --git a/collects/scheme/private/contract-regions.ss b/collects/scheme/contract/regions.ss similarity index 99% rename from collects/scheme/private/contract-regions.ss rename to collects/scheme/contract/regions.ss index 071bb8d544..ff78aaf166 100644 --- a/collects/scheme/private/contract-regions.ss +++ b/collects/scheme/contract/regions.ss @@ -9,11 +9,11 @@ scheme/struct-info syntax/define syntax/kerncase - (prefix-in a: "contract-helpers.ss")) + (prefix-in a: "private/helpers.ss")) scheme/splicing - "contract-arrow.ss" - "contract-base.ss" - "contract-guts.ss") + "private/arrow.ss" + "private/base.ss" + "private/guts.ss") ;; These are useful for all below. diff --git a/collects/scheme/exists/lang.ss b/collects/scheme/exists/lang.ss index d7e4b77085..ec2c033c52 100644 --- a/collects/scheme/exists/lang.ss +++ b/collects/scheme/exists/lang.ss @@ -1,6 +1,6 @@ #lang scheme -(require "../private/contract-exists.ss") +(require scheme/contract/exists) ;; this code builds the list of predicates (in case it changes, this may need to be re-run) #; diff --git a/collects/scribblings/reference/contracts.scrbl b/collects/scribblings/reference/contracts.scrbl index 140ce31019..9aa0e9b2a5 100644 --- a/collects/scribblings/reference/contracts.scrbl +++ b/collects/scribblings/reference/contracts.scrbl @@ -17,9 +17,9 @@ another. Programmers specify the behavior of a module exports via @scheme[provide/contract] and the contract system enforces those constraints. -@note-lib[scheme/contract #:use-sources (scheme/private/contract-ds - scheme/private/contract-base - scheme/private/contract-guts)] +@note-lib[scheme/contract #:use-sources (scheme/contract/private/ds + scheme/contract/private/base + scheme/contract/private/guts)] @deftech{Contracts} come in two forms: those constructed by the various operations listed in this section of the manual, and various diff --git a/collects/syntax/private/stxparse/lib.ss b/collects/syntax/private/stxparse/lib.ss index 6e8a1b1a26..e8a30d548f 100644 --- a/collects/syntax/private/stxparse/lib.ss +++ b/collects/syntax/private/stxparse/lib.ss @@ -5,7 +5,7 @@ syntax/stx syntax/kerncase scheme/struct-info - scheme/private/contract-helpers + scheme/contract/private/helpers (for-syntax scheme/base syntax/kerncase "rep.ss" diff --git a/collects/tests/macro-debugger/tests/collects.ss b/collects/tests/macro-debugger/tests/collects.ss index 5dd33f92c9..cbcf8d79f0 100644 --- a/collects/tests/macro-debugger/tests/collects.ss +++ b/collects/tests/macro-debugger/tests/collects.ss @@ -195,17 +195,17 @@ scheme/mzscheme scheme/nest scheme/private/class-internal - scheme/private/contract-base - scheme/private/contract-arrow - scheme/private/contract-basic-opters - scheme/private/contract-ds - scheme/private/contract-ds-helpers - scheme/private/contract-exists - scheme/private/contract-guts - scheme/private/contract-helpers - scheme/private/contract-misc - scheme/private/contract-opt - scheme/private/contract-opt-guts + scheme/contract/private/base + scheme/contract/private/arrow + scheme/contract/private/basic-opters + scheme/contract/private/ds + scheme/contract/private/ds-helpers + scheme/contract/private/exists + scheme/contract/private/guts + scheme/contract/private/helpers + scheme/contract/private/misc + scheme/contract/private/opt + scheme/contract/private/opt-guts scheme/private/define-struct scheme/private/define-struct scheme/private/for diff --git a/collects/tests/mzscheme/contract-test.ss b/collects/tests/mzscheme/contract-test.ss index e6cf806318..e954c496ae 100644 --- a/collects/tests/mzscheme/contract-test.ss +++ b/collects/tests/mzscheme/contract-test.ss @@ -11,7 +11,7 @@ (namespace-require '(for-syntax scheme/base)) (namespace-require '(for-template scheme/base)) (namespace-require 'scheme/contract) - (namespace-require '(only scheme/private/contract-arrow procedure-accepts-and-more?)) + (namespace-require '(only scheme/contract/private/arrow procedure-accepts-and-more?)) (namespace-require 'scheme/class) (namespace-require 'scheme/promise)) n))