From f8f989e8c64032c622c1bd2e0638f57ee896fd9e Mon Sep 17 00:00:00 2001 From: Eric Dobson Date: Mon, 2 Sep 2013 19:38:27 -0700 Subject: [PATCH] Remove unused dependencies. --- .../typed-racket/base-env/base-contracted.rkt | 2 +- .../typed-racket/base-env/base-special-env.rkt | 2 -- .../typed-racket/base-env/base-structs.rkt | 4 +--- .../typed-racket/base-env/env-lang.rkt | 3 +-- .../typed-racket-lib/typed-racket/core.rkt | 2 -- .../typed-racket-lib/typed-racket/env/env-req.rkt | 1 - .../typed-racket/env/lexical-env.rkt | 1 - .../typed-racket/env/scoped-tvar-env.rkt | 3 --- .../typed-racket/env/type-env-structs.rkt | 4 ++-- .../typed-racket/env/type-name-env.rkt | 1 - .../typed-racket/infer/constraints.rkt | 3 +-- .../typed-racket/infer/infer-unit.rkt | 2 +- .../typed-racket-lib/typed-racket/infer/infer.rkt | 1 - .../typed-racket/infer/restrict.rkt | 2 +- .../typed-racket/optimizer/float-complex.rkt | 2 +- .../typed-racket/optimizer/float.rkt | 2 +- .../typed-racket/optimizer/logging.rkt | 2 +- .../typed-racket/optimizer/optimizer.rkt | 2 +- .../typed-racket/optimizer/struct.rkt | 2 +- .../typed-racket/optimizer/unboxed-let.rkt | 1 - .../typed-racket/optimizer/utils.rkt | 2 +- .../typed-racket/private/parse-type.rkt | 5 ++--- .../typed-racket/private/type-annotation.rkt | 2 +- .../typed-racket/private/type-contract.rkt | 7 +++---- .../typed-racket/private/with-types.rkt | 3 +-- .../typed-racket/rep/free-variance.rkt | 4 +--- .../typed-racket-lib/typed-racket/rep/rep-utils.rkt | 2 +- .../typed-racket-lib/typed-racket/tc-setup.rkt | 6 +----- .../typed-racket/typecheck/check-subforms-unit.rkt | 4 ++-- .../typed-racket/typecheck/def-export.rkt | 2 +- .../typed-racket/typecheck/provide-handling.rkt | 5 +---- .../typed-racket/typecheck/tc-app-combined.rkt | 5 +---- .../typed-racket/typecheck/tc-app-helper.rkt | 4 ++-- .../typed-racket/typecheck/tc-app/tc-app-apply.rkt | 3 +-- .../typed-racket/typecheck/tc-app/tc-app-eq.rkt | 1 - .../typed-racket/typecheck/tc-app/tc-app-hetero.rkt | 3 --- .../typecheck/tc-app/tc-app-keywords.rkt | 1 - .../typed-racket/typecheck/tc-app/tc-app-lambda.rkt | 4 +--- .../typed-racket/typecheck/tc-app/tc-app-list.rkt | 2 -- .../typed-racket/typecheck/tc-app/tc-app-main.rkt | 5 ++--- .../typecheck/tc-app/tc-app-objects.rkt | 6 +++--- .../typecheck/tc-app/tc-app-special.rkt | 1 - .../typed-racket/typecheck/tc-app/tc-app-values.rkt | 4 +--- .../typed-racket/typecheck/tc-apply.rkt | 7 ++----- .../typed-racket/typecheck/tc-expr-unit.rkt | 13 ++++++------- .../typed-racket/typecheck/tc-funapp.rkt | 1 - .../typed-racket/typecheck/tc-if.rkt | 8 +++----- .../typed-racket/typecheck/tc-lambda-unit.rkt | 6 +++--- .../typed-racket/typecheck/tc-let-unit.rkt | 4 ++-- .../typed-racket/typecheck/tc-literal.rkt | 4 ++-- .../typed-racket/typecheck/tc-metafunctions.rkt | 2 +- .../typed-racket/typecheck/tc-structs.rkt | 4 ++-- .../typed-racket/typecheck/tc-toplevel.rkt | 2 +- .../typed-racket/typecheck/typechecker.rkt | 4 +--- .../typed-racket-lib/typed-racket/types/abbrev.rkt | 7 ++----- .../typed-racket/types/generalize.rkt | 7 ++----- .../typed-racket/types/kw-types.rkt | 2 +- .../typed-racket/types/match-expanders.rkt | 2 +- .../typed-racket/types/numeric-tower.rkt | 4 +--- .../typed-racket-lib/typed-racket/types/resolve.rkt | 2 +- .../typed-racket/types/substitute.rkt | 6 +++--- .../typed-racket/types/tc-error.rkt | 2 +- .../typed-racket/types/tc-result.rkt | 2 +- .../typed-racket/types/type-table.rkt | 1 + .../typed-racket-lib/typed-racket/types/utils.rkt | 3 +-- .../typed-racket/utils/print-struct.rkt | 2 +- .../typed-racket/utils/tc-utils.rkt | 2 +- 67 files changed, 79 insertions(+), 141 deletions(-) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-contracted.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-contracted.rkt index 2eebd5d62b..e3b8370301 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-contracted.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-contracted.rkt @@ -5,7 +5,7 @@ (require "../utils/utils.rkt" (env init-envs) - (types abbrev union) + (types abbrev) (utils any-wrap) (only-in (rep type-rep) make-Prompt-Tagof)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-special-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-special-env.rkt index 13bb754981..7c01314a02 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-special-env.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-special-env.rkt @@ -9,9 +9,7 @@ racket/private/kw racket/file racket/port syntax/parse racket/path (for-template (only-in racket/private/kw kw-expander-proc kw-expander-impl) racket/base racket/file racket/port racket/path racket/list) - (utils tc-utils) (env init-envs) - (except-in (rep filter-rep object-rep type-rep) make-arr) (rename-in (types abbrev numeric-tower union) [make-arr* make-arr]) (for-syntax racket/base syntax/parse (only-in racket/syntax syntax-local-eval))) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-structs.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-structs.rkt index 1cd5dc13f0..58d6c8565d 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-structs.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-structs.rkt @@ -2,9 +2,7 @@ (require "../utils/utils.rkt" - (utils tc-utils) - (env init-envs) - (rep filter-rep object-rep type-rep) + (rep type-rep) (types abbrev numeric-tower union) (typecheck tc-structs) ;;For tests diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/env-lang.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/env-lang.rkt index 25059123d8..ee765ce163 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/env-lang.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/env-lang.rkt @@ -5,8 +5,7 @@ (require (for-syntax racket/base syntax/parse) (utils tc-utils) (env init-envs) - (types abbrev numeric-tower union filter-ops) - (rep object-rep filter-rep type-rep)) + (types abbrev numeric-tower union filter-ops)) (define-syntax (-#%module-begin stx) (define-syntax-class clause diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/core.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/core.rkt index 1fdfbb6424..daf862f48e 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/core.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/core.rkt @@ -7,12 +7,10 @@ (except-in syntax/parse id) racket/match racket/syntax racket/list syntax/stx racket/format - racket/promise (only-in racket/string string-join) (types utils abbrev generalize printer) (typecheck provide-handling tc-toplevel tc-app-helper) (rep type-rep) - (env env-req) (for-template (only-in (base-env prims) :type :print-type :query-type/result)) (utils utils tc-utils arm) "tc-setup.rkt") diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/env-req.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/env-req.rkt index f4c3957380..224dad0a16 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/env-req.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/env-req.rkt @@ -1,5 +1,4 @@ #lang racket/base -(require syntax/modcollapse) (define to-require null) (define (add-mod! m) (set! to-require (cons m to-require))) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/lexical-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/lexical-env.rkt index 7f0728cf8a..25a38a6639 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/lexical-env.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/lexical-env.rkt @@ -14,7 +14,6 @@ (env type-env-structs global-env mvar-env) (utils tc-utils) (only-in (rep type-rep) Type/c) - (typecheck tc-metafunctions) (except-in (types utils abbrev kw-types) -> ->* one-of/c)) (provide lexical-env with-lexical-env with-lexical-env/extend diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/scoped-tvar-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/scoped-tvar-env.rkt index 96fc4eae36..210e183eac 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/scoped-tvar-env.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/scoped-tvar-env.rkt @@ -4,12 +4,9 @@ (require "../utils/utils.rkt" (for-template racket/base) - (rep type-rep) syntax/parse syntax/id-table - racket/contract racket/match - racket/list racket/dict) (provide register-scoped-tvars lookup-scoped-tvars diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-env-structs.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-env-structs.rkt index 31818cd5d4..b0fa17806f 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-env-structs.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-env-structs.rkt @@ -1,9 +1,9 @@ #lang racket/base -(require unstable/sequence racket/dict syntax/id-table racket/match unstable/struct +(require racket/dict racket/match (prefix-in r: "../utils/utils.rkt") (r:contract-req) - (r:rep filter-rep rep-utils type-rep) + (r:rep filter-rep) (except-in (r:utils tc-utils) make-env)) (provide extend diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-name-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-name-env.rkt index de7815996f..c80432b26a 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-name-env.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-name-env.rkt @@ -5,7 +5,6 @@ (require "../utils/utils.rkt") (require syntax/id-table - racket/dict (env type-alias-env) (utils tc-utils) (rep type-rep) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/constraints.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/constraints.rkt index 0433c8010e..319bfdaa11 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/constraints.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/constraints.rkt @@ -1,8 +1,7 @@ #lang racket/unit (require "../utils/utils.rkt" - (types abbrev utils union subtype) - (rep type-rep) + (types abbrev union subtype) (utils tc-utils) unstable/sequence unstable/hash "signatures.rkt" "constraint-structs.rkt" diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/infer-unit.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/infer-unit.rkt index 726ea1d65f..bfedebb095 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/infer-unit.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/infer-unit.rkt @@ -14,7 +14,7 @@ (rep free-variance type-rep filter-rep object-rep rep-utils) (types utils abbrev numeric-tower union subtype resolve substitute generalize) - (env type-name-env index-env tvar-env)) + (env index-env tvar-env)) make-env -> ->* one-of/c) "constraint-structs.rkt" "signatures.rkt" diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/infer.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/infer.rkt index d760db89ca..489f399037 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/infer.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/infer.rkt @@ -1,6 +1,5 @@ #lang racket/base -(require (except-in "../utils/utils.rkt" infer)) (require "infer-unit.rkt" "constraints.rkt" "dmap.rkt" "signatures.rkt" "restrict.rkt" "promote-demote.rkt" (only-in racket/unit provide-signature-elements diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/restrict.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/restrict.rkt index 6e6157f321..8400889622 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/restrict.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/restrict.rkt @@ -2,7 +2,7 @@ (require "../utils/utils.rkt") (require (rep type-rep) - (types utils union subtype remove-intersect resolve substitute) + (types union subtype remove-intersect resolve) "signatures.rkt" racket/match) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/float-complex.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/float-complex.rkt index 51dd2d398c..fefb0d49cb 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/float-complex.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/float-complex.rkt @@ -1,7 +1,7 @@ #lang racket/base (require syntax/parse syntax/stx syntax/id-table racket/dict - unstable/syntax racket/match racket/syntax + racket/match racket/syntax "../utils/utils.rkt" racket/unsafe/ops unstable/sequence (for-template racket/base racket/math racket/flonum racket/unsafe/ops) (utils tc-utils) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/float.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/float.rkt index 2914a3ef87..4be37c1b12 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/float.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/float.rkt @@ -4,7 +4,7 @@ (for-template racket/base racket/flonum racket/unsafe/ops racket/math) "../utils/utils.rkt" (utils tc-utils) - (types numeric-tower type-table union) + (types numeric-tower union) (optimizer utils numeric-utils logging fixnum)) (provide float-opt-expr float-arg-expr int-expr) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/logging.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/logging.rkt index 18516a8e95..e03d15bc04 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/logging.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/logging.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require racket/set racket/string racket/match racket/list +(require racket/string unstable/syntax unstable/logging data/queue "../utils/tc-utils.rkt") diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/optimizer.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/optimizer.rkt index f4d16ed90b..908b00b206 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/optimizer.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/optimizer.rkt @@ -5,7 +5,7 @@ (for-template racket/base) "../utils/utils.rkt" (private syntax-properties) - (optimizer utils logging + (optimizer utils number fixnum float float-complex vector string list pair sequence box struct dead-code apply unboxed-let hidden-costs)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/struct.rkt index 838ac7457a..b4a2934c71 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/struct.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/struct.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require syntax/parse syntax/stx unstable/syntax +(require syntax/parse syntax/stx (for-template racket/base racket/unsafe/ops) "../utils/utils.rkt" (utils tc-utils) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/unboxed-let.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/unboxed-let.rkt index 62bdd09fc6..cda8aa9fbc 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/unboxed-let.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/unboxed-let.rkt @@ -3,7 +3,6 @@ (require syntax/parse syntax/stx unstable/syntax unstable/sequence racket/list racket/dict racket/match racket/syntax "../utils/utils.rkt" - "../utils/tc-utils.rkt" (for-template racket/base) (types numeric-tower utils type-table) (rep type-rep) (env mvar-env) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/utils.rkt index cdc2b72974..6fd22ae4b9 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/utils.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/utils.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require racket/match unstable/sequence unstable/syntax +(require racket/match unstable/sequence racket/dict syntax/id-table racket/syntax syntax/stx "../utils/utils.rkt" (for-template racket/base) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/parse-type.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/parse-type.rkt index 1451641417..4d62bec0f2 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/parse-type.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/parse-type.rkt @@ -8,9 +8,8 @@ [make-arr* make-arr]) (utils tc-utils stxclass-util) syntax/stx (prefix-in c: (contract-req)) - syntax/parse racket/dict unstable/sequence - (env type-env-structs tvar-env type-name-env type-alias-env - lexical-env index-env) + syntax/parse unstable/sequence + (env tvar-env type-name-env type-alias-env lexical-env index-env) racket/match "parse-classes.rkt" (for-template racket/base "../base-env/colon.rkt") diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/type-annotation.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/type-annotation.rkt index 076b626a89..7e512241f1 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/type-annotation.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/type-annotation.rkt @@ -4,7 +4,7 @@ (rep type-rep) (utils tc-utils) (env global-env mvar-env scoped-tvar-env) - (except-in (types subtype union resolve utils generalize)) + (except-in (types subtype union utils generalize)) (private parse-type syntax-properties) (contract-req) racket/match) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/type-contract.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/type-contract.rkt index dea2baae36..80cddb6537 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/type-contract.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/type-contract.rkt @@ -8,13 +8,12 @@ "../utils/utils.rkt" syntax/parse (rep type-rep filter-rep object-rep) - (typecheck internal-forms) - (utils tc-utils require-contract) + (utils tc-utils) (env type-name-env) - (types resolve utils) + (types resolve) (prefix-in t: (types abbrev numeric-tower)) (private parse-type syntax-properties) - racket/match syntax/struct syntax/stx racket/syntax racket/list + racket/match syntax/stx racket/syntax racket/list unstable/sequence (contract-req) (for-template racket/base racket/contract racket/set (utils any-wrap) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/with-types.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/with-types.rkt index 0ad1f98128..62407ee938 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/with-types.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/private/with-types.rkt @@ -1,7 +1,6 @@ #lang racket/base -(require "../utils/utils.rkt" - racket/require racket/promise +(require racket/require racket/promise (for-template (except-in racket/base for for* with-handlers lambda λ define default-continuation-prompt-tag) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/free-variance.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/free-variance.rkt index 2e955d7524..f6a29fd61f 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/free-variance.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/free-variance.rkt @@ -2,9 +2,7 @@ (require "../utils/utils.rkt" racket/match racket/set - (for-syntax racket/base) - racket/lazy-require - (contract-req)) + racket/lazy-require) ;; Ugly hack - should use units (lazy-require diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/rep-utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/rep-utils.rkt index 68c8381b44..69ac9a4977 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/rep-utils.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/rep/rep-utils.rkt @@ -4,7 +4,7 @@ racket/match (contract-req) "free-variance.rkt" - "interning.rkt" unstable/struct + "interning.rkt" racket/lazy-require racket/stxparam (for-syntax diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/tc-setup.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/tc-setup.rkt index ab78b66889..efe21c6e67 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/tc-setup.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/tc-setup.rkt @@ -3,12 +3,8 @@ (require "utils/utils.rkt" (except-in syntax/parse id) syntax/stx racket/pretty racket/promise racket/lazy-require - (private type-contract) - (types utils) - (typecheck typechecker provide-handling tc-toplevel) - (env tvar-env type-name-env type-alias-env env-req mvar-env) + (env type-name-env type-alias-env mvar-env) (utils tc-utils disarm mutated-vars) - (rep type-rep) (for-syntax racket/base) (for-template racket/base)) (lazy-require [typed-racket/optimizer/optimizer (optimize-top)]) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-subforms-unit.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-subforms-unit.rkt index eb855f42ad..6c28e49f7a 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-subforms-unit.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-subforms-unit.rkt @@ -5,8 +5,8 @@ syntax/parse racket/match "signatures.rkt" "tc-metafunctions.rkt" - "tc-funapp.rkt" "tc-subst.rkt" - (types utils abbrev union subtype resolve) + "tc-funapp.rkt" + (types utils abbrev union resolve) (private syntax-properties) (utils tc-utils) (rep type-rep)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/def-export.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/def-export.rkt index e34d53b8a2..0db71d6b44 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/def-export.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/def-export.rkt @@ -2,7 +2,7 @@ (require racket/require (for-template "renamer.rkt") "renamer.rkt" (for-syntax syntax/parse racket/base "renamer.rkt" - (path-up "utils/tc-utils.rkt" "env/type-name-env.rkt"))) + (path-up "utils/tc-utils.rkt"))) (provide def-export) (define-syntax (def-export stx) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/provide-handling.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/provide-handling.rkt index d94840c063..0283bccdcc 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/provide-handling.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/provide-handling.rkt @@ -3,13 +3,10 @@ (require "../utils/utils.rkt" unstable/list unstable/sequence syntax/id-table racket/dict racket/syntax racket/struct-info racket/match syntax/parse syntax/location - (only-in srfi/1/list s:member) (only-in (private type-contract) type->contract) - (env type-name-env type-alias-env) (typecheck renamer def-binding) - (rep type-rep) (utils tc-utils) - (for-syntax syntax/parse racket/base) + (for-syntax racket/base) (for-template racket/base "def-export.rkt" racket/contract)) (provide remove-provides provide? generate-prov get-alternate) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app-combined.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app-combined.rkt index 867eecd7a7..6e7f45276b 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app-combined.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app-combined.rkt @@ -1,8 +1,6 @@ #lang racket/base -(require "../utils/utils.rkt" - - "tc-app/tc-app-apply.rkt" +(require "tc-app/tc-app-apply.rkt" "tc-app/tc-app-eq.rkt" "tc-app/tc-app-hetero.rkt" "tc-app/tc-app-keywords.rkt" @@ -12,7 +10,6 @@ "tc-app/tc-app-special.rkt" "tc-app/tc-app-values.rkt" "tc-app/tc-app-main.rkt" - "tc-app/signatures.rkt" "signatures.rkt") (require racket/unit) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app-helper.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app-helper.rkt index 0046bb7a8b..a3ebbd15bb 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app-helper.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app-helper.rkt @@ -1,13 +1,13 @@ #lang racket/base (require "../utils/utils.rkt" - racket/match unstable/list unstable/sequence racket/set syntax/parse + racket/match unstable/list unstable/sequence racket/set syntax/stx (only-in srfi/1 unzip4) (only-in racket/list make-list) (contract-req) (typecheck check-below tc-subst) (utils tc-utils) - (rep type-rep object-rep) + (rep type-rep) (except-in (types utils union abbrev subtype) -> ->* one-of/c)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-apply.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-apply.rkt index 25dd768c83..aea5a3fdcb 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-apply.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-apply.rkt @@ -4,8 +4,7 @@ "signatures.rkt" "utils.rkt" syntax/parse racket/match - syntax/parse/experimental/reflect - (typecheck signatures tc-funapp) + (typecheck signatures) (types abbrev utils) (rep type-rep) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-eq.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-eq.rkt index 578f9879f9..acc989d89f 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-eq.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-eq.rkt @@ -4,7 +4,6 @@ "signatures.rkt" "utils.rkt" syntax/parse syntax/stx racket/match - syntax/parse/experimental/reflect (typecheck signatures tc-funapp) (types abbrev union utils) (rep type-rep) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-hetero.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-hetero.rkt index 0c094a1dc9..b012c1af09 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-hetero.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-hetero.rkt @@ -1,9 +1,7 @@ #lang racket/unit (require "../../utils/utils.rkt" - (prefix-in c: (contract-req)) syntax/parse syntax/stx racket/match unstable/sequence unstable/syntax - syntax/parse/experimental/reflect "signatures.rkt" "utils.rkt" ;; fixme - don't need to be bound in this phase - only to make tests work @@ -11,7 +9,6 @@ ;; end fixme (types utils abbrev numeric-tower union resolve type-table generalize) (typecheck signatures check-below) - (utils tc-utils) (rep type-rep rep-utils) (for-template racket/unsafe/ops racket/base)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-keywords.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-keywords.rkt index 0899ce047e..13a4f0ea4c 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-keywords.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-keywords.rkt @@ -5,7 +5,6 @@ "signatures.rkt" "utils.rkt" syntax/parse syntax/stx racket/match racket/set - syntax/parse/experimental/reflect (typecheck signatures tc-app-helper tc-funapp tc-metafunctions) (types abbrev utils union substitute subtype) (rep type-rep) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-lambda.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-lambda.rkt index 8cbbb14966..99a1b0e1b8 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-lambda.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-lambda.rkt @@ -4,12 +4,10 @@ "signatures.rkt" "utils.rkt" syntax/parse racket/match racket/list - syntax/parse/experimental/reflect unstable/sequence unstable/syntax - (typecheck signatures tc-funapp find-annotation) + (typecheck signatures find-annotation) (types abbrev utils generalize type-table) (private type-annotation) - (rep type-rep) (for-template racket/base)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-list.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-list.rkt index 74f83e4b2f..910203eae8 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-list.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-list.rkt @@ -5,8 +5,6 @@ "signatures.rkt" "utils.rkt" syntax/parse syntax/stx racket/match unstable/sequence unstable/syntax - syntax/parse/experimental/reflect - (only-in '#%kernel [reverse k:reverse]) (typecheck signatures tc-funapp) (types abbrev utils union substitute) (rep type-rep) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-main.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-main.rkt index 63b2edbb05..8bfa6479b7 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-main.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-main.rkt @@ -6,10 +6,9 @@ syntax/parse racket/match syntax/parse/experimental/reflect (typecheck signatures tc-funapp) - (types utils abbrev) + (types utils) (private syntax-properties) - (rep type-rep filter-rep object-rep rep-utils) - (for-template racket/base)) + (rep type-rep filter-rep object-rep)) (import tc-expr^ tc-app-keywords^ tc-app-hetero^ tc-app-list^ tc-app-apply^ tc-app-values^ diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-objects.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-objects.rkt index 6c893642ea..1c731a8cef 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-objects.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-objects.rkt @@ -4,9 +4,9 @@ "signatures.rkt" "utils.rkt" syntax/parse syntax/stx racket/match unstable/sequence unstable/syntax - syntax/parse/experimental/reflect racket/dict - (typecheck signatures tc-funapp) - (types abbrev resolve union utils) + racket/dict + (typecheck signatures) + (types resolve union utils) (rep type-rep) (utils tc-utils) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-special.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-special.rkt index 31afeaf20d..0ca5e1f88b 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-special.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-special.rkt @@ -4,7 +4,6 @@ "signatures.rkt" "utils.rkt" syntax/parse racket/match - syntax/parse/experimental/reflect unstable/list syntax/stx (typecheck signatures tc-funapp) (types abbrev utils) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-values.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-values.rkt index d8cefcb3e1..f1c33cf071 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-values.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-values.rkt @@ -4,10 +4,8 @@ "signatures.rkt" "utils.rkt" syntax/parse racket/match unstable/sequence unstable/syntax - syntax/parse/experimental/reflect (typecheck signatures tc-funapp) - (types abbrev utils) - (rep type-rep) + (types utils) (for-template racket/base)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-apply.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-apply.rkt index be860e6a75..f0034180ce 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-apply.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-apply.rkt @@ -6,11 +6,8 @@ (types utils union subtype abbrev substitute) (utils tc-utils) (env tvar-env index-env) - (rep type-rep filter-rep object-rep) - (r:infer infer) - (for-template - (only-in '#%kernel [apply k:apply]) - racket/base)) + (rep type-rep filter-rep) + (r:infer infer)) (import tc-expr^ tc-lambda^ tc-let^ tc-app^) (export tc-apply^) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expr-unit.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expr-unit.rkt index af828d6176..ef2993babd 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expr-unit.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expr-unit.rkt @@ -3,17 +3,16 @@ (require (rename-in "../utils/utils.rkt" [private private-in]) racket/match (prefix-in - (contract-req)) - "signatures.rkt" "tc-envops.rkt" "tc-metafunctions.rkt" "tc-subst.rkt" - "check-below.rkt" "tc-funapp.rkt" "tc-app-helper.rkt" "../types/kw-types.rkt" - (types utils abbrev numeric-tower union subtype - type-table filter-ops generalize) + "signatures.rkt" + "check-below.rkt" "tc-app-helper.rkt" "../types/kw-types.rkt" + (types utils abbrev union subtype type-table) (private-in parse-type type-annotation syntax-properties) (rep type-rep filter-rep object-rep) - (utils tc-utils stxclass-util) - (env lexical-env type-env-structs tvar-env index-env) + (utils tc-utils) + (env lexical-env tvar-env index-env) racket/private/class-internal syntax/parse syntax/stx - unstable/function unstable/syntax + unstable/syntax (only-in srfi/1 split-at) (for-template "internal-forms.rkt" (only-in '#%paramz [parameterization-key pz:pk]))) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-funapp.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-funapp.rkt index 4c344fa928..5cee8bf47f 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-funapp.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-funapp.rkt @@ -6,7 +6,6 @@ (for-syntax syntax/parse racket/base) (types utils union subtype resolve abbrev substitute) (typecheck tc-metafunctions tc-app-helper) - (utils tc-utils) (rep type-rep) (r:infer infer)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-if.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-if.rkt index 586125e52b..bc6e51fe2a 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-if.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-if.rkt @@ -1,14 +1,12 @@ #lang racket/unit -(require (rename-in "../utils/utils.rkt" [infer r:infer]) +(require "../utils/utils.rkt" "signatures.rkt" (rep type-rep filter-rep object-rep) - (types abbrev subtype union utils filter-ops) + (types abbrev union utils filter-ops) (env lexical-env type-env-structs) - (r:infer infer) (utils tc-utils) - "tc-envops.rkt" "tc-metafunctions.rkt" + "tc-envops.rkt" (types type-table) - syntax/kerncase racket/match) ;; if typechecking diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-lambda-unit.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-lambda-unit.rkt index 0ba7429090..f5ee726ae2 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-lambda-unit.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-lambda-unit.rkt @@ -9,10 +9,10 @@ [make-arr* make-arr]) (private type-annotation syntax-properties) (types type-table) - (typecheck signatures tc-metafunctions tc-subst check-below) - (env type-env-structs lexical-env tvar-env index-env scoped-tvar-env) + (typecheck signatures tc-metafunctions tc-subst) + (env lexical-env tvar-env index-env scoped-tvar-env) (utils tc-utils) - (for-template racket/base "internal-forms.rkt")) + (for-template racket/base)) (import tc-expr^) (export tc-lambda^) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-let-unit.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-let-unit.rkt index f5f8e10c69..df36527688 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-let-unit.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-let-unit.rkt @@ -6,9 +6,9 @@ (only-in (types abbrev) (-> t:->)) (private type-annotation parse-type syntax-properties) (env lexical-env type-alias-env global-env type-env-structs scoped-tvar-env) - (rep type-rep filter-rep object-rep) + (rep type-rep filter-rep) syntax/free-vars - (typecheck signatures tc-metafunctions tc-subst check-below) + (typecheck signatures tc-metafunctions tc-subst) racket/match (contract-req) syntax/kerncase syntax/parse syntax/stx (for-template racket/base (typecheck internal-forms))) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-literal.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-literal.rkt index 75a32c2bb6..375ee6a7f4 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-literal.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-literal.rkt @@ -3,10 +3,10 @@ (require "../utils/utils.rkt" racket/match (typecheck signatures check-below) - (types abbrev numeric-tower utils resolve subtype union generalize) + (types abbrev numeric-tower resolve subtype union generalize) (rep type-rep) (only-in (infer infer) restrict) - (utils tc-utils stxclass-util) + (utils stxclass-util) syntax/parse unstable/function) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-metafunctions.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-metafunctions.rkt index efdda7380a..6ea42d519d 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-metafunctions.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-metafunctions.rkt @@ -2,7 +2,7 @@ (require "../utils/utils.rkt" racket/match racket/list - (except-in (types subtype abbrev union utils filter-ops) + (except-in (types abbrev union utils filter-ops) -> ->* one-of/c) (rep type-rep filter-rep object-rep rep-utils) (contract-req)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-structs.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-structs.rkt index 054c7ab3c5..6592e6c4d8 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-structs.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-structs.rkt @@ -7,8 +7,8 @@ (prefix-in c: (contract-req)) (rep type-rep object-rep free-variance) (private parse-type syntax-properties) - (types abbrev utils union resolve substitute type-table) - (env global-env type-env-structs type-name-env tvar-env) + (types abbrev utils resolve substitute type-table) + (env global-env type-name-env tvar-env) (utils tc-utils) (typecheck def-binding) (for-syntax syntax/parse racket/base) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt index a00271d024..43d9661139 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-toplevel.rkt @@ -9,7 +9,7 @@ (private parse-type type-annotation type-contract syntax-properties) (env global-env init-envs type-name-env type-alias-env lexical-env env-req mvar-env scoped-tvar-env) - (utils tc-utils mutated-vars) + (utils tc-utils) (typecheck provide-handling def-binding tc-structs typechecker) ;; to appease syntax-parse in the tests diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/typechecker.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/typechecker.rkt index 61e314987d..00a7342042 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/typechecker.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/typechecker.rkt @@ -1,8 +1,6 @@ #lang racket/base -(require "../utils/utils.rkt" - racket/trace - (only-in racket/unit +(require (only-in racket/unit provide-signature-elements define-values/invoke-unit/infer link) "signatures.rkt" diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/abbrev.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/abbrev.rkt index 3cc295084f..58dcfad587 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/abbrev.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/abbrev.rkt @@ -9,19 +9,16 @@ (prefix-in c: (contract-req)) (rename-in (rep type-rep object-rep rep-utils) [make-Base make-Base*]) - (utils tc-utils) (types union numeric-tower) ;; Using this form so all-from-out works "base-abbrev.rkt" "match-expanders.rkt" - (for-syntax racket/base syntax/parse racket/list) - ;; for base type contracts - (for-template racket/base racket/contract/base racket/promise + (for-template racket/base racket/contract/base racket/tcp racket/flonum racket/udp '#%place) ;; for base type predicates racket/pretty racket/udp - racket/promise racket/tcp racket/flonum + racket/tcp racket/flonum '#%place) ;; avoid the other dependencies of `racket/place` diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/generalize.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/generalize.rkt index cba2f6eedc..332c3cb2ec 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/generalize.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/generalize.rkt @@ -1,13 +1,10 @@ #lang racket/base (require "../utils/utils.rkt" - (rep type-rep filter-rep object-rep rep-utils) - (utils tc-utils) + (rep type-rep) "abbrev.rkt" "subtype.rkt" "substitute.rkt" "union.rkt" "numeric-tower.rkt" - racket/match - (for-syntax syntax/parse racket/base) - syntax/id-table racket/dict) + racket/match) (provide generalize) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/kw-types.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/kw-types.rkt index 7afe0c3f9e..732505ac7e 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/kw-types.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/kw-types.rkt @@ -1,7 +1,7 @@ #lang racket/base (require "abbrev.rkt" "../rep/type-rep.rkt" - "union.rkt" "../utils/tc-utils.rkt" + "../utils/tc-utils.rkt" racket/list racket/set racket/dict racket/match) ;; convert : [Listof Keyword] [Listof Type] [Listof Type] [Option Type] diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/match-expanders.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/match-expanders.rkt index 615b2f5c5e..6d0fbed5f5 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/match-expanders.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/match-expanders.rkt @@ -8,7 +8,7 @@ (types resolve) (contract-req) racket/set - (for-syntax racket/base syntax/parse racket/list)) + (for-syntax racket/base syntax/parse)) (provide Listof: List: MListof:) (provide/cond-contract diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/numeric-tower.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/numeric-tower.rkt index 0b1542acdd..7c0d6d347e 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/numeric-tower.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/numeric-tower.rkt @@ -4,10 +4,8 @@ (rename-in (types numeric-predicates base-abbrev) [simple-Un *Un]) (rename-in (rep type-rep) [make-Base make-Base*]) - racket/match - racket/function unstable/function - (for-template racket/base racket/contract/base racket/flonum (types numeric-predicates))) + (for-template racket/base racket/contract/base (types numeric-predicates))) (provide portable-fixnum? portable-index? -Zero -One -PosByte -Byte -PosIndex -Index diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/resolve.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/resolve.rkt index 1c87e6571e..452f1a9fcc 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/resolve.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/resolve.rkt @@ -1,7 +1,7 @@ #lang racket/base (require "../utils/utils.rkt") -(require (rep type-rep rep-utils free-variance) +(require (rep type-rep rep-utils) (env type-name-env) (utils tc-utils) (types utils current-seen) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/substitute.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/substitute.rkt index 9b303b8776..bfbe948a23 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/substitute.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/substitute.rkt @@ -1,14 +1,14 @@ #lang racket/base (require "../utils/utils.rkt" - racket/match racket/set racket/function unstable/function + racket/match racket/set racket/lazy-require (contract-req) (only-in (types base-abbrev) -lst* -result -no-filter -no-obj) - (rep type-rep filter-rep object-rep rep-utils) + (rep type-rep rep-utils) (utils tc-utils) (rep free-variance) - (env index-env tvar-env)) + (env tvar-env)) (lazy-require ("union.rkt" (Un))) (provide subst-all substitute substitute-dots substitute-dotted subst diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/tc-error.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/tc-error.rkt index 739e82cac0..f37c737dfa 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/tc-error.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/tc-error.rkt @@ -1,7 +1,7 @@ #lang racket/base (require "../utils/utils.rkt" - (rep type-rep filter-rep object-rep rep-utils) + (rep type-rep) (utils tc-utils) "base-abbrev.rkt" (prefix-in c: (contract-req)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/tc-result.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/tc-result.rkt index 194cdbe6bc..c0f1029b30 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/tc-result.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/tc-result.rkt @@ -1,7 +1,7 @@ #lang racket/base (require "../utils/utils.rkt" - (rep free-variance type-rep filter-rep object-rep rep-utils) + (rep type-rep filter-rep rep-utils) (utils tc-utils) (types base-abbrev) racket/match diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/type-table.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/type-table.rkt index a62dd27efe..3bde7cb807 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/type-table.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/type-table.rkt @@ -1,5 +1,6 @@ #lang racket/base +;; TODO figure out why these imports are needed even though they don't seem to be. (require syntax/id-table racket/dict racket/match mzlib/pconvert "../utils/utils.rkt" racket/syntax "../utils/tc-utils.rkt" diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/utils.rkt index 70c0542fbf..5634f5c221 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/utils.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/utils.rkt @@ -1,11 +1,10 @@ #lang racket/base (require "../utils/utils.rkt" - (rep type-rep filter-rep object-rep rep-utils) + (rep type-rep rep-utils) (utils tc-utils) "substitute.rkt" "tc-result.rkt" "tc-error.rkt" (rep free-variance) - (env index-env tvar-env) racket/match racket/set racket/list diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/print-struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/print-struct.rkt index 6119e5a952..2b074c72bb 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/print-struct.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/print-struct.rkt @@ -1,6 +1,6 @@ #lang racket/base -(require racket/generic (for-syntax racket/base syntax/parse)) +(require (for-syntax racket/base syntax/parse)) (provide define-struct/printer) (define-syntax (define-struct/printer stx) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/tc-utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/tc-utils.rkt index 9f987b2c3c..5b5eca9c76 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/tc-utils.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/tc-utils.rkt @@ -6,7 +6,7 @@ don't depend on any other portion of the system |# (provide (all-defined-out) (all-from-out "disappeared-use.rkt")) -(require "syntax-traversal.rkt" racket/dict "disappeared-use.rkt" racket/promise +(require "syntax-traversal.rkt" "disappeared-use.rkt" racket/promise syntax/parse (for-syntax racket/base syntax/parse) racket/match) ;; a parameter representing the original location of the syntax being