Merge pull request #348 from koto-lang/improve-rc-build-selection

Simplify Rc build variant selection
koto-lang · Jun 18, 2024 · e12572d · e12572d
2 parents 8712f14 + a0ca733
commit e12572d
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 76 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -34,3 +34,6 @@ pulldown-cmark = { workspace = true }
 rustyline = { workspace = true }
 textwrap = { workspace = true }
 unicode-width = { workspace = true }
+
+[dev-dependencies]
+test_bin = { workspace = true }
diff --git a/crates/koto/tests/cli_tests.rs → crates/cli/tests/run_script.rs b/crates/koto/tests/cli_tests.rs → crates/cli/tests/run_script.rs
diff --git a/crates/koto/Cargo.toml b/crates/koto/Cargo.toml
@@ -11,8 +11,8 @@ keywords = ["scripting", "language", "koto"]
 
 [features]
 default = ["arc"]
-arc = ["koto_bytecode/arc", "koto_runtime/arc", "koto_parser/arc"]
-rc = ["koto_bytecode/rc", "koto_runtime/rc", "koto_parser/rc"]
+arc = ["koto_runtime/arc"]
+rc = ["koto_runtime/rc"]
 
 [dependencies]
 koto_bytecode = { path = "../bytecode", version = "^0.15.0", default-features = false }
@@ -29,7 +29,6 @@ koto_test_utils = { path = "../test_utils" }
 anyhow = { workspace = true }
 criterion = { workspace = true }
 mimalloc = { workspace = true }
-test_bin = { workspace = true }
 
 [[bench]]
 name = "koto_benchmark"

diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml
@@ -37,5 +37,5 @@ chrono = { workspace = true, features = ["wasmbind"] }
 instant = { workspace = true, features = ["wasm-bindgen"] }
 
 [dev-dependencies]
-koto_test_utils = { path = "../test_utils", default-features = false }
+koto_test_utils = { path = "../test_utils" }
 test-case = { workspace = true }
diff --git a/crates/serialize/Cargo.toml b/crates/serialize/Cargo.toml
@@ -9,11 +9,6 @@ homepage = "https://koto.dev"
 repository = "https://github.com/koto-lang/koto"
 keywords = ["scripting", "language", "koto"]
 
-[features]
-default = ["arc"]
-arc = ["koto_runtime/arc"]
-rc = ["koto_runtime/rc"]
-
 [dependencies]
 serde = { workspace = true }
 

diff --git a/crates/test_utils/Cargo.toml b/crates/test_utils/Cargo.toml
@@ -9,11 +9,6 @@ homepage = "https://koto.dev"
 repository = "https://github.com/koto-lang/koto"
 keywords = ["scripting", "language", "koto"]
 
-[features]
-default = ["arc"]
-arc = ["koto_runtime/arc"]
-rc = ["koto_runtime/rc"]
-
 [dependencies]
 itertools = { workspace = true }
 pulldown-cmark = { workspace = true }

diff --git a/justfile b/justfile
@@ -26,8 +26,11 @@ test *args:
   cargo test {{args}}
 
 test_rc *args:
-  cargo test  --no-default-features --features rc \
+  cargo test --tests --no-default-features --features rc \
+    -p koto_parser \
+    -p koto_bytecode \
     -p koto_runtime \
+    -p koto \
     -p lib_tests \
     {{args}}
 
@@ -52,14 +55,14 @@ test_koto:
 test_libs:
   cargo test --test lib_tests
 
-test_parser:
-  cargo test --package koto_lexer --package koto_parser
+test_parser *args:
+  cargo test -p koto_lexer -p koto_parser {{args}}
 
 test_release *args:
   just test --release {{args}}
 
-test_runtime:
-  cargo test --package koto_runtime
+test_runtime *args:
+  cargo test -p koto_runtime -p koto_bytecode {{args}}
 
 wasm:
   cd crates/koto/examples/wasm && wasm-pack test --node

diff --git a/libs/color/Cargo.toml b/libs/color/Cargo.toml
@@ -9,11 +9,6 @@ homepage = "https://koto.dev"
 repository = "https://github.com/koto-lang/koto"
 keywords = ["scripting", "language", "koto"]
 
-[features]
-default = ["arc"]
-arc = ["koto_runtime/arc"]
-rc = ["koto_runtime/rc"]
-
 [dependencies]
 palette = { workspace = true }
 
@@ -23,4 +18,4 @@ version = "^0.15.0"
 default-features = false
 
 [dev-dependencies]
-koto_test_utils = { path = "../../crates/test_utils", default-features = false }
+koto_test_utils = { path = "../../crates/test_utils" }
diff --git a/libs/geometry/Cargo.toml b/libs/geometry/Cargo.toml
@@ -9,11 +9,6 @@ homepage = "https://koto.dev"
 repository = "https://github.com/koto-lang/koto"
 keywords = ["scripting", "language", "koto"]
 
-[features]
-default = ["arc"]
-arc = ["koto_runtime/arc"]
-rc = ["koto_runtime/rc"]
-
 [dependencies]
 nannou_core = { workspace = true }
 
@@ -23,4 +18,4 @@ version = "^0.15.0"
 default-features = false
 
 [dev-dependencies]
-koto_test_utils = { path = "../../crates/test_utils", default-features = false }
+koto_test_utils = { path = "../../crates/test_utils" }
diff --git a/libs/json/Cargo.toml b/libs/json/Cargo.toml
@@ -9,11 +9,6 @@ homepage = "https://koto.dev"
 repository = "https://github.com/koto-lang/koto"
 keywords = ["scripting", "language", "koto"]
 
-[features]
-default = ["arc"]
-arc = ["koto_runtime/arc"]
-rc = ["koto_runtime/rc"]
-
 [dependencies]
 serde_json = { workspace = true }
 
@@ -28,4 +23,4 @@ version = "^0.15.0"
 default-features = false
 
 [dev-dependencies]
-koto_test_utils = { path = "../../crates/test_utils", default-features = false }
+koto_test_utils = { path = "../../crates/test_utils" }
diff --git a/libs/lib_tests/Cargo.toml b/libs/lib_tests/Cargo.toml
@@ -16,11 +16,11 @@ rc = ["koto/rc"]
 
 [dev-dependencies]
 koto = { path = "../../crates/koto", version = "^0.15.0", default-features = false }
-koto_color = { path = "../color", version = "^0.15.0", default-features = false }
-koto_geometry = { path = "../geometry", version = "^0.15.0", default-features = false }
-koto_json = { path = "../json", version = "^0.15.0", default-features = false }
-koto_random = { path = "../random", version = "^0.15.0", default-features = false }
-koto_regex = { path = "../regex", version = "^0.15.0", default-features = false }
-koto_tempfile = { path = "../tempfile", version = "^0.15.0", default-features = false }
-koto_toml = { path = "../toml", version = "^0.15.0", default-features = false }
-koto_yaml = { path = "../yaml", version = "^0.15.0", default-features = false }
+koto_color = { path = "../color", version = "^0.15.0" }
+koto_geometry = { path = "../geometry", version = "^0.15.0" }
+koto_json = { path = "../json", version = "^0.15.0" }
+koto_random = { path = "../random", version = "^0.15.0" }
+koto_regex = { path = "../regex", version = "^0.15.0" }
+koto_tempfile = { path = "../tempfile", version = "^0.15.0" }
+koto_toml = { path = "../toml", version = "^0.15.0" }
+koto_yaml = { path = "../yaml", version = "^0.15.0" }
diff --git a/libs/random/Cargo.toml b/libs/random/Cargo.toml
@@ -9,11 +9,6 @@ homepage = "https://koto.dev"
 repository = "https://github.com/koto-lang/koto"
 keywords = ["scripting", "language", "koto"]
 
-[features]
-default = ["arc"]
-arc = ["koto_runtime/arc"]
-rc = ["koto_runtime/rc"]
-
 [dependencies]
 koto_derive = { path = "../../crates/derive", version = "^0.15.0" }
 
@@ -30,4 +25,4 @@ default-features = false
 getrandom = { workspace = true }
 
 [dev-dependencies]
-koto_test_utils = { path = "../../crates/test_utils", default-features = false }
+koto_test_utils = { path = "../../crates/test_utils" }
diff --git a/libs/regex/Cargo.toml b/libs/regex/Cargo.toml
@@ -9,11 +9,6 @@ homepage = "https://koto.dev"
 repository = "https://github.com/koto-lang/koto"
 keywords = ["scripting", "language", "koto"]
 
-[features]
-default = ["arc"]
-arc = ["koto_runtime/arc"]
-rc = ["koto_runtime/rc"]
-
 [dependencies]
 regex = { workspace = true }
 
@@ -23,4 +18,4 @@ version = "^0.15.0"
 default-features = false
 
 [dev-dependencies]
-koto_test_utils = { path = "../../crates/test_utils", default-features = false }
+koto_test_utils = { path = "../../crates/test_utils" }
diff --git a/libs/tempfile/Cargo.toml b/libs/tempfile/Cargo.toml
@@ -9,11 +9,6 @@ homepage = "https://koto.dev"
 repository = "https://github.com/koto-lang/koto"
 keywords = ["scripting", "language", "koto"]
 
-[features]
-default = ["arc"]
-arc = ["koto_runtime/arc"]
-rc = ["koto_runtime/rc"]
-
 [dependencies]
 tempfile = { workspace = true }
 
@@ -23,4 +18,4 @@ version = "^0.15.0"
 default-features = false
 
 [dev-dependencies]
-koto_test_utils = { path = "../../crates/test_utils", default-features = false }
+koto_test_utils = { path = "../../crates/test_utils" }
diff --git a/libs/toml/Cargo.toml b/libs/toml/Cargo.toml
@@ -9,11 +9,6 @@ homepage = "https://koto.dev"
 repository = "https://github.com/koto-lang/koto"
 keywords = ["scripting", "language", "koto"]
 
-[features]
-default = ["arc"]
-arc = ["koto_runtime/arc"]
-rc = ["koto_runtime/rc"]
-
 [dependencies]
 toml = { workspace = true }
 
@@ -28,4 +23,4 @@ version = "^0.15.0"
 default-features = false
 
 [dev-dependencies]
-koto_test_utils = { path = "../../crates/test_utils", default-features = false }
+koto_test_utils = { path = "../../crates/test_utils" }
diff --git a/libs/yaml/Cargo.toml b/libs/yaml/Cargo.toml
@@ -9,11 +9,6 @@ homepage = "https://koto.dev"
 repository = "https://github.com/koto-lang/koto"
 keywords = ["scripting", "language", "koto", "yaml"]
 
-[features]
-default = ["arc"]
-arc = ["koto_runtime/arc"]
-rc = ["koto_runtime/rc"]
-
 [dependencies]
 serde_yaml = { workspace = true }
 
@@ -28,4 +23,4 @@ version = "^0.15.0"
 default-features = false
 
 [dev-dependencies]
-koto_test_utils = { path = "../../crates/test_utils", default-features = false }
+koto_test_utils = { path = "../../crates/test_utils" }