Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rebased to main

Browse source
This commit is contained in:
Mikayla Maki 2022-11-18 17:06:33 -08:00
parent a0cb6542ba
commit 992b94eef3
8 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/collab/src/integration_tests.rs
View file

@ -1,6 +1,6 @@
use crate::{
db::{NewUserParams, ProjectId, TestDb, UserId},
rpc::{Executor, Server, Store},
db::{NewUserParams, ProjectId, SqliteTestDb as TestDb, UserId},
rpc::{Executor, Server},
AppState,
};

2
crates/collab/src/main.rs
View file

@ -9,11 +9,11 @@ mod db_tests;
#[cfg(test)]
mod integration_tests;
use crate::db::{Db, PostgresDb};
use crate::rpc::ResultExt as _;
use anyhow::anyhow;
use axum::{routing::get, Router};
use collab::{Error, Result};
use db::DefaultDb as Db;
use serde::Deserialize;
use std::{
env::args,