Skip to content

Commit

Permalink
Use relative imports for internal modules
Browse files Browse the repository at this point in the history
  • Loading branch information
codyopel committed Sep 5, 2022
1 parent bf25113 commit fd51588
Show file tree
Hide file tree
Showing 21 changed files with 60 additions and 59 deletions.
10 changes: 5 additions & 5 deletions env.elv
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
# limitations under the License.


use github.com/chlorm/elvish-stl/list
use github.com/chlorm/elvish-stl/path
use github.com/chlorm/elvish-stl/platform
use github.com/chlorm/elvish-stl/str
use github.com/chlorm/elvish-stl/utils
use ./list
use ./path
use ./platform
use ./str
use ./utils


var DELIMITER = ':'
Expand Down
4 changes: 2 additions & 2 deletions env_test.elv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use github.com/chlorm/elvish-stl/env
use github.com/chlorm/elvish-stl/test
use ./env
use ./test


test:assert {
Expand Down
8 changes: 4 additions & 4 deletions exec.elv
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@


use file
use github.com/chlorm/elvish-stl/io
use github.com/chlorm/elvish-stl/platform
use github.com/chlorm/elvish-stl/re
use github.com/chlorm/elvish-stl/str
use ./io
use ./platform
use ./re
use ./str


# Captures and returns command errors while suppressing output on success.
Expand Down
6 changes: 3 additions & 3 deletions ini.elv
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
# limitations under the License.


use github.com/chlorm/elvish-stl/map
use github.com/chlorm/elvish-stl/re
use github.com/chlorm/elvish-stl/str
use ./map
use ./re
use ./str


# Parses ini encoded data and returns a map.
Expand Down
2 changes: 1 addition & 1 deletion io.elv
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.


use github.com/chlorm/elvish-stl/str
use ./str


fn open {|file|
Expand Down
4 changes: 2 additions & 2 deletions list_test.elv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use github.com/chlorm/elvish-stl/list
use github.com/chlorm/elvish-stl/test
use ./list
use ./test


test:assert {
Expand Down
12 changes: 6 additions & 6 deletions os.elv
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
# limitations under the License.


use github.com/chlorm/elvish-stl/exec
use github.com/chlorm/elvish-stl/map
use github.com/chlorm/elvish-stl/path
use github.com/chlorm/elvish-stl/platform
use github.com/chlorm/elvish-stl/str
use github.com/chlorm/elvish-stl/windows
use ./exec
use ./map
use ./path
use ./platform
use ./str
use ./windows


var NULL = '/dev/null'
Expand Down
7 changes: 4 additions & 3 deletions os_test.elv
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use github.com/chlorm/elvish-stl/os
use github.com/chlorm/elvish-stl/platform
use github.com/chlorm/elvish-stl/test
use ./os
use ./path
use ./platform
use ./test


# FIXME: non-hermetic
Expand Down
10 changes: 5 additions & 5 deletions path.elv
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@


use path
use github.com/chlorm/elvish-stl/env
use github.com/chlorm/elvish-stl/list
use github.com/chlorm/elvish-stl/platform
use github.com/chlorm/elvish-stl/re
use github.com/chlorm/elvish-stl/str
use ./env
use ./list
use ./platform
use ./re
use ./str


var DELIMITER = '/'
Expand Down
4 changes: 2 additions & 2 deletions path_test.elv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use github.com/chlorm/elvish-stl/path
use github.com/chlorm/elvish-stl/test
use ./path
use ./test


# Trailing delimiter should not cause paths to differ
Expand Down
4 changes: 2 additions & 2 deletions platform.elv
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@


use platform
use github.com/chlorm/elvish-stl/exec
use github.com/chlorm/elvish-stl/str
use ./exec
use ./str


var arch = $platform:arch
Expand Down
4 changes: 2 additions & 2 deletions proc.elv
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
# limitations under the License.


use github.com/chlorm/elvish-stl/exec
use github.com/chlorm/elvish-stl/platform
use ./exec
use ./platform


fn kill {|processId|
Expand Down
4 changes: 2 additions & 2 deletions re_test.elv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use github.com/chlorm/elvish-stl/re
use github.com/chlorm/elvish-stl/test
use ./re
use ./test


test:assert { ==s (re:find '.*(answer).*' 'kasjdhfanswergasdfg') 'answer' }
2 changes: 1 addition & 1 deletion str.elv
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


use str
use github.com/chlorm/elvish-stl/platform
use ./platform


var LINE-DELIMITER = "\n"
Expand Down
4 changes: 2 additions & 2 deletions test.elv
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@


use builtin
use github.com/chlorm/elvish-stl/path
use github.com/chlorm/elvish-stl/str
use ./path
use ./str


fn run {
Expand Down
2 changes: 1 addition & 1 deletion test_test.elv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use github.com/chlorm/elvish-stl/test
use ./test


test:pass { nop }
Expand Down
4 changes: 2 additions & 2 deletions time.elv
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
# limitations under the License.


use github.com/chlorm/elvish-stl/exec
use github.com/chlorm/elvish-stl/platform
use ./exec
use ./platform


fn date {|&format='%Y%m%d'|
Expand Down
6 changes: 3 additions & 3 deletions time_test.elv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use github.com/chlorm/elvish-stl/re
use github.com/chlorm/elvish-stl/test
use github.com/chlorm/elvish-stl/time
use ./re
use ./test
use ./time


test:assert { re:match "^[0-9]{8}$" (time:date) }
10 changes: 5 additions & 5 deletions utils.elv
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
# limitations under the License.


use github.com/chlorm/elvish-stl/env
use github.com/chlorm/elvish-stl/os
use github.com/chlorm/elvish-stl/path
use github.com/chlorm/elvish-stl/re
use github.com/chlorm/elvish-stl/str
use ./env
use ./os
use ./path
use ./re
use ./str


# env-var is a comma separated environment variable of preferred commands.
Expand Down
6 changes: 3 additions & 3 deletions windows.elv
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
# limitations under the License.


use github.com/chlorm/elvish-stl/exec
use github.com/chlorm/elvish-stl/path
use github.com/chlorm/elvish-stl/str
use ./exec
use ./path
use ./str


# https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file#naming-conventions
Expand Down
6 changes: 3 additions & 3 deletions windows_test.elv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use github.com/chlorm/elvish-stl/platform
use github.com/chlorm/elvish-stl/test
use github.com/chlorm/elvish-stl/windows
use ./platform
use ./test
use ./windows

if (not $platform:is-windows) {
echo 'skipping' >&2
Expand Down

0 comments on commit fd51588

Please sign in to comment.