Move workspace members

.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

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"

ion_builtins/src/test.rs → 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);
 }