diff --git a/collects/mzlib/contract.ss b/collects/mzlib/contract.ss index f69ba69..64d02c4 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 57ac711..547d814 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 3e4516f..9d4d980 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 6937f9c..757622b 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 12891e1..9bc54bd 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 c98cabf..c0166dc 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