diff --git a/collects/typed-scheme/core.rkt b/collects/typed-scheme/core.rkt index e2e1bc90..8f869833 100644 --- a/collects/typed-scheme/core.rkt +++ b/collects/typed-scheme/core.rkt @@ -5,7 +5,7 @@ (for-template racket/base) (private with-types type-contract) (except-in syntax/parse id) - racket/match unstable/syntax unstable/match + racket/match racket/syntax unstable/match (optimizer optimizer) (types utils convenience) (typecheck typechecker provide-handling tc-toplevel) diff --git a/collects/typed-scheme/optimizer/utils.rkt b/collects/typed-scheme/optimizer/utils.rkt index 2fa5ba4c..354a236c 100644 --- a/collects/typed-scheme/optimizer/utils.rkt +++ b/collects/typed-scheme/optimizer/utils.rkt @@ -1,7 +1,7 @@ #lang scheme/base (require unstable/match racket/match - racket/dict syntax/id-table unstable/syntax + racket/dict syntax/id-table racket/syntax unstable/syntax "../utils/utils.rkt" (for-template scheme/base) (types type-table utils subtype) diff --git a/collects/typed-scheme/private/base-special-env.rkt b/collects/typed-scheme/private/base-special-env.rkt index ad1aa0d2..7012d33d 100644 --- a/collects/typed-scheme/private/base-special-env.rkt +++ b/collects/typed-scheme/private/base-special-env.rkt @@ -5,7 +5,7 @@ "../utils/utils.rkt" racket/promise string-constants/string-constant - (for-syntax racket/base syntax/parse (only-in unstable/syntax syntax-local-eval) + (for-syntax racket/base syntax/parse (only-in racket/syntax syntax-local-eval) (utils tc-utils) (env init-envs) (except-in (rep filter-rep object-rep type-rep) make-arr) diff --git a/collects/typed-scheme/private/prims.rkt b/collects/typed-scheme/private/prims.rkt index f5215b2d..50efd864 100644 --- a/collects/typed-scheme/private/prims.rkt +++ b/collects/typed-scheme/private/prims.rkt @@ -37,7 +37,7 @@ This file defines two sorts of primitives. All of them are provided into any mod mzlib/etc (for-syntax syntax/parse - syntax/private/util + racket/syntax racket/base racket/struct-info syntax/struct diff --git a/collects/typed-scheme/private/type-contract.rkt b/collects/typed-scheme/private/type-contract.rkt index d17e71b3..de556795 100644 --- a/collects/typed-scheme/private/type-contract.rkt +++ b/collects/typed-scheme/private/type-contract.rkt @@ -12,7 +12,7 @@ (types resolve utils) (prefix-in t: (types convenience abbrev)) (private parse-type) - racket/match unstable/match syntax/struct syntax/stx mzlib/trace unstable/syntax scheme/list + racket/match unstable/match syntax/struct syntax/stx mzlib/trace racket/syntax scheme/list (only-in scheme/contract -> ->* case-> cons/c flat-rec-contract provide/contract any/c) (for-template scheme/base scheme/contract unstable/poly-c (utils any-wrap) (only-in scheme/class object% is-a?/c subclass?/c object-contract class/c init object/c class?))) diff --git a/collects/typed-scheme/rep/rep-utils.rkt b/collects/typed-scheme/rep/rep-utils.rkt index eccd1b6b..d5dfb4de 100644 --- a/collects/typed-scheme/rep/rep-utils.rkt +++ b/collects/typed-scheme/rep/rep-utils.rkt @@ -6,19 +6,19 @@ syntax/boundmap "free-variance.rkt" "interning.rkt" - unstable/syntax unstable/match unstable/struct + racket/syntax unstable/match unstable/struct mzlib/etc scheme/contract (for-syntax scheme/list - (only-in unstable/syntax generate-temporary) + (only-in racket/syntax generate-temporary) racket/match (except-in syntax/parse id identifier keyword) scheme/base syntax/struct syntax/stx scheme/contract - unstable/syntax + racket/syntax (rename-in (except-in (utils utils stxclass-util) bytes byte-regexp regexp byte-pregexp #;pregexp) [id* id] [keyword* keyword]))) diff --git a/collects/typed-scheme/typecheck/provide-handling.rkt b/collects/typed-scheme/typecheck/provide-handling.rkt index c84890ba..980a4ac8 100644 --- a/collects/typed-scheme/typecheck/provide-handling.rkt +++ b/collects/typed-scheme/typecheck/provide-handling.rkt @@ -12,7 +12,7 @@ (for-syntax syntax/parse racket/base) racket/contract/private/provide unstable/list unstable/debug syntax/id-table racket/dict - unstable/syntax scheme/struct-info racket/match + 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-lambda-unit.rkt b/collects/typed-scheme/typecheck/tc-lambda-unit.rkt index de693f9c..b7a45de2 100644 --- a/collects/typed-scheme/typecheck/tc-lambda-unit.rkt +++ b/collects/typed-scheme/typecheck/tc-lambda-unit.rkt @@ -6,7 +6,7 @@ "tc-subst.rkt" "check-below.rkt" mzlib/trace scheme/list - syntax/private/util syntax/stx + racket/syntax unstable/struct syntax/stx (rename-in scheme/contract [-> -->] [->* -->*] [one-of/c -one-of/c]) (except-in (rep type-rep) make-arr) (rename-in (types convenience utils union) diff --git a/collects/typed-scheme/typecheck/tc-toplevel.rkt b/collects/typed-scheme/typecheck/tc-toplevel.rkt index 13f5e842..2ca752a1 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 unstable/syntax syntax/parse unstable/debug + unstable/list racket/syntax syntax/parse unstable/debug mzlib/etc racket/match "signatures.rkt" diff --git a/collects/typed-scheme/utils/stxclass-util.rkt b/collects/typed-scheme/utils/stxclass-util.rkt index cb237268..2c612e75 100644 --- a/collects/typed-scheme/utils/stxclass-util.rkt +++ b/collects/typed-scheme/utils/stxclass-util.rkt @@ -3,7 +3,7 @@ (require (except-in syntax/parse id keyword) (for-syntax syntax/parse scheme/base - (only-in unstable/syntax generate-temporary))) + (only-in racket/syntax generate-temporary))) (provide (except-out (all-defined-out) id keyword) (rename-out [id id*] [keyword keyword*]))