Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/misc #142

Merged
merged 14 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down
83 changes: 74 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/edgen_core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
4 changes: 0 additions & 4 deletions crates/edgen_core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

extern crate alloc;

use std::future::Future;
use std::time::Duration;

pub mod llm;
Expand All @@ -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 {
Expand Down
Loading
Loading