diff --git a/collects/tests/typed-racket/unit-tests/parse-type-tests.rkt b/collects/tests/typed-racket/unit-tests/parse-type-tests.rkt index 1ca848c8a6..c65f2226aa 100644 --- a/collects/tests/typed-racket/unit-tests/parse-type-tests.rkt +++ b/collects/tests/typed-racket/unit-tests/parse-type-tests.rkt @@ -6,6 +6,7 @@ (rename-in (types subtype union utils abbrev numeric-tower) [Un t:Un] [-> t:->] [->* t:->*]) (base-env base-types base-types-extra colon) + (submod typed-racket/base-env/base-types initialize) (for-template (base-env base-types base-types-extra base-env colon)) (private parse-type) rackunit @@ -30,7 +31,7 @@ [ty (cdr pr)]) (register-resolved-type-alias (datum->syntax #'here (syntax->datum nm)) ty))) -((dynamic-require '(submod typed-racket/base-env/base-types initialize) 'initialize-type-names)) +(initialize-type-names) (define-syntax (run-one stx) (syntax-case stx () diff --git a/collects/tests/typed-racket/unit-tests/type-annotation-test.rkt b/collects/tests/typed-racket/unit-tests/type-annotation-test.rkt index c562ad5a86..89df33e821 100644 --- a/collects/tests/typed-racket/unit-tests/type-annotation-test.rkt +++ b/collects/tests/typed-racket/unit-tests/type-annotation-test.rkt @@ -7,9 +7,10 @@ (env type-env-structs init-envs) (utils tc-utils) (rep type-rep filter-rep object-rep) + (submod typed-racket/base-env/base-types initialize) rackunit) -((dynamic-require '(submod typed-racket/base-env/base-types initialize) 'initialize-type-names)) +(initialize-type-names) (provide type-annotation-tests) diff --git a/collects/tests/typed-racket/unit-tests/typecheck-tests.rkt b/collects/tests/typed-racket/unit-tests/typecheck-tests.rkt index b36f2957af..ed87f82cdd 100644 --- a/collects/tests/typed-racket/unit-tests/typecheck-tests.rkt +++ b/collects/tests/typed-racket/unit-tests/typecheck-tests.rkt @@ -12,6 +12,7 @@ base-types-extra base-env-indexing base-structs) define lambda λ) + (submod typed-racket/base-env/base-types initialize) (typecheck typechecker) (rep type-rep filter-rep object-rep) (rename-in (types utils union numeric-tower abbrev filter-ops) @@ -41,8 +42,7 @@ (provide typecheck-tests g) -(b:init) (n:init) (initialize-structs) (initialize-indexing) -((dynamic-require '(submod typed-racket/base-env/base-types initialize) 'initialize-type-names)) +(b:init) (n:init) (initialize-structs) (initialize-indexing) (initialize-type-names) (define N -Number) (define B -Boolean) diff --git a/collects/typed-racket/typed-racket.rkt b/collects/typed-racket/typed-racket.rkt index dd37618afb..980e690564 100644 --- a/collects/typed-racket/typed-racket.rkt +++ b/collects/typed-racket/typed-racket.rkt @@ -14,19 +14,10 @@ with-type (for-syntax do-standard-inits)) -(module init-base-env racket/base - (require racket/lazy-require) - (provide (rename-out (init init-base-env))) - (lazy-require (typed-racket/base-env/base-env (init)))) -(module init-base-env-numeric racket/base - (require racket/lazy-require) - (provide (rename-out (init init-base-env-numeric))) - (lazy-require (typed-racket/base-env/base-env-numeric (init)))) - (begin-for-syntax - (require 'init-base-env) - (require 'init-base-env-numeric) (lazy-require + [typed-racket/base-env/base-env ((init init-base-env))] + [typed-racket/base-env/base-env-numeric ((init init-base-env-numeric))] [typed-racket/base-env/base-structs (initialize-structs)] [typed-racket/base-env/base-env-indexing (initialize-indexing)] [typed-racket/base-env/base-special-env (initialize-special)]