Skip to content

Commit e388360

Browse files
committed
workaround issue with zig cc and run rustfmt
1 parent 6fcb074 commit e388360

File tree

202 files changed

+337
-326
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+337
-326
lines changed

crates/app/core/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,10 @@ struct CreateDatabasePoolOptions {
131131
async fn create_database_pool(options: CreateDatabasePoolOptions) -> Result<sqlx::AnyPool> {
132132
let database_url = options.database_url.to_string();
133133
let (pool_options, pool_max_connections) = if database_url.starts_with("sqlite:") {
134+
// Workaround for issue with `zig cc -target x86_64-linux-gnu` not working with create_if_missing.
135+
if database_url != "sqlite::memory:" {
136+
tokio::fs::File::create(options.database_url.path()).await?;
137+
}
134138
let pool_options = database_url
135139
.parse::<sqlx::sqlite::SqliteConnectOptions>()?
136140
.create_if_missing(true)

crates/app/core/model.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ use crate::{
55
};
66
use anyhow::Result;
77
use memmap::{Mmap, MmapMut};
8+
use modelfox_id::Id;
89
use sqlx::Acquire;
910
use std::{
1011
io::{Read, Write},
1112
path::Path,
1213
};
13-
use modelfox_id::Id;
1414

1515
/// Retrieves the model with the specified id.
1616
pub async fn get_model_bytes(data_storage: &Storage, model_id: Id) -> Result<Mmap> {

crates/app/core/monitor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ use crate::{
33
clock::Clock,
44
};
55
use anyhow::Result;
6+
use modelfox_id::Id;
67
use serde::{Deserialize, Serialize};
78
use sqlx::prelude::*;
89
use std::{borrow::BorrowMut, fmt, io, str::FromStr};
9-
use modelfox_id::Id;
1010
use time::OffsetDateTime;
1111

1212
/// A Monitor generates alerts when production data exceeds configured thresholds

crates/app/core/monitor_checker.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ use crate::{
1414
};
1515
use anyhow::{anyhow, bail, Result};
1616
use futures::FutureExt;
17-
use sqlx::prelude::*;
18-
use std::{borrow::BorrowMut, sync::Arc};
1917
use modelfox_app_production_metrics::{ProductionMetrics, ProductionPredictionMetricsOutput};
2018
use modelfox_id::Id;
19+
use sqlx::prelude::*;
20+
use std::{borrow::BorrowMut, sync::Arc};
2121
use tokio::sync::{mpsc, oneshot};
2222

2323
#[derive(Debug)]

crates/app/core/organizations.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use std::borrow::BorrowMut;
22

33
use anyhow::Result;
4-
use sqlx::prelude::*;
54
use modelfox_id::Id;
5+
use sqlx::prelude::*;
66

77
pub struct GetOrganizationOutput {
88
pub id: Id,

crates/app/core/repos.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use crate::{
55
App,
66
};
77
use anyhow::Result;
8+
use modelfox_id::Id;
89
use sqlx::prelude::*;
910
use std::borrow::BorrowMut;
10-
use modelfox_id::Id;
1111

1212
pub struct Repo {
1313
pub id: String,

crates/app/core/track.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ use crate::{model::get_model_bytes, storage::Storage};
22
use anyhow::{anyhow, bail, Result};
33
use chrono::prelude::*;
44
use memmap::Mmap;
5-
use num::ToPrimitive;
6-
use sqlx::prelude::*;
7-
use std::{borrow::BorrowMut, collections::BTreeMap};
85
use modelfox_app_monitor_event::{
96
BinaryClassificationPredictOutput, MonitorEvent, MulticlassClassificationPredictOutput,
107
NumberOrString, PredictOutput, PredictionMonitorEvent, RegressionPredictOutput,
@@ -13,6 +10,9 @@ use modelfox_app_monitor_event::{
1310
use modelfox_app_production_metrics::ProductionMetrics;
1411
use modelfox_app_production_stats::ProductionStats;
1512
use modelfox_id::Id;
13+
use num::ToPrimitive;
14+
use sqlx::prelude::*;
15+
use std::{borrow::BorrowMut, collections::BTreeMap};
1616
use tracing::error;
1717

1818
use super::App;

crates/app/core/user.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use std::borrow::BorrowMut;
22

33
use crate::cookies::parse_cookies;
44
use anyhow::Result;
5-
use sqlx::prelude::*;
65
use modelfox_id::Id;
6+
use sqlx::prelude::*;
77

88
pub enum User {
99
Root,

crates/app/layouts/auth_layout.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
use pinwheel::prelude::*;
21
use modelfox_app_ui::logo::Logo;
32
use modelfox_ui as ui;
3+
use pinwheel::prelude::*;
44

55
#[derive(children, Default, new)]
66
#[new(default)]

crates/app/layouts/model_layout.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
use anyhow::Result;
2-
use pinwheel::prelude::*;
3-
use sqlx::prelude::*;
4-
use std::{borrow::BorrowMut, sync::Arc};
52
use modelfox_app_context::Context;
63
use modelfox_app_core::{
74
error::{bad_request, not_found, redirect_to_login, service_unavailable},
@@ -12,6 +9,9 @@ use modelfox_app_core::{
129
use modelfox_app_ui::topbar::{Topbar, TopbarAvatar};
1310
use modelfox_id::Id;
1411
use modelfox_ui as ui;
12+
use pinwheel::prelude::*;
13+
use sqlx::prelude::*;
14+
use std::{borrow::BorrowMut, sync::Arc};
1515

1616
pub struct ModelLayoutInfo {
1717
pub model_id: Id,

0 commit comments

Comments
 (0)