Rename and add sorting words

[factor.git] / extra / s3 / s3.factor

diff --git a/extra/s3/s3.factor b/extra/s3/s3.factor
index f2f6496181a967ced14822a132ff0c023c5100ec..4fdfd3a774a261b09c610bd8b75dc51db958fd5f 100644 (file)
--- a/extra/s3/s3.factor
+++ b/extra/s3/s3.factor
@@ -3,7 +3,7 @@
 USING: accessors assocs base64 calendar calendar.format
 calendar.parser checksums.hmac checksums.sha combinators http
 http.client kernel make math.order namespaces sequences
-sorting sorting.slots strings xml xml.traversal ;
+sorting strings xml xml.traversal ;
 IN: s3
 
 SYMBOL: key-id
@@ -16,7 +16,7 @@ TUPLE: s3-request path mime-type date method headers bucket data ;
 : hashtable>headers ( hashtable -- seq )
     [
         [ swap % ":" % % "\n" % ] "" make
-    ] { } assoc>map [ <=> ] sort ;
+    ] { } assoc>map sort ;
 
 : signature ( s3-request -- string )
     [
@@ -84,7 +84,7 @@ PRIVATE>
     f "/" H{ } clone s3-get nip >string string>xml (buckets) ;
 
 : sorted-buckets ( -- seq )
-    buckets { { date>> rfc3339>timestamp <=> } } sort-by ;
+    buckets [ date>> rfc3339>timestamp ] sort-by ;
 
 <PRIVATE
 : bucket-url ( bucket -- string )