From 57f2c21a93e6523ba64a8c0a146b06b798f5884b Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Wed, 5 Jul 2017 11:54:24 -0700 Subject: [PATCH] deprecations --- pitfall/xenomorph/main.rkt | 1 - pitfall/xenomorph/private/array.rkt | 2 +- pitfall/xenomorph/private/bitfield.rkt | 1 - pitfall/xenomorph/private/enum.rkt | 1 - pitfall/xenomorph/private/lazy-array.rkt | 1 - pitfall/xenomorph/private/optional.rkt | 1 - pitfall/xenomorph/private/string.rkt | 3 +-- pitfall/xenomorph/private/struct.rkt | 2 +- pitfall/xenomorph/private/{buffer.rkt => ~buffer.rkt} | 0 pitfall/xenomorph/private/{stream.rkt => ~stream.rkt} | 0 pitfall/xenomorph/test/main.rkt | 1 - pitfall/xenomorph/test/versioned-struct-test.rkt | 4 ++-- pitfall/xenomorph/test/{buffer-test.rkt => ~buffer-test.rkt} | 0 pitfall/xenomorph/test/{stream-test.rkt => ~stream-test.rkt} | 0 14 files changed, 5 insertions(+), 12 deletions(-) rename pitfall/xenomorph/private/{buffer.rkt => ~buffer.rkt} (100%) rename pitfall/xenomorph/private/{stream.rkt => ~stream.rkt} (100%) rename pitfall/xenomorph/test/{buffer-test.rkt => ~buffer-test.rkt} (100%) rename pitfall/xenomorph/test/{stream-test.rkt => ~stream-test.rkt} (100%) diff --git a/pitfall/xenomorph/main.rkt b/pitfall/xenomorph/main.rkt index a484b07c..9f475fa0 100644 --- a/pitfall/xenomorph/main.rkt +++ b/pitfall/xenomorph/main.rkt @@ -3,7 +3,6 @@ (r+p "array.rkt" "base.rkt" "bitfield.rkt" - "buffer.rkt" "enum.rkt" "lazy-array.rkt" "number.rkt" diff --git a/pitfall/xenomorph/private/array.rkt b/pitfall/xenomorph/private/array.rkt index 81ab68f5..dcef1476 100644 --- a/pitfall/xenomorph/private/array.rkt +++ b/pitfall/xenomorph/private/array.rkt @@ -1,5 +1,5 @@ #lang reader (submod "racket.rkt" reader) -(require "number.rkt" "utils.rkt" "stream.rkt") +(require "number.rkt" "utils.rkt") (provide (all-defined-out)) #| diff --git a/pitfall/xenomorph/private/bitfield.rkt b/pitfall/xenomorph/private/bitfield.rkt index 345a0417..b99d3258 100644 --- a/pitfall/xenomorph/private/bitfield.rkt +++ b/pitfall/xenomorph/private/bitfield.rkt @@ -1,5 +1,4 @@ #lang reader (submod "racket.rkt" reader) -(require "stream.rkt") (provide (all-defined-out)) #| diff --git a/pitfall/xenomorph/private/enum.rkt b/pitfall/xenomorph/private/enum.rkt index 025596f4..423e4493 100644 --- a/pitfall/xenomorph/private/enum.rkt +++ b/pitfall/xenomorph/private/enum.rkt @@ -1,5 +1,4 @@ #lang reader (submod "racket.rkt" reader) -(require "stream.rkt") (provide (all-defined-out)) #| diff --git a/pitfall/xenomorph/private/lazy-array.rkt b/pitfall/xenomorph/private/lazy-array.rkt index af69bb9d..f5b52981 100644 --- a/pitfall/xenomorph/private/lazy-array.rkt +++ b/pitfall/xenomorph/private/lazy-array.rkt @@ -61,7 +61,6 @@ https://github.com/mbutterick/restructure/blob/master/src/LazyArray.coffee val) ctx))) (test-module - (require "stream.rkt") (define bstr #"ABCD1234") (define ds (open-input-bytes bstr)) (define la (+LazyArray uint8 4)) diff --git a/pitfall/xenomorph/private/optional.rkt b/pitfall/xenomorph/private/optional.rkt index 4f8f2057..94acbc4a 100644 --- a/pitfall/xenomorph/private/optional.rkt +++ b/pitfall/xenomorph/private/optional.rkt @@ -1,5 +1,4 @@ #lang reader (submod "racket.rkt" reader) -(require "stream.rkt") (provide (all-defined-out)) #| diff --git a/pitfall/xenomorph/private/string.rkt b/pitfall/xenomorph/private/string.rkt index 2b07c31a..49c1eeb4 100644 --- a/pitfall/xenomorph/private/string.rkt +++ b/pitfall/xenomorph/private/string.rkt @@ -1,5 +1,5 @@ #lang reader (submod "racket.rkt" reader) -(require "number.rkt" "utils.rkt" "stream.rkt") +(require "number.rkt" "utils.rkt") (provide (all-defined-out)) #| @@ -79,7 +79,6 @@ https://github.com/mbutterick/restructure/blob/master/src/String.coffee (define-values (String? +String) (values StringT? +StringT)) (test-module - (require "stream.rkt") (define S (+String uint8 'utf8)) (check-equal? (send S decode #"\2BCDEF") "BC") (check-equal? (send S encode #f "Mike") #"\4Mike") diff --git a/pitfall/xenomorph/private/struct.rkt b/pitfall/xenomorph/private/struct.rkt index b7b4c4be..c4d08146 100644 --- a/pitfall/xenomorph/private/struct.rkt +++ b/pitfall/xenomorph/private/struct.rkt @@ -1,5 +1,5 @@ #lang reader (submod "racket.rkt" reader) -(require racket/dict "stream.rkt" racket/private/generic-methods racket/struct) +(require racket/dict racket/private/generic-methods racket/struct) (provide (all-defined-out) ref* ref*-set! (all-from-out racket/dict)) (require (prefix-in d: racket/dict)) diff --git a/pitfall/xenomorph/private/buffer.rkt b/pitfall/xenomorph/private/~buffer.rkt similarity index 100% rename from pitfall/xenomorph/private/buffer.rkt rename to pitfall/xenomorph/private/~buffer.rkt diff --git a/pitfall/xenomorph/private/stream.rkt b/pitfall/xenomorph/private/~stream.rkt similarity index 100% rename from pitfall/xenomorph/private/stream.rkt rename to pitfall/xenomorph/private/~stream.rkt diff --git a/pitfall/xenomorph/test/main.rkt b/pitfall/xenomorph/test/main.rkt index 6e723183..20d58b42 100644 --- a/pitfall/xenomorph/test/main.rkt +++ b/pitfall/xenomorph/test/main.rkt @@ -2,7 +2,6 @@ (require "array-test.rkt" "bitfield-test.rkt" - "buffer-test.rkt" "enum-test.rkt" "lazy-array-test.rkt" "number-test.rkt" diff --git a/pitfall/xenomorph/test/versioned-struct-test.rkt b/pitfall/xenomorph/test/versioned-struct-test.rkt index f491dd0a..1a598f1e 100644 --- a/pitfall/xenomorph/test/versioned-struct-test.rkt +++ b/pitfall/xenomorph/test/versioned-struct-test.rkt @@ -129,7 +129,7 @@ https://github.com/mbutterick/restructure/blob/master/test/VersionedStruct.coffe 1 (dictify 'name (+StringT uint8 'utf8) 'age uint8 'gender uint8)))]) - (set-field! process struct (λ (o stream ctx) (ref-set! o 'processed "true") o)) + (set-field! post-decode struct (λ (o stream ctx) (ref-set! o 'processed "true") o)) (parameterize ([current-input-port (open-input-bytes #"\x00\x05devon\x15")]) (check-equal? (dump (decode struct)) (mhasheq 'name "devon" 'processed "true" @@ -253,7 +253,7 @@ https://github.com/mbutterick/restructure/blob/master/test/VersionedStruct.coffe 'age 21 'gender 0 'version 1) port) - (check-equal? (dump port) (+Buffer "\x00\x05devon\x15\x01\x0adevon 👍\x15\x00" 'utf8))) + (check-equal? (dump port) (string->bytes/utf-8 "\x00\x05devon\x15\x01\x0adevon 👍\x15\x00"))) ; diff --git a/pitfall/xenomorph/test/buffer-test.rkt b/pitfall/xenomorph/test/~buffer-test.rkt similarity index 100% rename from pitfall/xenomorph/test/buffer-test.rkt rename to pitfall/xenomorph/test/~buffer-test.rkt diff --git a/pitfall/xenomorph/test/stream-test.rkt b/pitfall/xenomorph/test/~stream-test.rkt similarity index 100% rename from pitfall/xenomorph/test/stream-test.rkt rename to pitfall/xenomorph/test/~stream-test.rkt