From fd3941c06256ce8e7176800a6e03e8529a33b4d4 Mon Sep 17 00:00:00 2001 From: Vincent St-Amour Date: Mon, 7 Sep 2015 21:38:22 -0500 Subject: [PATCH] Remove dependency on unstable/contract. --- typed-racket-lib/info.rkt | 6 ------ typed-racket-lib/typed-racket/private/type-contract.rkt | 3 ++- .../static-contracts/combinators/case-lambda.rkt | 5 ++--- .../typed-racket/static-contracts/combinators/control.rkt | 3 +-- .../static-contracts/combinators/structural.rkt | 4 ++-- typed-racket-test/info.rkt | 4 +--- typed-racket-test/unit-tests/contract-tests.rkt | 2 +- 7 files changed, 9 insertions(+), 18 deletions(-) diff --git a/typed-racket-lib/info.rkt b/typed-racket-lib/info.rkt index 6f25169e..5b87bf80 100644 --- a/typed-racket-lib/info.rkt +++ b/typed-racket-lib/info.rkt @@ -4,16 +4,10 @@ (define deps '(("base" #:version "6.2.900.6") "pconvert-lib" - "unstable-contract-lib" "source-syntax" "compatibility-lib" ;; to assign types "string-constants-lib")) -;; This is needed since the expansion of TR -;; can insert `(require unstable/contract)` into -;; the expanded code. -(define implies '("unstable-contract-lib")) - (define pkg-desc "implementation (no documentation) part of \"typed-racket\"") (define pkg-authors '(samth stamourv)) diff --git a/typed-racket-lib/typed-racket/private/type-contract.rkt b/typed-racket-lib/typed-racket/private/type-contract.rkt index c7f30873..de0be4fa 100644 --- a/typed-racket-lib/typed-racket/private/type-contract.rkt +++ b/typed-racket-lib/typed-racket/private/type-contract.rkt @@ -147,7 +147,8 @@ typed-racket/utils/opaque-object typed-racket/utils/evt-contract typed-racket/utils/sealing-contract - unstable/contract racket/contract/parametric)) + racket/sequence + racket/contract/parametric)) ;; Should the above requires be included in the output? ;; This box is only used for contracts generated for `require/typed` diff --git a/typed-racket-lib/typed-racket/static-contracts/combinators/case-lambda.rkt b/typed-racket-lib/typed-racket/static-contracts/combinators/case-lambda.rkt index 3c262ea1..512af7e4 100644 --- a/typed-racket-lib/typed-racket/static-contracts/combinators/case-lambda.rkt +++ b/typed-racket-lib/typed-racket/static-contracts/combinators/case-lambda.rkt @@ -5,7 +5,6 @@ (require "../structures.rkt" "../constraints.rkt" racket/list racket/match - unstable/contract racket/contract (for-template racket/base racket/contract/base) (for-syntax racket/base syntax/parse)) @@ -14,8 +13,8 @@ (contract-out [case->/sc ((listof arr-combinator?) . -> . static-contract?)] [arr/sc (-> (listof static-contract?) - (maybe/c static-contract?) - (maybe/c (listof static-contract?)) + (or/c static-contract? #f) + (or/c (listof static-contract?) #f) static-contract?)]) case->/sc: arr/sc: diff --git a/typed-racket-lib/typed-racket/static-contracts/combinators/control.rkt b/typed-racket-lib/typed-racket/static-contracts/combinators/control.rkt index 670cbaf8..ffc77d08 100644 --- a/typed-racket-lib/typed-racket/static-contracts/combinators/control.rkt +++ b/typed-racket-lib/typed-racket/static-contracts/combinators/control.rkt @@ -5,14 +5,13 @@ (require "../structures.rkt" "../constraints.rkt" racket/list racket/match - unstable/contract racket/contract (for-template racket/base racket/contract/base) (for-syntax racket/base syntax/parse)) (provide (contract-out - [prompt-tag/sc ((listof static-contract?) (maybe/c (listof static-contract?)) . -> . static-contract?)]) + [prompt-tag/sc ((listof static-contract?) (or/c (listof static-contract?) #f) . -> . static-contract?)]) prompt-tag/sc:) (struct prompt-tag-combinator combinator () diff --git a/typed-racket-lib/typed-racket/static-contracts/combinators/structural.rkt b/typed-racket-lib/typed-racket/static-contracts/combinators/structural.rkt index cd0089c2..a10f7817 100644 --- a/typed-racket-lib/typed-racket/static-contracts/combinators/structural.rkt +++ b/typed-racket-lib/typed-racket/static-contracts/combinators/structural.rkt @@ -8,12 +8,12 @@ racket/match (for-syntax racket/base racket/syntax syntax/stx syntax/parse) racket/set - unstable/contract + racket/sequence (for-template racket/base racket/contract/base racket/set racket/async-channel - unstable/contract + racket/sequence racket/promise "../../utils/evt-contract.rkt") racket/contract diff --git a/typed-racket-test/info.rkt b/typed-racket-test/info.rkt index 57cde974..149cc918 100644 --- a/typed-racket-test/info.rkt +++ b/typed-racket-test/info.rkt @@ -7,7 +7,6 @@ "typed-racket-lib" "typed-racket-more" "typed-racket-compatibility" - "unstable-lib" "2d" "rackunit-lib" "racket-index" @@ -21,8 +20,7 @@ "compiler-lib" "redex-lib" "htdp-lib" - "sandbox-lib" - "unstable-lib")) + "sandbox-lib")) (define update-implies '("typed-racket-lib" "typed-racket-more" "typed-racket-compatibility")) diff --git a/typed-racket-test/unit-tests/contract-tests.rkt b/typed-racket-test/unit-tests/contract-tests.rkt index 06e40d53..71d6dba6 100644 --- a/typed-racket-test/unit-tests/contract-tests.rkt +++ b/typed-racket-test/unit-tests/contract-tests.rkt @@ -63,7 +63,7 @@ (define (ctc-namespace) (parameterize ([current-namespace (make-base-namespace)]) (namespace-require 'racket/contract) - (namespace-require 'unstable/contract) + (namespace-require 'racket/sequence) (namespace-require 'typed-racket/utils/any-wrap) (namespace-require 'typed-racket/utils/evt-contract) (namespace-require 'typed-racket/utils/opaque-object)