From a27553b1f64bc21f584987983ca71478c84ee436 Mon Sep 17 00:00:00 2001 From: Asumu Takikawa Date: Fri, 21 Nov 2014 01:46:52 -0500 Subject: [PATCH] Remove unused requires in TR original commit: 381078510a26f7ce0b6dc91ad6e10a07f8b85755 --- .../typed-racket-lib/typed-racket/core.rkt | 4 ++-- .../typed-racket/env/init-envs.rkt | 2 +- .../typed-racket/env/row-constraint-env.rkt | 3 +-- .../typed-racket/env/type-alias-helper.rkt | 2 -- .../typed-racket/env/type-env-structs.rkt | 8 ++++---- .../typed-racket/infer/constraint-structs.rkt | 4 +++- .../typed-racket/infer/constraints.rkt | 3 +-- .../typed-racket-lib/typed-racket/infer/dmap.rkt | 2 +- .../typed-racket/infer/promote-demote.rkt | 2 +- .../typed-racket/infer/signatures.rkt | 4 +++- .../typed-racket/optimizer/apply.rkt | 1 - .../typed-racket/optimizer/box.rkt | 6 +----- .../typed-racket/optimizer/dead-code.rkt | 3 +-- .../typed-racket/optimizer/extflonum.rkt | 2 +- .../typed-racket/optimizer/fixnum.rkt | 3 +-- .../typed-racket/optimizer/float-complex.rkt | 3 +-- .../typed-racket/optimizer/hidden-costs.rkt | 4 ++-- .../typed-racket/optimizer/list.rkt | 2 -- .../typed-racket/optimizer/number.rkt | 1 - .../typed-racket/optimizer/pair.rkt | 3 +-- .../typed-racket/optimizer/sequence.rkt | 2 +- .../typed-racket/optimizer/string.rkt | 2 -- .../typed-racket/optimizer/struct.rkt | 4 ++-- .../typed-racket/optimizer/unboxed-let.rkt | 4 ++-- .../typed-racket/optimizer/utils.rkt | 1 - .../typed-racket/optimizer/vector.rkt | 3 +-- .../typed-racket/private/parse-type.rkt | 6 ++---- .../typed-racket/private/type-annotation.rkt | 2 +- .../typed-racket/private/type-contract.rkt | 7 +++---- .../typed-racket/private/with-types.rkt | 9 +++------ .../typed-racket/rep/free-variance.rkt | 3 +-- .../static-contracts/combinators/any.rkt | 2 +- .../static-contracts/combinators/derived.rkt | 2 +- .../static-contracts/combinators/function.rkt | 2 +- .../static-contracts/combinators/lengths.rkt | 1 - .../static-contracts/combinators/none.rkt | 2 +- .../static-contracts/combinators/object.rkt | 1 - .../static-contracts/combinators/parametric.rkt | 3 +-- .../static-contracts/combinators/simple.rkt | 2 -- .../static-contracts/combinators/struct.rkt | 3 +-- .../static-contracts/combinators/structural.rkt | 3 +-- .../typed-racket/static-contracts/instantiate.rkt | 2 -- .../typed-racket-lib/typed-racket/tc-setup.rkt | 3 +-- .../typed-racket/typecheck/check-class-unit.rkt | 4 +--- .../typed-racket/typecheck/def-binding.rkt | 4 +++- .../typed-racket/typecheck/find-annotation.rkt | 3 ++- .../typed-racket/typecheck/provide-handling.rkt | 4 +--- .../typed-racket/typecheck/tc-app-helper.rkt | 2 +- .../typecheck/tc-app/tc-app-contracts.rkt | 8 +------- .../typecheck/tc-app/tc-app-hetero.rkt | 1 - .../typecheck/tc-app/tc-app-keywords.rkt | 2 +- .../typed-racket/typecheck/tc-app/tc-app-list.rkt | 2 +- .../typed-racket/typecheck/tc-app/tc-app-main.rkt | 1 - .../typecheck/tc-app/tc-app-objects.rkt | 3 +-- .../typecheck/tc-app/tc-app-values.rkt | 2 +- .../typed-racket/typecheck/tc-apply.rkt | 5 ++--- .../typed-racket/typecheck/tc-expr-unit.rkt | 15 +++++++-------- .../typed-racket/typecheck/tc-expression.rkt | 6 +++--- .../typed-racket/typecheck/tc-funapp.rkt | 8 +++++--- .../typed-racket/typecheck/tc-if.rkt | 5 ++--- .../typed-racket/typecheck/tc-lambda-unit.rkt | 3 +-- .../typed-racket/typecheck/tc-let-unit.rkt | 9 +++++---- .../typed-racket/typecheck/tc-structs.rkt | 5 +++-- .../typed-racket/typecheck/tc-toplevel.rkt | 4 ++-- .../typed-racket/types/abbrev.rkt | 2 +- .../typed-racket/types/filter-ops.rkt | 2 -- .../typed-racket/types/printer.rkt | 3 +-- .../typed-racket/types/remove-intersect.rkt | 2 +- .../typed-racket/types/structural.rkt | 3 +-- .../typed-racket/types/tc-result.rkt | 2 +- .../typed-racket/utils/struct-type-c.rkt | 2 +- 71 files changed, 98 insertions(+), 145 deletions(-) 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 0cbb6a43..8defb569 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,8 +7,8 @@ (except-in syntax/parse id) racket/match racket/syntax syntax/flatten-begin - (types utils abbrev generalize type-table) - (typecheck provide-handling tc-toplevel tc-app-helper) + (types utils abbrev generalize) + (typecheck provide-handling tc-app-helper) (rep type-rep) (for-template (base-env top-interaction)) (utils utils tc-utils arm) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/init-envs.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/init-envs.rkt index 27ad2c52..a9fbb5ee 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/init-envs.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/init-envs.rkt @@ -12,7 +12,7 @@ (rep type-rep object-rep filter-rep rep-utils free-variance) (for-syntax syntax/parse racket/base) (types abbrev union) - racket/syntax racket/dict racket/list + racket/dict racket/list mzlib/pconvert racket/match) (provide ;; convenience form for defining an initial environment diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/row-constraint-env.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/row-constraint-env.rkt index 4edd325d..ca22c572 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/row-constraint-env.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/row-constraint-env.rkt @@ -7,8 +7,7 @@ ;; type variables, this additional environment is ;; needed to keep track of the constraints. -(require "../utils/utils.rkt" - (rep type-rep)) +(require "../utils/utils.rkt") (provide initial-row-constraint-env current-row-constraints diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-alias-helper.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-alias-helper.rkt index 8649eeb4..aae1304e 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-alias-helper.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/env/type-alias-helper.rkt @@ -9,9 +9,7 @@ (private parse-type) (typecheck internal-forms) (types resolve base-abbrev) - data/queue racket/dict - racket/format racket/list racket/match syntax/id-table 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 979e17d6..8990cb28 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,11 +1,11 @@ #lang racket/base -(require racket/dict racket/match +(require racket/match syntax/id-table (except-in "../utils/utils.rkt" env) - (contract-req) - (rep filter-rep type-rep) - (except-in (utils tc-utils) make-env)) + (contract-req)) + +(require-for-cond-contract (rep type-rep filter-rep)) ;; types is a free-id-table of identifiers to types ;; props is a list of known propositions diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/constraint-structs.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/constraint-structs.rkt index 1cb1f269..400968ed 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/constraint-structs.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/constraint-structs.rkt @@ -1,6 +1,8 @@ #lang racket/base -(require "../utils/utils.rkt" (rep type-rep) (contract-req) racket/match (for-syntax racket/base syntax/parse)) +(require "../utils/utils.rkt" (contract-req)) + +(require-for-cond-contract (rep type-rep)) ;; S, T types ;; represents S <: X <: T (see "Local Type Inference" pg. 12) 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 3365c9bd..939207c1 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 @@ -2,8 +2,7 @@ (require "../utils/utils.rkt" (types abbrev union subtype) - (utils tc-utils) - unstable/sequence unstable/hash + unstable/sequence "fail.rkt" "signatures.rkt" "constraint-structs.rkt" racket/match racket/list) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/dmap.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/dmap.rkt index 5fe707cb..3f2001e6 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/dmap.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/dmap.rkt @@ -4,7 +4,7 @@ "signatures.rkt" "constraint-structs.rkt" (utils tc-utils) (contract-req) - unstable/sequence unstable/hash racket/match) + unstable/sequence) (import constraints^) (export dmap^) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/promote-demote.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/promote-demote.rkt index 93c84d1b..81766c10 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/promote-demote.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/promote-demote.rkt @@ -2,7 +2,7 @@ (require "../utils/utils.rkt" (rep type-rep rep-utils) - (types abbrev union utils structural) + (types abbrev utils structural) (prefix-in c: (contract-req)) racket/performance-hint racket/list racket/match) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/signatures.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/signatures.rkt index 11a0daa2..19bd935f 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/signatures.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/infer/signatures.rkt @@ -1,9 +1,11 @@ #lang racket/base (require "../utils/utils.rkt" racket/unit (contract-req) - (infer constraint-structs) (utils unit-utils) (rep type-rep)) + +(require-for-cond-contract (infer constraint-structs)) + (provide (all-defined-out)) (define-signature dmap^ diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/apply.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/apply.rkt index 3e52a69d..725550da 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/apply.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/apply.rkt @@ -2,7 +2,6 @@ (require syntax/parse racket/syntax (for-template racket/unsafe/ops racket/base (prefix-in k- '#%kernel)) "../utils/utils.rkt" - (utils tc-utils) (optimizer utils logging)) (provide apply-opt-expr) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/box.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/box.rkt index 246a5916..a3db8561 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/box.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/box.rkt @@ -1,12 +1,8 @@ #lang racket/base -(require syntax/parse syntax/stx - racket/match +(require syntax/parse "../utils/utils.rkt" (for-template racket/base racket/unsafe/ops) - (utils tc-utils) - (rep type-rep) - (types type-table utils) (optimizer utils logging)) (provide box-opt-expr) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/dead-code.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/dead-code.rkt index 7ed55ae6..a292ce99 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/dead-code.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/dead-code.rkt @@ -1,11 +1,10 @@ #lang racket/base -(require syntax/parse racket/promise syntax/stx unstable/sequence +(require syntax/parse syntax/stx unstable/sequence racket/syntax (for-template racket/base) "../utils/utils.rkt" (types type-table) - (utils tc-utils) (optimizer utils logging)) (provide dead-code-opt-expr) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/extflonum.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/extflonum.rkt index 824d8965..266dbff0 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/extflonum.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/extflonum.rkt @@ -4,7 +4,7 @@ syntax/parse/experimental/specialize (for-template racket/base racket/extflonum racket/unsafe/ops) "../utils/utils.rkt" - (optimizer utils numeric-utils logging float fixnum)) + (optimizer utils logging float fixnum)) (provide extflonum-opt-expr) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/fixnum.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/fixnum.rkt index b01e837a..c5150bb7 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/fixnum.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/fixnum.rkt @@ -1,11 +1,10 @@ #lang racket/base -(require syntax/parse racket/dict +(require syntax/parse syntax/parse/experimental/specialize "../utils/utils.rkt" (for-template racket/base racket/fixnum racket/unsafe/ops) (for-syntax racket/base syntax/parse racket/syntax) - (utils tc-utils) (types numeric-tower union) (optimizer utils logging)) 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 27617974..74944d63 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,10 +1,9 @@ #lang racket/base -(require syntax/parse syntax/stx racket/dict racket/promise +(require syntax/parse syntax/stx racket/promise racket/syntax racket/match syntax/parse/experimental/specialize "../utils/utils.rkt" racket/unsafe/ops unstable/sequence (for-template racket/base racket/math racket/flonum racket/unsafe/ops) - (utils tc-utils) (types numeric-tower subtype type-table utils) (optimizer utils numeric-utils logging float unboxed-tables)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/hidden-costs.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/hidden-costs.rkt index 50f89670..1213b4e4 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/hidden-costs.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/hidden-costs.rkt @@ -1,10 +1,10 @@ #lang racket/base -(require syntax/parse syntax/stx unstable/sequence +(require syntax/parse unstable/sequence (for-template racket/base) "../utils/utils.rkt" (optimizer utils logging) - (types abbrev type-table struct-table)) + (types abbrev struct-table)) (provide hidden-cost-log-expr) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/list.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/list.rkt index 965444cf..5a42c893 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/list.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/list.rkt @@ -2,8 +2,6 @@ (require syntax/parse racket/match "../utils/utils.rkt" - (utils tc-utils) - (rep type-rep) (types abbrev utils type-table) (optimizer utils logging) (for-template racket/base racket/unsafe/ops)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/number.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/number.rkt index f9b71b5c..9ab369e1 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/number.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/number.rkt @@ -4,7 +4,6 @@ syntax/parse/experimental/specialize (for-template racket/base) "../utils/utils.rkt" - (utils tc-utils) (types numeric-tower union) (optimizer utils logging)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/pair.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/pair.rkt index 62f41789..a022ce21 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/pair.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/pair.rkt @@ -1,11 +1,10 @@ #lang racket/base -(require syntax/parse syntax/stx +(require syntax/parse racket/match (for-template racket/base racket/unsafe/ops racket/list) (for-syntax racket/base syntax/parse racket/syntax) "../utils/utils.rkt" - (utils tc-utils) (rep type-rep) (types type-table utils) (typecheck typechecker) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/sequence.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/sequence.rkt index e0370a4d..64e255f3 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/sequence.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/sequence.rkt @@ -7,7 +7,7 @@ (for-template racket/base racket/unsafe/ops) "../utils/utils.rkt" "../utils/tc-utils.rkt" (rep type-rep) - (types abbrev type-table utils) + (types abbrev) (optimizer utils logging float)) (provide sequence-opt-expr) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/string.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/string.rkt index a1371a91..4091eb27 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/string.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/string.rkt @@ -3,8 +3,6 @@ (require syntax/parse (for-template racket/base racket/unsafe/ops) "../utils/utils.rkt" - (utils tc-utils) - (types abbrev) (optimizer utils logging)) (provide string-opt-expr) 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 bcf9313e..8523945b 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,10 +1,10 @@ #lang racket/base -(require syntax/parse syntax/stx +(require syntax/parse (for-template racket/base racket/unsafe/ops) "../utils/utils.rkt" (utils tc-utils) - (types type-table struct-table) + (types struct-table) (optimizer utils logging)) (provide struct-opt-expr) 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 9ab9a734..6178e047 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 @@ -1,8 +1,8 @@ #lang racket/base -(require syntax/parse syntax/stx unstable/syntax unstable/sequence +(require syntax/parse syntax/stx unstable/sequence syntax/parse/experimental/template - racket/list racket/dict racket/match racket/syntax + racket/match racket/syntax racket/promise "../utils/utils.rkt" (for-template racket/base) 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 280def07..dab28803 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 @@ -7,7 +7,6 @@ racket/promise (for-syntax racket/base syntax/parse racket/syntax) "../utils/utils.rkt" - (utils tc-utils) (only-in (utils literal-syntax-class) [define-literal-syntax-class define-literal-syntax-class*]) (for-template racket/base) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/vector.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/vector.rkt index aed0b046..424a1548 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/vector.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/optimizer/vector.rkt @@ -1,10 +1,9 @@ #lang racket/base -(require syntax/parse syntax/stx +(require syntax/parse racket/match racket/flonum racket/extflonum (for-template racket/base racket/flonum racket/extflonum racket/unsafe/ops) "../utils/utils.rkt" - (utils tc-utils) (rep type-rep) (types type-table utils numeric-tower abbrev) (optimizer utils logging fixnum)) 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 2446cd2e..c7f1d705 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 @@ -5,19 +5,17 @@ (require "../utils/utils.rkt" (except-in (rep type-rep object-rep) make-arr) (rename-in (types abbrev union utils filter-ops resolve - classes subtype) + classes) [make-arr* make-arr]) (utils tc-utils stxclass-util literal-syntax-class) syntax/stx (prefix-in c: (contract-req)) syntax/parse unstable/sequence - (env tvar-env type-name-env type-alias-env mvar-env + (env tvar-env type-alias-env mvar-env lexical-env index-env row-constraint-env) - (only-in racket/list flatten) racket/dict racket/promise racket/format racket/match - racket/syntax (only-in unstable/list check-duplicate) "parse-classes.rkt" (for-label 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 26bf6053..a3c8bb17 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 @@ -3,7 +3,7 @@ (require "../utils/utils.rkt" (rep type-rep) (utils tc-utils) - (env global-env mvar-env scoped-tvar-env) + (env global-env mvar-env) (except-in (types subtype abbrev union utils generalize) -> ->* one-of/c) (private parse-type syntax-properties) 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 ecc87bc7..27014f84 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 @@ -7,22 +7,21 @@ syntax/parse (rep type-rep filter-rep object-rep) (utils tc-utils) - (env type-name-env type-alias-env) + (env type-name-env) (rep rep-utils) - (types resolve union utils kw-types printer) + (types resolve union utils printer) (prefix-in t: (types abbrev numeric-tower)) (private parse-type syntax-properties) racket/match racket/syntax racket/list racket/format racket/dict unstable/list - unstable/sequence (only-in (types abbrev) -Bottom) (static-contracts instantiate optimize structures combinators) ;; TODO make this from contract-req (prefix-in c: racket/contract) (contract-req) - (for-syntax racket/base syntax/parse racket/syntax) + (for-syntax racket/base) (for-template racket/base racket/contract (utils any-wrap))) (provide 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 859e7021..8d898d2e 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,17 +1,14 @@ #lang racket/base (require "../utils/utils.rkt" - (base-env base-types-extra extra-procs) + (base-env base-types-extra) (except-in (base-env prims) with-handlers λ lambda define) - (env type-name-env type-alias-env type-env-structs - global-env tvar-env) + (env type-name-env type-alias-env global-env) (private parse-type type-contract syntax-properties) (typecheck tc-toplevel typechecker) (types utils) (utils lift tc-utils disarm arm literal-syntax-class) - racket/match racket/promise - racket/require racket/syntax syntax/flatten-begin syntax/parse @@ -30,7 +27,7 @@ for*/or for*/sum for*/product for*/first for*/last for*/fold) (base-env prims) - (prefix-in c: (combine-in racket/contract/region racket/contract/base))) + (prefix-in c: racket/contract/region)) (for-label racket/base (base-env base-types-extra))) 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 f6a29fd6..08ca3088 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 @@ -1,6 +1,5 @@ #lang racket/base -(require "../utils/utils.rkt" - racket/match +(require racket/match racket/set racket/lazy-require) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/any.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/any.rkt index 83943321..f39d68d0 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/any.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/any.rkt @@ -8,7 +8,7 @@ racket/match racket/contract (for-template racket/base racket/contract/base) - (for-syntax racket/base racket/syntax syntax/parse)) + (for-syntax racket/base syntax/parse)) (provide (contract-out diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/derived.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/derived.rkt index f41db047..6f1549ab 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/derived.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/derived.rkt @@ -5,7 +5,7 @@ ;; Ex: (listof/sc any/sc) => list?/sc (require "simple.rkt" "structural.rkt" - (for-template racket/base racket/list racket/set racket/promise racket/mpair + (for-template racket/base racket/list racket/set racket/promise racket/class racket/async-channel)) (provide (all-defined-out)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/function.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/function.rkt index 8591a625..37c1dfae 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/function.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/function.rkt @@ -7,7 +7,7 @@ racket/list racket/match racket/contract (for-template racket/base racket/contract/base) - (for-syntax racket/base racket/syntax syntax/parse)) + (for-syntax racket/base syntax/parse)) (provide (contract-out diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/lengths.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/lengths.rkt index dd85409d..d9520e70 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/lengths.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/lengths.rkt @@ -8,7 +8,6 @@ "../structures.rkt" "../terminal.rkt" "simple.rkt" - racket/match racket/contract (for-template racket/base)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/none.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/none.rkt index 111f4244..db856801 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/none.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/none.rkt @@ -8,7 +8,7 @@ racket/match racket/contract (for-template racket/base racket/contract/base) - (for-syntax racket/base racket/syntax syntax/parse)) + (for-syntax racket/base syntax/parse)) (provide (contract-out diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/object.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/object.rkt index 9d5c5515..b531f930 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/object.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/object.rkt @@ -5,7 +5,6 @@ (require "../structures.rkt" "../constraints.rkt" racket/list racket/match - unstable/contract racket/contract racket/syntax (for-template racket/base racket/class) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/parametric.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/parametric.rkt index e3ece08a..b18c56e1 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/parametric.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/parametric.rkt @@ -6,8 +6,7 @@ "../structures.rkt" "../constraints.rkt" "../terminal.rkt" - racket/list racket/match - unstable/contract + racket/match racket/contract (for-template racket/base racket/contract/parametric) (for-syntax racket/base syntax/parse)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/simple.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/simple.rkt index 922cc42d..8e003f71 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/simple.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/simple.rkt @@ -6,10 +6,8 @@ ;; Ex: (flat/sc #'number?) (require - "../kinds.rkt" "../structures.rkt" "../constraints.rkt" - racket/list racket/match racket/contract) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/struct.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/struct.rkt index 985cc6d2..b97e34fe 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/struct.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/struct.rkt @@ -3,8 +3,7 @@ ;; Static contract for struct/c. (require "../structures.rkt" "../constraints.rkt" - racket/list racket/match - unstable/contract + racket/match racket/contract (for-template racket/base racket/contract/base "../../utils/struct-type-c.rkt") (for-syntax racket/base syntax/parse)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/structural.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/structural.rkt index a19ccc3b..44fc9e66 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/structural.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/combinators/structural.rkt @@ -5,10 +5,9 @@ (require "../structures.rkt" "../constraints.rkt" - racket/list racket/match + racket/match (for-syntax racket/base racket/syntax syntax/stx syntax/parse) racket/set - racket/format unstable/contract (for-template racket/base racket/contract/base diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/instantiate.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/instantiate.rkt index 674e14b0..93431036 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/instantiate.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/static-contracts/instantiate.rkt @@ -3,10 +3,8 @@ ;; Provides functionality to take a static contract and turn it into a regular contract. (require - racket/function racket/match racket/dict - racket/sequence racket/contract racket/syntax (for-template racket/base racket/contract) 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 20373753..d749e8f0 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 @@ -1,9 +1,8 @@ #lang racket/base (require "utils/utils.rkt" - (except-in syntax/parse id) syntax/stx + syntax/stx racket/pretty racket/promise racket/lazy-require - racket/syntax (env type-name-env type-alias-env mvar-env) (utils tc-utils disarm mutated-vars lift) "standard-inits.rkt" diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt index 90e3d5b3..26e66fae 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/check-class-unit.rkt @@ -8,12 +8,10 @@ racket/list racket/match racket/set - racket/syntax - syntax/id-table syntax/parse syntax/stx "signatures.rkt" - (private parse-type syntax-properties type-annotation) + (private parse-type syntax-properties) (env lexical-env tvar-env global-env) (types utils abbrev union subtype resolve generalize) (typecheck check-below internal-forms) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/def-binding.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/def-binding.rkt index 7c0554e1..fffb79cb 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/def-binding.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/def-binding.rkt @@ -1,6 +1,8 @@ #lang racket/base -(require "../utils/utils.rkt" (contract-req) racket/struct-info) +(require "../utils/utils.rkt" (contract-req)) + +(require-for-cond-contract racket/struct-info) (define-struct binding (name) #:transparent) (define-struct (def-binding binding) (ty) #:transparent) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/find-annotation.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/find-annotation.rkt index a6a72177..33f8efad 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/find-annotation.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/find-annotation.rkt @@ -2,11 +2,12 @@ (require "../utils/utils.rkt" syntax/parse (contract-req) - (rep type-rep) (env lexical-env) (private type-annotation) (for-label racket/base)) +(require-for-cond-contract (rep type-rep)) + (provide/cond-contract [find-annotation (syntax? identifier? . -> . (or/c #f Type/c))]) (define-syntax-class lv-clause 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 85800003..592157af 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 @@ -5,12 +5,10 @@ racket/struct-info racket/match syntax/parse (only-in (private type-contract) include-extra-requires?) (private syntax-properties) - (types printer) (typecheck renamer def-binding) (utils tc-utils) (for-syntax racket/base) - (for-template racket/base "def-export.rkt" - (only-in racket/contract/base define-module-boundary-contract))) + (for-template racket/base "def-export.rkt")) (provide remove-provides provide? generate-prov get-alternate) 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 0fbbafde..0d263cd5 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 @@ -7,7 +7,7 @@ (typecheck check-below tc-subst) (utils tc-utils) (rep type-rep filter-rep) - (except-in (types utils union abbrev subtype) + (except-in (types utils abbrev subtype) -> ->* one-of/c)) (require-for-cond-contract syntax/stx) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-contracts.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-contracts.rkt index 1f57d0bd..9c86bb1c 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-contracts.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-app/tc-app-contracts.rkt @@ -6,14 +6,8 @@ (require "../../utils/utils.rkt" "signatures.rkt" "utils.rkt" - syntax/parse syntax/stx racket/match - racket/dict - racket/format - (env global-env) + syntax/parse (typecheck signatures) - (types base-abbrev resolve subtype union utils) - (rep type-rep) - (utils tc-utils) (for-template racket/base ;; shift -1 because it's provided +1 racket/contract/private/provide)) 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 b6b4da03..4717bd7a 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 @@ -4,7 +4,6 @@ syntax/parse syntax/stx racket/match unstable/sequence unstable/syntax "signatures.rkt" "utils.rkt" - (utils tc-utils) (types utils abbrev numeric-tower union resolve type-table generalize) (typecheck signatures check-below) (rep type-rep rep-utils) 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 9e9af4e0..1328ad3f 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 @@ -6,7 +6,7 @@ "utils.rkt" syntax/parse syntax/stx racket/match racket/set (typecheck signatures tc-app-helper tc-funapp tc-metafunctions) - (types abbrev utils union substitute subtype) + (types abbrev utils substitute subtype) (rep type-rep) (utils tc-utils) (r:infer infer) 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 252524a3..6d7f26e8 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 @@ -4,7 +4,7 @@ (require "../../utils/utils.rkt" "signatures.rkt" "utils.rkt" - syntax/parse syntax/stx racket/match unstable/sequence unstable/syntax + syntax/parse syntax/stx racket/match unstable/sequence (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 de1df0a9..e873528e 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 @@ -7,7 +7,6 @@ syntax/parse/experimental/reflect (typecheck signatures tc-funapp) (types utils) - (private syntax-properties) (rep type-rep filter-rep object-rep)) (import tc-expr^ tc-app-keywords^ 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 a6080522..78086069 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 @@ -3,8 +3,7 @@ (require "../../utils/utils.rkt" "signatures.rkt" "utils.rkt" - syntax/parse syntax/stx racket/match unstable/sequence unstable/syntax - racket/dict + syntax/parse syntax/stx racket/match unstable/sequence racket/format racket/list (typecheck signatures) 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 8c4b1e62..b9866bc0 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 @@ -5,7 +5,7 @@ "utils.rkt" syntax/parse racket/match unstable/sequence unstable/syntax (typecheck signatures tc-funapp) - (types utils abbrev) + (types utils) (for-label 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 a881caab..05ad1e77 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 @@ -3,10 +3,9 @@ (require (rename-in "../utils/utils.rkt" [infer r:infer]) racket/match racket/list (typecheck signatures tc-app-helper) - (types utils union subtype abbrev substitute) + (types utils abbrev substitute) (utils tc-utils) - (env tvar-env index-env) - (rep type-rep filter-rep) + (rep type-rep) (r:infer infer)) (import tc-expr^ tc-lambda^ tc-let^ tc-app^) 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 54bf6b16..563f8065 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 @@ -4,17 +4,16 @@ (require (rename-in "../utils/utils.rkt" [private private-in]) racket/match (prefix-in - (contract-req)) "signatures.rkt" - "check-below.rkt" "tc-app-helper.rkt" "../types/kw-types.rkt" - (types utils abbrev union subtype type-table classes filter-ops remove-intersect resolve generalize) - (private-in parse-type type-annotation syntax-properties) - (rep type-rep filter-rep object-rep rep-utils) + "check-below.rkt" "../types/kw-types.rkt" + (types utils abbrev union subtype type-table filter-ops remove-intersect resolve generalize) + (private-in syntax-properties) + (rep type-rep filter-rep) (only-in (infer infer) restrict) (utils tc-utils) - (env lexical-env tvar-env index-env scoped-tvar-env) - racket/format racket/list + (env lexical-env) + racket/list racket/private/class-internal - syntax/parse syntax/stx - unstable/syntax + syntax/parse (only-in racket/list split-at) (typecheck internal-forms tc-envops) unstable/sequence diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expression.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expression.rkt index e6b530c4..f1bd7369 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expression.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/typecheck/tc-expression.rkt @@ -2,12 +2,12 @@ (require "../utils/utils.rkt" - (typecheck tc-expr-unit signatures tc-app-helper check-below) - (types tc-result tc-error utils abbrev classes type-table) + (typecheck signatures tc-app-helper check-below) + (types utils abbrev classes type-table) (rep type-rep) (utils tc-utils) (env index-env tvar-env scoped-tvar-env) - (private syntax-properties type-annotation parse-type) + (private syntax-properties parse-type) unstable/syntax racket/format racket/match 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 a9a71d14..ab9f5b16 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 @@ -1,16 +1,18 @@ #lang racket/base (require (rename-in "../utils/utils.rkt" [infer r:infer]) - racket/match syntax/stx + racket/match (prefix-in c: (contract-req)) (env tvar-env) (for-syntax syntax/parse racket/base) - (types utils union subtype resolve abbrev + (types utils subtype resolve abbrev substitute classes) - (typecheck tc-metafunctions tc-app-helper check-below) + (typecheck tc-metafunctions tc-app-helper) (rep type-rep) (r:infer infer)) +(require-for-cond-contract syntax/stx) + (provide/cond-contract [tc/funapp (syntax? stx-list? Type/c (c:listof tc-results1/c) 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 60e8e108..eb29a380 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,8 +1,7 @@ #lang racket/unit (require "../utils/utils.rkt" - (rep type-rep filter-rep object-rep) - (types abbrev union utils filter-ops) - (env lexical-env type-env-structs) + (rep filter-rep) + (types utils filter-ops) (utils tc-utils) (typecheck signatures tc-envops tc-metafunctions) (types type-table) 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 04bb1bfd..08627eaa 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 @@ -1,7 +1,7 @@ #lang racket/unit (require "../utils/utils.rkt" - racket/dict racket/list syntax/parse racket/syntax syntax/stx + racket/dict racket/list syntax/parse syntax/stx racket/match syntax/id-table racket/set unstable/sequence (contract-req) @@ -16,7 +16,6 @@ (env lexical-env tvar-env index-env scoped-tvar-env) (utils tc-utils) (for-syntax - syntax/parse racket/base)) (import tc-expr^) 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 b47e7e86..0e86abd3 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 @@ -1,12 +1,12 @@ #lang racket/unit (require "../utils/utils.rkt" - (except-in (types utils subtype abbrev union filter-ops remove-intersect) -> ->* one-of/c) + (except-in (types utils abbrev filter-ops remove-intersect) -> ->* one-of/c) (only-in (types abbrev) (-> t:->) [->* t:->*]) (private type-annotation parse-type syntax-properties) - (env lexical-env type-alias-env type-alias-helper mvar-env - global-env type-env-structs scoped-tvar-env) - (rep type-rep filter-rep) + (env lexical-env type-alias-helper mvar-env + global-env scoped-tvar-env) + (rep filter-rep) syntax/free-vars (typecheck signatures tc-metafunctions tc-subst internal-forms tc-envops) (utils tarjan) @@ -17,6 +17,7 @@ ;; For internal type forms (for-template (only-in racket/base define-values))) +(require-for-cond-contract (rep type-rep)) (import tc-expr^) (export tc-let^) 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 0d1231ba..12e92a2c 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 @@ -2,17 +2,18 @@ (require "../utils/utils.rkt" syntax/struct syntax/parse racket/function racket/match racket/list - racket/struct-info (prefix-in c: (contract-req)) (rep type-rep object-rep free-variance) (private parse-type syntax-properties) - (types abbrev utils resolve substitute type-table struct-table) + (types abbrev utils resolve substitute struct-table) (env global-env type-name-env type-alias-env tvar-env) (utils tc-utils) (typecheck def-binding internal-forms) (for-syntax syntax/parse racket/base)) +(require-for-cond-contract racket/struct-info) + (provide tc/struct name-of-struct d-s refine-struct-variance! register-parsed-struct-sty! 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 aaa0f02c..b54179b4 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 @@ -4,9 +4,9 @@ racket/syntax syntax/parse syntax/stx syntax/id-table racket/list unstable/list racket/dict racket/match unstable/sequence (prefix-in c: (contract-req)) - (rep type-rep free-variance) + (rep type-rep) (types utils abbrev type-table struct-table) - (private parse-type type-annotation type-contract syntax-properties) + (private parse-type type-annotation syntax-properties) (env global-env init-envs type-name-env type-alias-env lexical-env env-req mvar-env scoped-tvar-env type-alias-helper) 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 e25afd56..6d64a7b7 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 @@ -12,7 +12,7 @@ unstable/function (prefix-in c: (contract-req)) - (rename-in (rep type-rep filter-rep object-rep rep-utils) + (rename-in (rep type-rep filter-rep object-rep) [make-Base make-Base*]) (types union numeric-tower) ;; Using this form so all-from-out works diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/filter-ops.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/filter-ops.rkt index 64911cf3..d1b18cb7 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/filter-ops.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/filter-ops.rkt @@ -2,10 +2,8 @@ (require "../utils/utils.rkt" racket/list racket/match - racket/dict (prefix-in c: (contract-req)) (rep type-rep filter-rep object-rep rep-utils) - (utils tc-utils) (only-in (infer infer) restrict) (types union subtype remove-intersect abbrev tc-result)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/printer.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/printer.rkt index d79d51b7..4a5e2b07 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/printer.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/printer.rkt @@ -14,8 +14,7 @@ "types/utils.rkt" "types/resolve.rkt" "utils/utils.rkt" - "utils/tc-utils.rkt" - "env/type-name-env.rkt") + "utils/tc-utils.rkt") (for-syntax racket/base syntax/parse)) ;; printer-type: (one-of/c 'custom 'debug) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/remove-intersect.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/remove-intersect.rkt index eb1cf1ae..bdd8dba9 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/remove-intersect.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/remove-intersect.rkt @@ -2,7 +2,7 @@ (require "../utils/utils.rkt" (rep type-rep rep-utils) - (types abbrev union subtype resolve utils) + (types union subtype resolve utils) racket/match) (provide (rename-out [*remove remove]) overlap) diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/structural.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/structural.rkt index 13154f0e..25ed42f3 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/structural.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/types/structural.rkt @@ -22,8 +22,7 @@ (for-syntax racket/base syntax/parse - racket/syntax - unstable/sequence)) + racket/syntax)) (provide structural? structural-map) 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 768e2b94..f6e57d1d 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 type-rep filter-rep rep-utils) + (rep type-rep filter-rep) (utils tc-utils) (types base-abbrev) racket/match diff --git a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/struct-type-c.rkt b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/struct-type-c.rkt index 99d4d59d..6b64cc07 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/struct-type-c.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/utils/struct-type-c.rkt @@ -1,6 +1,6 @@ #lang racket/base (provide struct-type/c) -(require racket/contract/base racket/contract/combinator) +(require racket/contract/combinator) ;; struct-type/c generates contracts which protect structure type ;; descriptors. These descriptors can be used reflectively to create