From 8afeed8c663242159ac08ac043ccf860779ddd91 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Sat, 16 Apr 2011 07:55:49 -0500 Subject: [PATCH] fix up contract test suites --- collects/mzlib/contract.rkt | 6 ------ collects/mzlib/private/contract-struct.rkt | 2 +- collects/racket/contract/private/opters.rkt | 1 + 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/collects/mzlib/contract.rkt b/collects/mzlib/contract.rkt index 5159f6c9c0..de5df8c078 100644 --- a/collects/mzlib/contract.rkt +++ b/collects/mzlib/contract.rkt @@ -72,9 +72,3 @@ (all-from-out racket/contract/private/prop racket/contract/private/blame)) - -;; copied here because not provided by racket/contract anymore -(define (flat-contract/predicate? pred) - (or (flat-contract? pred) - (and (procedure? pred) - (procedure-arity-includes? pred 1)))) diff --git a/collects/mzlib/private/contract-struct.rkt b/collects/mzlib/private/contract-struct.rkt index 733a148aba..55d5d03027 100644 --- a/collects/mzlib/private/contract-struct.rkt +++ b/collects/mzlib/private/contract-struct.rkt @@ -66,7 +66,7 @@ ... [ctc-name-x (contract-name ctc-x)] ...) - (build-flat-contract + (flat-named-contract (build-compound-type-name 'struct/c 'struct-name ctc-x ...) (λ (val) (and (predicate-id val) diff --git a/collects/racket/contract/private/opters.rkt b/collects/racket/contract/private/opters.rkt index bb54cf75f7..c2697c3c5e 100644 --- a/collects/racket/contract/private/opters.rkt +++ b/collects/racket/contract/private/opters.rkt @@ -3,6 +3,7 @@ "opt.rkt" "guts.rkt" "arrow.rkt" + "blame.rkt" (for-syntax racket/base syntax/stx "opt-guts.rkt"))