diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88107b83f82472eaf72d5d861e32a37b8d28dfad..6267f072386d675d2f8b67ed9151a5a92b845dbd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ nightly: script: - cargo build - cargo test --lib - - cargo test --manifest-path ion_braces/Cargo.toml - - cargo test --manifest-path ion_builtins/Cargo.toml - - cargo test --manifest-path ion_ranges/Cargo.toml + - cargo test --manifest-path members/braces/Cargo.toml + - cargo test --manifest-path members/builtins/Cargo.toml + - cargo test --manifest-path members/ranges/Cargo.toml - bash examples/run_examples.sh diff --git a/Cargo.toml b/Cargo.toml index a19ca3b531e1a220ff3aeaffb9c32983841e94a9..f08bc8899ba87312b6ea778a6989e83dd8884fae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,9 @@ repository = "https://gitlab.redox-os.org/redox-os/ion" version = "1.0.0-alpha" [workspace] -members = [ "ion_braces", "ion_builtins", "ion_sys", "ion_ranges" ] +members = [ + "members/braces", "members/builtins", "members/sys", "members/ranges" +] [[bin]] name = "ion" @@ -43,10 +45,10 @@ smallstring = "0.1" smallvec = "0.6" unicode-segmentation = "1.2" xdg = { git = "https://github.com/whitequark/rust-xdg" } -ion_braces = { path = "ion_braces" } -ion_builtins = { path = "ion_builtins" } -ion_sys = { path = "ion_sys" } -ion_ranges = { path = "ion_ranges" } +ion_braces = { path = "members/braces" } +ion_builtins = { path = "members/builtins" } +ion_sys = { path = "members/sys" } +ion_ranges = { path = "members/ranges" } [lib] path = "src/lib/lib.rs" diff --git a/ion_braces/Cargo.toml b/members/braces/Cargo.toml similarity index 100% rename from ion_braces/Cargo.toml rename to members/braces/Cargo.toml diff --git a/ion_braces/src/lib.rs b/members/braces/src/lib.rs similarity index 100% rename from ion_braces/src/lib.rs rename to members/braces/src/lib.rs diff --git a/ion_builtins/Cargo.toml b/members/builtins/Cargo.toml similarity index 100% rename from ion_builtins/Cargo.toml rename to members/builtins/Cargo.toml diff --git a/ion_builtins/src/calc.rs b/members/builtins/src/calc.rs similarity index 100% rename from ion_builtins/src/calc.rs rename to members/builtins/src/calc.rs diff --git a/ion_builtins/src/conditionals.rs b/members/builtins/src/conditionals.rs similarity index 100% rename from ion_builtins/src/conditionals.rs rename to members/builtins/src/conditionals.rs diff --git a/ion_builtins/src/echo.rs b/members/builtins/src/echo.rs similarity index 100% rename from ion_builtins/src/echo.rs rename to members/builtins/src/echo.rs diff --git a/ion_builtins/src/lib.rs b/members/builtins/src/lib.rs similarity index 100% rename from ion_builtins/src/lib.rs rename to members/builtins/src/lib.rs diff --git a/ion_builtins/src/random.rs b/members/builtins/src/random.rs similarity index 100% rename from ion_builtins/src/random.rs rename to members/builtins/src/random.rs diff --git a/ion_builtins/src/test.rs b/members/builtins/src/test.rs similarity index 95% rename from ion_builtins/src/test.rs rename to members/builtins/src/test.rs index 1b58a5f3e6795b70c1642e1a914a1e2db0f9d629..9c034dc8ffc0d5365eab9e0ef5bddb4bab0c7706 100644 --- a/ion_builtins/src/test.rs +++ b/members/builtins/src/test.rs @@ -423,39 +423,39 @@ fn test_integers_arguments() { #[test] fn test_file_exists() { - assert_eq!(file_exists("../testing/empty_file"), true); + assert_eq!(file_exists("../../testing/empty_file"), true); assert_eq!(file_exists("this-does-not-exist"), false); } #[test] fn test_file_is_regular() { - assert_eq!(file_is_regular("../testing/empty_file"), true); - assert_eq!(file_is_regular("../testing"), false); + assert_eq!(file_is_regular("../../testing/empty_file"), true); + assert_eq!(file_is_regular("../../testing"), false); } #[test] fn test_file_is_directory() { - assert_eq!(file_is_directory("../testing"), true); - assert_eq!(file_is_directory("../testing/empty_file"), false); + assert_eq!(file_is_directory("../../testing"), true); + assert_eq!(file_is_directory("../../testing/empty_file"), false); } #[test] fn test_file_is_symlink() { - assert_eq!(file_is_symlink("../testing/symlink"), true); - assert_eq!(file_is_symlink("../testing/empty_file"), false); + assert_eq!(file_is_symlink("../../testing/symlink"), true); + assert_eq!(file_is_symlink("../../testing/empty_file"), false); } #[test] fn test_file_has_execute_permission() { - assert_eq!(file_has_execute_permission("../testing/executable_file"), true); - assert_eq!(file_has_execute_permission("../testing/empty_file"), false); + assert_eq!(file_has_execute_permission("../../testing/executable_file"), true); + assert_eq!(file_has_execute_permission("../../testing/empty_file"), false); } #[test] fn test_file_size_is_greater_than_zero() { assert_eq!( - file_size_is_greater_than_zero("../testing/file_with_text"), + file_size_is_greater_than_zero("../../testing/file_with_text"), true ); - assert_eq!(file_size_is_greater_than_zero("../testing/empty_file"), false); + assert_eq!(file_size_is_greater_than_zero("../../testing/empty_file"), false); } diff --git a/ion_ranges/Cargo.toml b/members/ranges/Cargo.toml similarity index 100% rename from ion_ranges/Cargo.toml rename to members/ranges/Cargo.toml diff --git a/ion_ranges/src/index.rs b/members/ranges/src/index.rs similarity index 100% rename from ion_ranges/src/index.rs rename to members/ranges/src/index.rs diff --git a/ion_ranges/src/lib.rs b/members/ranges/src/lib.rs similarity index 100% rename from ion_ranges/src/lib.rs rename to members/ranges/src/lib.rs diff --git a/ion_ranges/src/parse.rs b/members/ranges/src/parse.rs similarity index 100% rename from ion_ranges/src/parse.rs rename to members/ranges/src/parse.rs diff --git a/ion_ranges/src/range.rs b/members/ranges/src/range.rs similarity index 100% rename from ion_ranges/src/range.rs rename to members/ranges/src/range.rs diff --git a/ion_ranges/src/select.rs b/members/ranges/src/select.rs similarity index 100% rename from ion_ranges/src/select.rs rename to members/ranges/src/select.rs diff --git a/ion_sys/Cargo.toml b/members/sys/Cargo.toml similarity index 100% rename from ion_sys/Cargo.toml rename to members/sys/Cargo.toml diff --git a/ion_sys/src/lib.rs b/members/sys/src/lib.rs similarity index 100% rename from ion_sys/src/lib.rs rename to members/sys/src/lib.rs diff --git a/ion_sys/src/sys/redox/mod.rs b/members/sys/src/sys/redox/mod.rs similarity index 100% rename from ion_sys/src/sys/redox/mod.rs rename to members/sys/src/sys/redox/mod.rs diff --git a/ion_sys/src/sys/unix/mod.rs b/members/sys/src/sys/unix/mod.rs similarity index 100% rename from ion_sys/src/sys/unix/mod.rs rename to members/sys/src/sys/unix/mod.rs diff --git a/ion_sys/src/sys/unix/signals.rs b/members/sys/src/sys/unix/signals.rs similarity index 100% rename from ion_sys/src/sys/unix/signals.rs rename to members/sys/src/sys/unix/signals.rs