diff --git a/collects/typed-scheme/infer/constraints.rkt b/collects/typed-scheme/infer/constraints.rkt index 9b8b5048b1..853dba30e8 100644 --- a/collects/typed-scheme/infer/constraints.rkt +++ b/collects/typed-scheme/infer/constraints.rkt @@ -6,7 +6,6 @@ (utils tc-utils) unstable/sequence unstable/hash "signatures.rkt" "constraint-structs.rkt" - unstable/debug racket/match racket/list) diff --git a/collects/typed-scheme/infer/infer-unit.rkt b/collects/typed-scheme/infer/infer-unit.rkt index 9ea79cec6a..73d7703177 100644 --- a/collects/typed-scheme/infer/infer-unit.rkt +++ b/collects/typed-scheme/infer/infer-unit.rkt @@ -14,7 +14,7 @@ racket/match mzlib/etc racket/trace racket/contract - unstable/sequence unstable/list unstable/debug unstable/hash + unstable/sequence unstable/list unstable/hash racket/list) (import dmap^ constraints^ promote-demote^) diff --git a/collects/typed-scheme/private/parse-type.rkt b/collects/typed-scheme/private/parse-type.rkt index 905c4ece64..d622ef9a57 100644 --- a/collects/typed-scheme/private/parse-type.rkt +++ b/collects/typed-scheme/private/parse-type.rkt @@ -7,7 +7,7 @@ syntax/stx (prefix-in c: scheme/contract) syntax/parse (env type-env-structs tvar-env type-name-env type-alias-env lexical-env index-env) - racket/match unstable/debug + racket/match (for-template scheme/base "colon.ss") ;; needed at this phase for tests (combine-in (prefix-in t: "base-types-extra.ss") "colon.ss") diff --git a/collects/typed-scheme/private/with-types.rkt b/collects/typed-scheme/private/with-types.rkt index 2733010b09..d334893dd6 100644 --- a/collects/typed-scheme/private/with-types.rkt +++ b/collects/typed-scheme/private/with-types.rkt @@ -7,7 +7,7 @@ (prefix-in c: (combine-in racket/contract/regions racket/contract/base))) "extra-procs.rkt" "prims.rkt" syntax/parse racket/block racket/match - unstable/sequence unstable/debug "base-types-extra.rkt" + unstable/sequence "base-types-extra.rkt" (except-in (path-up "env/type-name-env.rkt" "env/type-alias-env.rkt" "infer/infer-dummy.rkt" diff --git a/collects/typed-scheme/rep/type-rep.rkt b/collects/typed-scheme/rep/type-rep.rkt index 7c542d4e5a..feb057b8e3 100644 --- a/collects/typed-scheme/rep/type-rep.rkt +++ b/collects/typed-scheme/rep/type-rep.rkt @@ -4,7 +4,7 @@ (require (utils tc-utils) "rep-utils.rkt" "object-rep.rkt" "filter-rep.rkt" "free-variance.rkt" mzlib/trace racket/match mzlib/etc - scheme/contract unstable/debug + scheme/contract (for-syntax scheme/base syntax/parse)) (define name-table (make-weak-hasheq)) diff --git a/collects/typed-scheme/typecheck/check-subforms-unit.rkt b/collects/typed-scheme/typecheck/check-subforms-unit.rkt index 83b342898e..d05954be31 100644 --- a/collects/typed-scheme/typecheck/check-subforms-unit.rkt +++ b/collects/typed-scheme/typecheck/check-subforms-unit.rkt @@ -3,7 +3,7 @@ (require "../utils/utils.rkt" syntax/kerncase syntax/parse - racket/match unstable/debug + racket/match "signatures.rkt" "tc-metafunctions.rkt" (types utils convenience union subtype) (utils tc-utils) diff --git a/collects/typed-scheme/typecheck/provide-handling.rkt b/collects/typed-scheme/typecheck/provide-handling.rkt index 980a4ac8fb..3fc563fd15 100644 --- a/collects/typed-scheme/typecheck/provide-handling.rkt +++ b/collects/typed-scheme/typecheck/provide-handling.rkt @@ -11,7 +11,7 @@ (utils tc-utils) (for-syntax syntax/parse racket/base) racket/contract/private/provide unstable/list - unstable/debug syntax/id-table racket/dict + syntax/id-table racket/dict racket/syntax scheme/struct-info racket/match "def-binding.rkt" syntax/parse (for-template scheme/base "def-export.rkt" scheme/contract)) diff --git a/collects/typed-scheme/typecheck/tc-app.rkt b/collects/typed-scheme/typecheck/tc-app.rkt index f96c228283..3f58464021 100644 --- a/collects/typed-scheme/typecheck/tc-app.rkt +++ b/collects/typed-scheme/typecheck/tc-app.rkt @@ -5,7 +5,7 @@ "tc-app-helper.rkt" "find-annotation.rkt" "tc-funapp.rkt" "tc-subst.rkt" (prefix-in c: racket/contract) syntax/parse racket/match racket/trace scheme/list - unstable/sequence unstable/debug unstable/list + unstable/sequence unstable/list ;; fixme - don't need to be bound in this phase - only to make tests work scheme/bool racket/unsafe/ops diff --git a/collects/typed-scheme/typecheck/tc-envops.rkt b/collects/typed-scheme/typecheck/tc-envops.rkt index de799dc420..b438e3b21e 100644 --- a/collects/typed-scheme/typecheck/tc-envops.rkt +++ b/collects/typed-scheme/typecheck/tc-envops.rkt @@ -12,7 +12,7 @@ (only-in (env type-env-structs lexical-env) env? update-type/lexical env-map env-props replace-props) scheme/contract racket/match - mzlib/trace unstable/debug unstable/struct + mzlib/trace unstable/struct (typecheck tc-metafunctions) (for-syntax scheme/base)) diff --git a/collects/typed-scheme/typecheck/tc-expr-unit.rkt b/collects/typed-scheme/typecheck/tc-expr-unit.rkt index 2462bec2d9..d42355a8e4 100644 --- a/collects/typed-scheme/typecheck/tc-expr-unit.rkt +++ b/collects/typed-scheme/typecheck/tc-expr-unit.rkt @@ -11,7 +11,7 @@ (only-in (infer infer) restrict) (except-in (utils tc-utils stxclass-util)) (env lexical-env type-env-structs tvar-env index-env) - racket/private/class-internal unstable/debug + racket/private/class-internal (except-in syntax/parse id) unstable/function (only-in srfi/1 split-at)) diff --git a/collects/typed-scheme/typecheck/tc-if.rkt b/collects/typed-scheme/typecheck/tc-if.rkt index f897a9b0a6..3a31c32d76 100644 --- a/collects/typed-scheme/typecheck/tc-if.rkt +++ b/collects/typed-scheme/typecheck/tc-if.rkt @@ -10,7 +10,7 @@ (typecheck tc-envops tc-metafunctions) (types type-table) syntax/kerncase - racket/trace unstable/debug + racket/trace racket/match) ;; if typechecking diff --git a/collects/typed-scheme/typecheck/tc-lambda-unit.rkt b/collects/typed-scheme/typecheck/tc-lambda-unit.rkt index b7a45de271..17772aa724 100644 --- a/collects/typed-scheme/typecheck/tc-lambda-unit.rkt +++ b/collects/typed-scheme/typecheck/tc-lambda-unit.rkt @@ -15,7 +15,7 @@ (types abbrev utils) (env type-env-structs lexical-env tvar-env index-env) (utils tc-utils) - unstable/debug + racket/match) (require (for-template scheme/base "internal-forms.rkt")) diff --git a/collects/typed-scheme/typecheck/tc-let-unit.rkt b/collects/typed-scheme/typecheck/tc-let-unit.rkt index b9da5f9ab8..4a92aca975 100644 --- a/collects/typed-scheme/typecheck/tc-let-unit.rkt +++ b/collects/typed-scheme/typecheck/tc-let-unit.rkt @@ -8,11 +8,11 @@ (env lexical-env type-alias-env global-env type-env-structs) (rep type-rep) syntax/free-vars - ;racket/trace unstable/debug + ;racket/trace racket/match (prefix-in c: racket/contract) (except-in racket/contract -> ->* one-of/c) syntax/kerncase syntax/parse unstable/syntax - unstable/debug + (for-template racket/base "internal-forms.rkt")) diff --git a/collects/typed-scheme/typecheck/tc-structs.rkt b/collects/typed-scheme/typecheck/tc-structs.rkt index 7aa506ef5a..6edcf4eca3 100644 --- a/collects/typed-scheme/typecheck/tc-structs.rkt +++ b/collects/typed-scheme/typecheck/tc-structs.rkt @@ -10,7 +10,7 @@ syntax/kerncase syntax/struct mzlib/trace - unstable/debug + racket/function racket/match (only-in racket/contract diff --git a/collects/typed-scheme/typecheck/tc-subst.rkt b/collects/typed-scheme/typecheck/tc-subst.rkt index f784ba05dc..bb5582d259 100644 --- a/collects/typed-scheme/typecheck/tc-subst.rkt +++ b/collects/typed-scheme/typecheck/tc-subst.rkt @@ -6,7 +6,7 @@ [->* -->*] [one-of/c -one-of/c]) (rep type-rep filter-rep rep-utils) scheme/list - scheme/contract racket/match unstable/match unstable/debug + scheme/contract racket/match unstable/match (for-syntax scheme/base) "tc-metafunctions.rkt") diff --git a/collects/typed-scheme/typecheck/tc-toplevel.rkt b/collects/typed-scheme/typecheck/tc-toplevel.rkt index 1e9cc7623e..ae4a0a6efc 100644 --- a/collects/typed-scheme/typecheck/tc-toplevel.rkt +++ b/collects/typed-scheme/typecheck/tc-toplevel.rkt @@ -2,7 +2,7 @@ (require (rename-in "../utils/utils.rkt" [infer r:infer]) syntax/kerncase - unstable/list racket/syntax syntax/parse unstable/debug + unstable/list racket/syntax syntax/parse mzlib/etc racket/match "signatures.rkt" diff --git a/collects/typed-scheme/types/abbrev.rkt b/collects/typed-scheme/types/abbrev.rkt index d5194b7bfa..7e41e0db3f 100644 --- a/collects/typed-scheme/types/abbrev.rkt +++ b/collects/typed-scheme/types/abbrev.rkt @@ -8,10 +8,10 @@ racket/list racket/match unstable/function - (except-in racket/contract ->* ->) - (prefix-in c: racket/contract) + (except-in racket/contract/base ->* ->) + (prefix-in c: racket/contract/base) (for-syntax racket/base syntax/parse) - (for-template racket/base racket/contract racket/promise racket/tcp racket/flonum) + (for-template racket/base racket/contract/base racket/promise racket/tcp racket/flonum) ;; for base type predicates racket/promise racket/tcp racket/flonum) diff --git a/collects/typed-scheme/types/convenience.rkt b/collects/typed-scheme/types/convenience.rkt index 3c76f116df..7ff5ee56f9 100644 --- a/collects/typed-scheme/types/convenience.rkt +++ b/collects/typed-scheme/types/convenience.rkt @@ -4,9 +4,9 @@ (utils tc-utils) "abbrev.rkt" "numeric-tower.rkt" (only-in scheme/contract current-blame-format) (types comparison printer union subtype utils substitute) - scheme/list racket/match scheme/promise + scheme/list racket/match (for-syntax syntax/parse scheme/base) - unstable/debug syntax/id-table scheme/dict + syntax/id-table scheme/dict racket/trace (for-template scheme/base)) diff --git a/collects/typed-scheme/types/filter-ops.rkt b/collects/typed-scheme/types/filter-ops.rkt index 7476a88f18..3f7832bf0e 100644 --- a/collects/typed-scheme/types/filter-ops.rkt +++ b/collects/typed-scheme/types/filter-ops.rkt @@ -5,9 +5,9 @@ (utils tc-utils) (only-in (infer infer) restrict) "abbrev.rkt" (only-in scheme/contract current-blame-format [-> -->] listof) (types comparison printer union subtype utils remove-intersect) - scheme/list racket/match scheme/promise + scheme/list racket/match (for-syntax syntax/parse scheme/base) - unstable/debug syntax/id-table scheme/dict + syntax/id-table scheme/dict racket/trace (for-template scheme/base)) diff --git a/collects/typed-scheme/types/remove-intersect.rkt b/collects/typed-scheme/types/remove-intersect.rkt index 554a89b9f5..f65229821f 100644 --- a/collects/typed-scheme/types/remove-intersect.rkt +++ b/collects/typed-scheme/types/remove-intersect.rkt @@ -3,7 +3,7 @@ (require "../utils/utils.rkt" (rep type-rep rep-utils) (types union subtype resolve convenience utils) - racket/match mzlib/trace unstable/debug) + racket/match mzlib/trace) (provide (rename-out [*remove remove]) overlap)