Removed incorrect uses of ->i underscores

collects/data/interval-map.rkt

@@ -219,36 +219,36 @@
         [start (im) (key-c im)]
         [end (im) (key-c im)]
         [v (im) (val-c im)])
-       [_ void?])]
+       [_r void?])]
  [interval-map-update*!
   (->i ([im interval-map?]
         [start (im) (key-c im)]
         [end (im) (key-c im)]
         [f (im) (-> (val-c im) (val-c im))])
        ([default any/c]) ;; imprecise
-       [_ void?])]
+       [_r void?])]
  [interval-map-cons*!
   (->i ([im interval-map?]
         [start (im) (key-c im)]
         [end (im) (key-c im)]
         [v any/c]) ;; imprecise
        ([d any/c]) ;; imprecise
-       [_ void?])]
+       [_r void?])]
  [interval-map-remove!
   (->i ([im interval-map?]
         [start (im) (or/c -inf.0 (key-c im))]
         [end (im) (or/c +inf.0 (key-c im))])
-       [_ void?])]
+       [_r void?])]
  [interval-map-contract!
   (->i ([im interval-map?]
         [start (im) (key-c im)]
         [end (im) (key-c im)])
-       [_ void?])]
+       [_r void?])]
  [interval-map-expand!
   (->i ([im interval-map?]
         [start (im) (key-c im)]
         [end (im) (key-c im)])
-       [_ void?])]
+       [_r void?])]
 
  [interval-map-iterate-first
   (-> interval-map?
@@ -258,10 +258,10 @@
       (or/c interval-map-iter? #f))]
  [interval-map-iterate-key
   (->i ([im interval-map?] [i interval-map-iter?])
-       [_ (im) (let ([k (key-c im)]) (cons/c k k))])]
+       [_r (im) (let ([k (key-c im)]) (cons/c k k))])]
  [interval-map-iterate-value
   (->i ([im interval-map?] [i interval-map-iter?])
-       [_ (im) (val-c im)])]
+       [_r (im) (val-c im)])]
 
  [interval-map-iter?
   (-> any/c boolean?)])

collects/data/order.rkt

@@ -14,12 +14,12 @@
 
 (define extreme-contract
   (->i ([d ordered-dict?])
-       [_ (d) (or/c #f (dict-iter-contract d))]))
+       [_r (d) (or/c #f (dict-iter-contract d))]))
 
 (define search-contract
   (->i ([d ordered-dict?]
         [k (d) (dict-key-contract d)])
-       [_ (d) (or/c #f (dict-iter-contract d))]))
+       [_r (d) (or/c #f (dict-iter-contract d))]))
 
 (define prop:ordered-dict-contract
   (let ([e extreme-contract]

collects/data/skip-list.rkt

@@ -446,39 +446,39 @@ Levels are indexed starting at 1, as in the paper.
        ([d any/c])
        any)]
  [skip-list-set!
-  (->i ([s skip-list?] [k (s) (key-c s)] [v (s) (val-c s)]) [_ void?])]
+  (->i ([s skip-list?] [k (s) (key-c s)] [v (s) (val-c s)]) [_r void?])]
  [skip-list-remove!
-  (->i ([s skip-list?] [k (s) (key-c s)]) [_ void?])]
+  (->i ([s skip-list?] [k (s) (key-c s)]) [_r void?])]
  [skip-list-count
   (-> skip-list? exact-nonnegative-integer?)]
 
  [skip-list-remove-range!
   (->i ([s skip-list?] [from (s) (key-c s)] [to (s) (key-c s)])
-       [_ void?])]
+       [_r void?])]
  [skip-list-contract! 
   (->i ([s adjustable-skip-list?] [from (s) (key-c s)] [to (s) (key-c s)])
-       [_ void?])]
+       [_r void?])]
  [skip-list-expand!
   (->i ([s adjustable-skip-list?] [from (s) (key-c s)] [to (s) (key-c s)])
-       [_ void?])]
+       [_r void?])]
 
  [skip-list-iterate-first
   (-> skip-list? (or/c skip-list-iter? #f))]
  [skip-list-iterate-next
   (-> skip-list? skip-list-iter? (or/c skip-list-iter? #f))]
  [skip-list-iterate-key
-  (->i ([s skip-list?] [i skip-list-iter?]) [_ (s) (key-c s)])]
+  (->i ([s skip-list?] [i skip-list-iter?]) [_r (s) (key-c s)])]
  [skip-list-iterate-value
-  (->i ([s skip-list?] [i skip-list-iter?]) [_ (s) (val-c s)])]
+  (->i ([s skip-list?] [i skip-list-iter?]) [_r (s) (val-c s)])]
 
  [skip-list-iterate-greatest/<=?
-  (->i ([s skip-list?] [k (s) (key-c s)]) [_ (or/c skip-list-iter? #f)])]
+  (->i ([s skip-list?] [k (s) (key-c s)]) [_r (or/c skip-list-iter? #f)])]
  [skip-list-iterate-greatest/<?
-  (->i ([s skip-list?] [k (s) (key-c s)]) [_ (or/c skip-list-iter? #f)])]
+  (->i ([s skip-list?] [k (s) (key-c s)]) [_r (or/c skip-list-iter? #f)])]
  [skip-list-iterate-least/>=?
-  (->i ([s skip-list?] [k (s) (key-c s)]) [_ (or/c skip-list-iter? #f)])]
+  (->i ([s skip-list?] [k (s) (key-c s)]) [_r (or/c skip-list-iter? #f)])]
  [skip-list-iterate-least/>?
-  (->i ([s skip-list?] [k (s) (key-c s)]) [_ (or/c skip-list-iter? #f)])]
+  (->i ([s skip-list?] [k (s) (key-c s)]) [_r (or/c skip-list-iter? #f)])]
 
  [skip-list-iterate-least
   (-> skip-list? (or/c skip-list-iter? #f))]

collects/data/splay-tree.rkt

@@ -1110,42 +1110,42 @@ Top-down splay
        ([default any/c])
        any)]
  [splay-tree-set!
-  (->i ([s splay-tree?] [key (s) (key-c s)] [v (s) (val-c s)]) [_ void?])]
+  (->i ([s splay-tree?] [key (s) (key-c s)] [v (s) (val-c s)]) [_r void?])]
  [splay-tree-remove!
-  (->i ([s splay-tree?] [key (s) (key-c s)]) [_ void?])]
+  (->i ([s splay-tree?] [key (s) (key-c s)]) [_r void?])]
  [splay-tree-remove-range!
-  (->i ([s splay-tree?] [from (s) (key-c s)] [to (s) (key-c s)]) [_ void?])]
+  (->i ([s splay-tree?] [from (s) (key-c s)] [to (s) (key-c s)]) [_r void?])]
  [splay-tree-count
   (-> splay-tree? exact-nonnegative-integer?)]
  [splay-tree->list
-  (->i ([s splay-tree?]) [_ (s) (listof (cons/c (key-c s) (val-c s)))])]
+  (->i ([s splay-tree?]) [_r (s) (listof (cons/c (key-c s) (val-c s)))])]
 
  [splay-tree-contract!
   (->i ([s adjustable-splay-tree?]
         [from (s) (key-c s)] [to (s) (key-c s)])
-       [_ void?])]
+       [_r void?])]
  [splay-tree-expand!
   (->i ([s adjustable-splay-tree?]
         [from (s) (key-c s)] [to (s) (key-c s)])
-       [_ void?])]
+       [_r void?])]
 
  [splay-tree-iterate-first
   (-> splay-tree? (or/c splay-tree-iter? #f))]
  [splay-tree-iterate-next
   (-> splay-tree? splay-tree-iter? (or/c splay-tree-iter? #f))]
  [splay-tree-iterate-key
-  (->i ([s splay-tree?] [i splay-tree-iter?]) [_ (s) (key-c s)])]
+  (->i ([s splay-tree?] [i splay-tree-iter?]) [_r (s) (key-c s)])]
  [splay-tree-iterate-value
-  (->i ([s splay-tree?] [i splay-tree-iter?]) [_ (s) (val-c s)])]
+  (->i ([s splay-tree?] [i splay-tree-iter?]) [_r (s) (val-c s)])]
 
  [splay-tree-iterate-greatest/<=?
-  (->i ([s splay-tree?] [k (s) (key-c s)]) [_ (or/c splay-tree-iter? #f)])]
+  (->i ([s splay-tree?] [k (s) (key-c s)]) [_r (or/c splay-tree-iter? #f)])]
  [splay-tree-iterate-greatest/<?
-  (->i ([s splay-tree?] [k (s) (key-c s)]) [_ (or/c splay-tree-iter? #f)])]
+  (->i ([s splay-tree?] [k (s) (key-c s)]) [_r (or/c splay-tree-iter? #f)])]
  [splay-tree-iterate-least/>=?
-  (->i ([s splay-tree?] [k (s) (key-c s)]) [_ (or/c splay-tree-iter? #f)])]
+  (->i ([s splay-tree?] [k (s) (key-c s)]) [_r (or/c splay-tree-iter? #f)])]
  [splay-tree-iterate-least/>?
-  (->i ([s splay-tree?] [k (s) (key-c s)]) [_ (or/c splay-tree-iter? #f)])]
+  (->i ([s splay-tree?] [k (s) (key-c s)]) [_r (or/c splay-tree-iter? #f)])]
 
  [splay-tree-iterate-least
   (-> splay-tree? (or/c splay-tree-iter? #f))]

collects/racket/dict.rkt

@@ -73,33 +73,33 @@
   (->i ([d (and/c dict? dict-mutable?)]
         [k (d) (dict-key-contract d)]
         [value (d) (dict-value-contract d)])
-       [_ void?]))
+       [_r void?]))
 (define dict-set-contract
   (->i ([d (and/c dict? dict-can-functional-set?)]
         [k (d) (dict-key-contract d)]
         [value (d) (dict-value-contract d)])
-       [_ dict?]))
+       [_r dict?]))
 (define dict-remove!-contract
   (->i ([d (and/c dict? dict-mutable? dict-can-remove-keys?)]
         [k (d) (dict-key-contract d)])
-       [_ void?]))
+       [_r void?]))
 (define dict-remove-contract
   (->i ([d (and/c dict? dict-can-functional-set? dict-can-remove-keys?)]
         [k (d) (dict-key-contract d)])
-       [_ dict?]))
+       [_r dict?]))
 (define dict-count-contract
   (-> dict? exact-nonnegative-integer?))
 (define dict-iterate-first-contract
-  (->i ([d dict?]) [_ (d) (or/c #f (dict-iter-contract d))]))
+  (->i ([d dict?]) [_r (d) (or/c #f (dict-iter-contract d))]))
 (define dict-iterate-next-contract
   (->i ([d dict?] [iter (d) (dict-iter-contract d)])
-       [_ (d) (or/c #f (dict-iter-contract d))]))
+       [_r (d) (or/c #f (dict-iter-contract d))]))
 (define dict-iterate-key-contract
   (->i ([d dict?] [iter (d) (dict-iter-contract d)])
-       [_ (d) (dict-key-contract d)]))
+       [_r (d) (dict-key-contract d)]))
 (define dict-iterate-value-contract
   (->i ([d dict?] [iter (d) (dict-iter-contract d)])
-       [_ (d) (dict-value-contract d)]))
+       [_r (d) (dict-value-contract d)]))
 
 (define prop:dict-contract
   (vector-immutable/c dict-ref-contract
@@ -150,45 +150,45 @@
   (->i ([d (and/c dict? dict-mutable?)]
         [k (d) (dict-key-contract d)]
         [default (d) (or/c (dict-value-contract d) (-> (dict-value-contract d)))]) ;; use if/c ?
-       [_ (d) (dict-value-contract d)])]
+       [_r (d) (dict-value-contract d)])]
  [dict-set!
   dict-set!-contract]
  [dict-set
   dict-set-contract]
  [dict-set*!
   (->i ([d (and/c dict? dict-mutable?)])
-       #:rest [_ (d) (let ([key/c (dict-key-contract d)]
-                           [val/c (dict-value-contract d)])
-                       (letrec ([args/c
-                                 (recursive-contract
-                                  (or/c null
-                                        (cons/c key/c (cons/c val/c args/c))))])
-                         (and/c even-length-list/c
-                                args/c)))]
-       [_ void?])]
+       #:rest [rst (d) (let ([key/c (dict-key-contract d)]
+                             [val/c (dict-value-contract d)])
+                         (letrec ([args/c
+                                   (recursive-contract
+                                    (or/c null
+                                          (cons/c key/c (cons/c val/c args/c))))])
+                           (and/c even-length-list/c
+                                  args/c)))]
+       [_r void?])]
  [dict-set*
   (->i ([d (and/c dict? dict-can-functional-set?)])
-       #:rest [_ (d) (let ([key/c (dict-key-contract d)]
-                           [val/c (dict-value-contract d)])
-                       (letrec ([args/c
-                                 (recursive-contract
-                                  (or/c null
-                                        (cons/c key/c (cons/c val/c args/c))))])
-                         (and/c even-length-list/c
-                                args/c)))]
-       [_ dict?])]
+       #:rest [rst (d) (let ([key/c (dict-key-contract d)]
+                             [val/c (dict-value-contract d)])
+                         (letrec ([args/c
+                                   (recursive-contract
+                                    (or/c null
+                                          (cons/c key/c (cons/c val/c args/c))))])
+                           (and/c even-length-list/c
+                                  args/c)))]
+       [_r dict?])]
  [dict-update!
   (->i ([d (and/c dict? dict-mutable?)]
         [k (d) (dict-key-contract d)]
         [update (d) (-> (dict-value-contract d) (dict-value-contract d))])
        ([default (d) (or/c (dict-value-contract d) (-> (dict-value-contract d)))]) ;; use if/c
-       [_ void?])]
+       [_r void?])]
  [dict-update
   (->i ([d (and/c dict? dict-can-functional-set?)]
         [k (d) (dict-key-contract d)]
         [update (d) (-> (dict-value-contract d) (dict-value-contract d))])
        ([default (d) (or/c (dict-value-contract d) (-> (dict-value-contract d)))]) ;; use if/c ?
-       [_ dict?])]
+       [_r dict?])]
  [dict-remove!
   dict-remove!-contract]
  [dict-remove
@@ -206,20 +206,20 @@
 
  [dict-map
   (->i ([d dict?] [proc (d) (-> (dict-key-contract d) (dict-value-contract d) any)])
-       [_ list?])]
+       [_r list?])]
  [dict-for-each
   (->i ([d dict?] [proc (d) (-> (dict-key-contract d) (dict-value-contract d) any)])
-       [_ void?])]
+       [_r void?])]
 
  [dict-keys
   (->i ([d dict?])
-       [_ (d) (listof (dict-key-contract d))])]
+       [_r (d) (listof (dict-key-contract d))])]
  [dict-values
   (->i ([d dict?])
-       [_ (d) (listof (dict-value-contract d))])]
+       [_r (d) (listof (dict-value-contract d))])]
  [dict->list
   (->i ([d dict?])
-       [_ (d) (listof (cons/c (dict-key-contract d) (dict-value-contract d)))])])
+       [_r (d) (listof (cons/c (dict-key-contract d) (dict-value-contract d)))])])
 
 (provide prop:dict