diff --git a/collects/plot/common/contract.rkt b/collects/plot/common/contract.rkt index 8d81a9f075..aa99d2a733 100644 --- a/collects/plot/common/contract.rkt +++ b/collects/plot/common/contract.rkt @@ -63,7 +63,7 @@ (defcontract point-sym/c (or/c char? string? integer? (apply one-of/c known-point-symbols))) -(defcontract (maybe-function/c [in-contract contract/c] [out-contract contract/c]) +(defcontract (maybe-function/c [in-contract contract?] [out-contract contract?]) (or/c out-contract (in-contract . -> . out-contract))) (defproc (maybe-apply [f (maybe-function/c any/c any/c)] @@ -71,20 +71,20 @@ (cond [(procedure? f) (f arg)] [else f])) -(defcontract (plot-colors/c [in-contract contract/c]) +(defcontract (plot-colors/c [in-contract contract?]) (maybe-function/c in-contract (listof plot-color/c))) -(defcontract (pen-widths/c [in-contract contract/c]) +(defcontract (pen-widths/c [in-contract contract?]) (maybe-function/c in-contract (listof (>=/c 0)))) -(defcontract (plot-pen-styles/c [in-contract contract/c]) +(defcontract (plot-pen-styles/c [in-contract contract?]) (maybe-function/c in-contract (listof plot-pen-style/c))) -(defcontract (plot-brush-styles/c [in-contract contract/c]) +(defcontract (plot-brush-styles/c [in-contract contract?]) (maybe-function/c in-contract (listof plot-brush-style/c))) -(defcontract (alphas/c [in-contract contract/c]) +(defcontract (alphas/c [in-contract contract?]) (maybe-function/c in-contract (listof (real-in 0 1)))) -(defcontract (labels/c [in-contract contract/c]) +(defcontract (labels/c [in-contract contract?]) (maybe-function/c in-contract (listof (or/c string? #f)))) diff --git a/collects/plot/tests/doc-tests.rkt b/collects/plot/tests/doc-tests.rkt index 9aa7a2cfdd..aaa4ff358d 100644 --- a/collects/plot/tests/doc-tests.rkt +++ b/collects/plot/tests/doc-tests.rkt @@ -30,8 +30,6 @@ (doc plot/dc) (newline) -(doc treeof) -(newline) (doc plot-background) (newline) (doc known-point-symbols) diff --git a/collects/unstable/contract.rkt b/collects/unstable/contract.rkt index af2dc20e14..38a93acb60 100644 --- a/collects/unstable/contract.rkt +++ b/collects/unstable/contract.rkt @@ -173,8 +173,6 @@ ;; Added by ntoronto -(define contract/c (or/c contract? (any/c . -> . any/c))) - (define (treeof elem-contract) (or/c elem-contract (listof (recursive-contract (treeof elem-contract) #:flat)))) @@ -201,8 +199,6 @@ [sequence/c (->* [] [] #:rest (listof contract?) contract?)] - [contract/c contract?] - - [treeof (contract/c . -> . contract?)] + [treeof (contract? . -> . contract?)] ) diff --git a/collects/unstable/scribblings/contract.scrbl b/collects/unstable/scribblings/contract.scrbl index ae67cbba32..024ae2ca64 100644 --- a/collects/unstable/scribblings/contract.scrbl +++ b/collects/unstable/scribblings/contract.scrbl @@ -118,11 +118,7 @@ for instance, a wrapped list is not guaranteed to satisfy @racket[list?]. @addition{@author+email["Neil Toronto" "neil.toronto@gmail.com"]} -@defthing[contract/c contract?]{ -Identifies contracts and predicates that can be used as contracts. -} - -@defproc[(treeof [elem-contract contract/c]) contract?]{ +@defproc[(treeof [elem-contract contract?]) contract?]{ Identifies values that meet the contract @racket[elem-contract], lists of such values, lists of lists, and so on. @examples[#:eval the-eval (define number-tree/c (treeof number?))