From 7542b0addd9eaf01dd5f1c4c8a39b67f51a4bd06 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Thu, 7 Apr 2022 00:59:30 -0400 Subject: More efficient TAR handling. --- stdlib/source/test/lux/tool/compiler/meta/cache/purge.lux | 4 ++-- stdlib/source/test/lux/tool/compiler/meta/export.lux | 4 ++-- stdlib/source/test/lux/tool/compiler/meta/import.lux | 14 +++++++------- stdlib/source/test/lux/world/file.lux | 14 +++++++------- stdlib/source/test/lux/world/file/watch.lux | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) (limited to 'stdlib/source/test') diff --git a/stdlib/source/test/lux/tool/compiler/meta/cache/purge.lux b/stdlib/source/test/lux/tool/compiler/meta/cache/purge.lux index f7e008720..b6f6b4f27 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/cache/purge.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/cache/purge.lux @@ -119,8 +119,8 @@ .let [dir (//module.path fs context id/0) file/0 (%.format dir / name/0) file/1 (%.format dir / name/1)] - _ (# fs write content/0 file/0) - _ (# fs write content/1 file/1) + _ (# fs write file/0 content/0) + _ (# fs write file/1 content/1) pre (# fs directory_files dir) _ (/.purge! fs context id/0) post (# fs directory_files dir)] diff --git a/stdlib/source/test/lux/tool/compiler/meta/export.lux b/stdlib/source/test/lux/tool/compiler/meta/export.lux index d25da0be5..c737eb0e3 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/export.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/export.lux @@ -62,11 +62,11 @@ [it (do (try.with !) [.let [fs (file.mock /)] _ (# fs make_directory source/0) - _ (# fs write content/0 file/0) + _ (# fs write file/0 content/0) _ (# fs make_directory source/1) _ (# fs make_directory (format source/1 / dir/0)) - _ (# fs write content/1 file/1) + _ (# fs write file/1 content/1) _ (# fs make_directory target) library_tar (/.library fs (list source/0 source/1)) diff --git a/stdlib/source/test/lux/tool/compiler/meta/import.lux b/stdlib/source/test/lux/tool/compiler/meta/import.lux index c01a790ce..f7b90c8bf 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/import.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/import.lux @@ -112,12 +112,12 @@ (in (do [! async.monad] [it/0 (do (try.with !) [.let [fs (file.mock /)] - _ (# fs write library_content library/0)] + _ (# fs write library/0 library_content)] (/.import fs (list library/0))) it/1 (do (try.with !) [.let [fs (file.mock /)] - _ (# fs write library_content/0 library/0) - _ (# fs write library_content/1 library/1)] + _ (# fs write library/0 library_content/0) + _ (# fs write library/1 library_content/1)] (/.import fs (list library/0 library/1)))] (_.cover' [/.import] (and (|> it/0 @@ -129,7 +129,7 @@ (in (do [! async.monad] [it (do (try.with !) [.let [fs (file.mock /)] - _ (# fs write library_content library/0) + _ (# fs write library/0 library_content) _ (/.import fs (list library/0 library/0))] (in false))] (_.cover' [/.duplicate] @@ -137,17 +137,17 @@ (in (do [! async.monad] [it/0 (do (try.with !) [.let [fs (file.mock /)] - _ (# fs write library_content/-0 library/0) + _ (# fs write library/0 library_content/-0) _ (/.import fs (list library/0))] (in false)) it/1 (do (try.with !) [.let [fs (file.mock /)] - _ (# fs write library_content/-1 library/0) + _ (# fs write library/0 library_content/-1) _ (/.import fs (list library/0))] (in false)) it/2 (do (try.with !) [.let [fs (file.mock /)] - _ (# fs write library_content/-2 library/0) + _ (# fs write library/0 library_content/-2) _ (/.import fs (list library/0))] (in false))] (_.cover' [/.useless_tar_entry] diff --git a/stdlib/source/test/lux/world/file.lux b/stdlib/source/test/lux/world/file.lux index a7e9de34a..ae9d7ff01 100644 --- a/stdlib/source/test/lux/world/file.lux +++ b/stdlib/source/test/lux/world/file.lux @@ -66,8 +66,8 @@ _ (in {try.#Failure ""})))) -(def: (write fs disk it @) - (-> (/.System Async) (Atom Disk) (-> Binary /.Path (IO (Try Any)))) +(def: (write fs disk @ it) + (-> (/.System Async) (Atom Disk) (-> /.Path Binary (IO (Try Any)))) (do [! io.monad] [now instant.now disk' (atom.read! disk)] @@ -203,13 +203,13 @@ _ (in {try.#Failure ""})))) - (def: (append it @) + (def: (append @ it) (do [! io.monad] [now instant.now disk' (atom.read! disk)] (case (dictionary.value @ disk') {.#None} - (..write mock disk it @) + (..write mock disk @ it) {.#Some {.#Left [_ old]}} (do ! @@ -220,7 +220,7 @@ _ (in {try.#Failure ""})))) - (def: (modify it @) + (def: (modify @ it) (do [! io.monad] [disk' (atom.read! disk)] (case (dictionary.value @ disk') @@ -231,10 +231,10 @@ _ (in {try.#Failure ""})))) - (def: (move it @) + (def: (move @ it) (do [! (try.with io.monad)] [data (..read disk @) - write (..write mock disk data it)] + write (..write mock disk it data)] (..delete mock disk @))) ))) diff --git a/stdlib/source/test/lux/world/file/watch.lux b/stdlib/source/test/lux/world/file/watch.lux index 53263b27a..a8bcda085 100644 --- a/stdlib/source/test/lux/world/file/watch.lux +++ b/stdlib/source/test/lux/world/file/watch.lux @@ -118,7 +118,7 @@ (-> (//.System Async) (/.Watcher Async) Binary //.Path (Async (Try Bit))) (do (try.with async.monad) [_ (async.after 1 {try.#Success "Delay to make sure the over_write time-stamp always changes."}) - _ (# fs write data expected_path) + _ (# fs write expected_path data) poll/2 (# watcher poll []) poll/2' (# watcher poll [])] (in (and (case poll/2 -- cgit v1.2.3