Merge pull request #142 from edgenai/fix/misc

Fix/misc
edgenai · Apr 29, 2024 · c1f604f · c1f604f
2 parents ada21e1 + d5e4c62
commit c1f604f
Show file tree

Hide file tree

Showing 26 changed files with 1,490 additions and 373 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -54,7 +54,9 @@ jobs:
 
       - name: Add rust target (macOS)
         if: ${{ matrix.runner == 'macos-latest' }}
-        run: rustup target add aarch64-apple-darwin
+        run: |
+          rustup target add x86_64-apple-darwin
+          rustup target add aarch64-apple-darwin
 
       - name: Add rust target (Other)
         if: ${{ matrix.runner != 'macos-latest' }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/edgen_core/Cargo.toml b/crates/edgen_core/Cargo.toml
@@ -9,6 +9,7 @@ async-trait = { workspace = true }
 dashmap = { workspace = true }
 directories = { workspace = true }
 derive_more = { workspace = true }
+either = { workspace = true }
 edgen_async_compat = { path = "../edgen_async_compat", features = ["runtime-tokio"] }
 notify = { workspace = true }
 num_cpus = { workspace = true }

diff --git a/crates/edgen_core/src/lib.rs b/crates/edgen_core/src/lib.rs
@@ -18,7 +18,6 @@
 
 extern crate alloc;
 
-use std::future::Future;
 use std::time::Duration;
 
 pub mod llm;
@@ -29,9 +28,6 @@ pub mod settings;
 pub mod image_generation;
 pub mod perishable;
 
-/// A generic [`Box`]ed [`Future`], used to emulate `async` functions in traits.
-pub type BoxedFuture<'a, T> = Box<dyn Future<Output = T> + Send + Unpin + 'a>;
-
 /// Return the [`Duration`] that cleanup threads should wait before looking for and freeing unused
 /// resources, after last doing so.
 pub fn cleanup_interval() -> Duration {