Merge pull request #65 from upstat-io/dev

feat: collect-to-set runtime, rewrite docs to lead with ARC memory model

Author: elucidsoft

.cargo/config.toml

@@ -14,23 +14,23 @@ stv = "run -p oric --bin ori -- test --verbose"
 # Run Ori tests with filter (usage: cargo stf map)
 stf = "run -p oric --bin ori -- test --filter"
 
-# Run all Rust unit tests across the workspace
-t = "test --workspace"
+# Run all Rust unit tests across the workspace (excludes ori_llvm — needs LLVM 17)
+t = "test --workspace --exclude ori_llvm"
 
 # Run Rust tests with output shown
-tv = "test --workspace -- --nocapture"
+tv = "test --workspace --exclude ori_llvm -- --nocapture"
 
 # Run tests for a specific crate (usage: cargo tc ori_parse)
 tc = "test -p"
 
-# Check all crates
-c = "check --workspace"
+# Check all crates (excludes ori_llvm — needs LLVM 17)
+c = "check --workspace --exclude ori_llvm"
 
-# Build all crates
-b = "build --workspace"
+# Build all crates (excludes ori_llvm — needs LLVM 17)
+b = "build --workspace --exclude ori_llvm"
 
-# Clippy on all crates (lint levels defined in workspace Cargo.toml)
-cl = "clippy --workspace --all-targets -- -D warnings"
+# Clippy on all crates (excludes ori_llvm — needs LLVM 17; use `cargo cll` for LLVM)
+cl = "clippy --workspace --exclude ori_llvm --all-targets -- -D warnings"
 
 # LLVM crates (ori_llvm, ori_rt) are excluded from workspace.
 # LLVM 17 path is configured via LLVM_SYS_170_PREFIX above.
@@ -44,5 +44,5 @@ blr = "build -p oric -p ori_rt --features llvm --release"
 # Run oric with LLVM feature
 rl = "run -p oric --features llvm --bin ori --"
 
-# Clippy on LLVM crates (excluded from workspace, use --manifest-path)
-cll = "clippy --manifest-path compiler/ori_llvm/Cargo.toml --all-targets -- -D warnings"
+# Clippy on LLVM crate
+cll = "clippy -p ori_llvm --all-targets -- -D warnings"

.github/workflows/ci.yml

@@ -38,7 +38,6 @@ jobs:
         with:
           components: rustfmt
       - run: cargo fmt --all -- --check
-      - run: cargo fmt --manifest-path compiler/ori_llvm/Cargo.toml -- --check
 
   clippy:
     name: Clippy
@@ -53,7 +52,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           key: clippy
-      - run: cargo clippy --workspace --all-targets -- -D warnings
+      - run: cargo clippy --workspace --exclude ori_llvm --all-targets -- -D warnings
 
   # Main test suite
   test:
@@ -69,14 +68,14 @@ jobs:
           key: test
 
       - name: Build
-        run: cargo build --workspace
+        run: cargo build --workspace --exclude ori_llvm
 
       - name: Rust unit tests
         id: rust-tests
         continue-on-error: true
         run: |
           set -o pipefail
-          cargo test --workspace 2>&1 | tee rust-test-output.txt
+          cargo test --workspace --exclude ori_llvm 2>&1 | tee rust-test-output.txt
           # Sum all "X passed" counts from "test result:" lines
           RUST_TESTS=$(grep -oE '[0-9]+ passed' rust-test-output.txt | grep -oE '^[0-9]+' | awk '{sum+=$1} END {print sum+0}')
           RUST_FAILED=$(grep -oE '[0-9]+ failed' rust-test-output.txt | grep -oE '^[0-9]+' | awk '{sum+=$1} END {print sum+0}')
@@ -100,7 +99,7 @@ jobs:
         continue-on-error: true
         run: |
           set -o pipefail
-          cargo test --manifest-path compiler/ori_rt/Cargo.toml 2>&1 | tee rt-test-output.txt
+          cargo test -p ori_rt 2>&1 | tee rt-test-output.txt
           RT_TESTS=$(grep -oE '[0-9]+ passed' rt-test-output.txt | grep -oE '^[0-9]+' | awk '{sum+=$1} END {print sum+0}')
           RT_FAILED=$(grep -oE '[0-9]+ failed' rt-test-output.txt | grep -oE '^[0-9]+' | awk '{sum+=$1} END {print sum+0}')
           RT_SKIPPED=$(grep -oE '[0-9]+ ignored' rt-test-output.txt | grep -oE '^[0-9]+' | awk '{sum+=$1} END {print sum+0}')
@@ -177,10 +176,10 @@ jobs:
           key: ${{ matrix.os }}
 
       - name: Build
-        run: cargo build --workspace
+        run: cargo build --workspace --exclude ori_llvm
 
       - name: Rust unit tests
-        run: cargo test --workspace
+        run: cargo test --workspace --exclude ori_llvm
 
       - name: Ori language tests
         run: cargo run -p oric --bin ori -- test tests/
@@ -212,7 +211,7 @@ jobs:
           key: llvm
 
       - name: LLVM clippy
-        run: cargo clippy --manifest-path compiler/ori_llvm/Cargo.toml --all-targets -- -D warnings
+        run: cargo clippy -p ori_llvm --all-targets -- -D warnings
         env:
           LLVM_SYS_170_PREFIX: /usr/lib/llvm-17
 
@@ -222,8 +221,8 @@ jobs:
         run: |
           set -o pipefail
           cargo build -p oric -p ori_rt --features llvm -q
-          cargo test --manifest-path compiler/ori_rt/Cargo.toml 2>&1 | tee rt-llvm-output.txt
-          cargo test --manifest-path compiler/ori_llvm/Cargo.toml 2>&1 | tee llvm-test-output.txt
+          cargo test -p ori_rt 2>&1 | tee rt-llvm-output.txt
+          cargo test -p ori_llvm 2>&1 | tee llvm-test-output.txt
           # Sum all "X passed" counts from test output
           LLVM_TESTS=$(cat rt-llvm-output.txt llvm-test-output.txt | grep -oE '[0-9]+ passed' | grep -oE '^[0-9]+' | awk '{sum+=$1} END {print sum+0}')
           LLVM_FAILED=$(cat rt-llvm-output.txt llvm-test-output.txt | grep -oE '[0-9]+ failed' | grep -oE '^[0-9]+' | awk '{sum+=$1} END {print sum+0}')

Cargo.lock

@@ -15,14 +15,31 @@ members = [
     "compiler/ori_compiler",
     "compiler/ori_stack",
     "compiler/oric",
+    "compiler/ori_llvm",
+    "compiler/ori_rt",
+]
+# Default members exclude LLVM crates (require LLVM 17 system libraries).
+# Bare `cargo check`/`cargo test` skip them; use `-p ori_llvm` or `cargo bl` explicitly.
+default-members = [
+    "compiler/ori_ir",
+    "compiler/ori_diagnostic",
+    "compiler/ori_lexer_core",
+    "compiler/ori_lexer",
+    "compiler/ori_types",
+    "compiler/ori_parse",
+    "compiler/ori_patterns",
+    "compiler/ori_eval",
+    "compiler/ori_fmt",
+    "compiler/ori_arc",
+    "compiler/ori_canon",
+    "compiler/ori_compiler",
+    "compiler/ori_stack",
+    "compiler/oric",
+    "compiler/ori_rt",
 ]
-# Excluded crates (still buildable with -p flag, but not part of --workspace):
-# - ori_llvm: Requires LLVM 17; build with: cargo bl / cargo blr
-# - ori_rt: Runtime for AOT; built alongside ori_llvm
+# Excluded crates (not part of workspace at all):
 # - ori-lsp: Not yet updated to use new compiler
 exclude = [
-    "compiler/ori_llvm",
-    "compiler/ori_rt",
     "tools/ori-lsp",
 ]