Merge pull request #150 from gbw/cargo-fmt-formatting
This commit is contained in:
@@ -121,8 +121,7 @@ echo "DATABASE_URL=postgres://user:pass@localhost/oxicloud" > .env
|
|||||||
# Build optimised binary
|
# Build optimised binary
|
||||||
cargo build --release
|
cargo build --release
|
||||||
|
|
||||||
# Run migrations and start
|
# Start the server (migrations run automatically)
|
||||||
cargo run --bin migrate --features migrations
|
|
||||||
cargo run --release
|
cargo run --release
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -514,7 +514,10 @@ mod tests {
|
|||||||
// Arrange
|
// Arrange
|
||||||
let trashed_files = Arc::new(Mutex::new(HashMap::new()));
|
let trashed_files = Arc::new(Mutex::new(HashMap::new()));
|
||||||
let trashed_folders = Arc::new(Mutex::new(HashMap::new()));
|
let trashed_folders = Arc::new(Mutex::new(HashMap::new()));
|
||||||
let trash_repo = Arc::new(MockTrashRepository::new(trashed_files.clone(), trashed_folders.clone()));
|
let trash_repo = Arc::new(MockTrashRepository::new(
|
||||||
|
trashed_files.clone(),
|
||||||
|
trashed_folders.clone(),
|
||||||
|
));
|
||||||
let file_repo = Arc::new(MockFileRepository::new(trashed_files));
|
let file_repo = Arc::new(MockFileRepository::new(trashed_files));
|
||||||
let folder_repo = Arc::new(MockFolderRepository::new(trashed_folders));
|
let folder_repo = Arc::new(MockFolderRepository::new(trashed_folders));
|
||||||
|
|
||||||
@@ -585,7 +588,10 @@ mod tests {
|
|||||||
// Arrange
|
// Arrange
|
||||||
let trashed_files = Arc::new(Mutex::new(HashMap::new()));
|
let trashed_files = Arc::new(Mutex::new(HashMap::new()));
|
||||||
let trashed_folders = Arc::new(Mutex::new(HashMap::new()));
|
let trashed_folders = Arc::new(Mutex::new(HashMap::new()));
|
||||||
let trash_repo = Arc::new(MockTrashRepository::new(trashed_files.clone(), trashed_folders.clone()));
|
let trash_repo = Arc::new(MockTrashRepository::new(
|
||||||
|
trashed_files.clone(),
|
||||||
|
trashed_folders.clone(),
|
||||||
|
));
|
||||||
let file_repo = Arc::new(MockFileRepository::new(trashed_files));
|
let file_repo = Arc::new(MockFileRepository::new(trashed_files));
|
||||||
let folder_repo = Arc::new(MockFolderRepository::new(trashed_folders));
|
let folder_repo = Arc::new(MockFolderRepository::new(trashed_folders));
|
||||||
|
|
||||||
@@ -647,7 +653,10 @@ mod tests {
|
|||||||
// Arrange
|
// Arrange
|
||||||
let trashed_files = Arc::new(Mutex::new(HashMap::new()));
|
let trashed_files = Arc::new(Mutex::new(HashMap::new()));
|
||||||
let trashed_folders = Arc::new(Mutex::new(HashMap::new()));
|
let trashed_folders = Arc::new(Mutex::new(HashMap::new()));
|
||||||
let trash_repo = Arc::new(MockTrashRepository::new(trashed_files.clone(), trashed_folders.clone()));
|
let trash_repo = Arc::new(MockTrashRepository::new(
|
||||||
|
trashed_files.clone(),
|
||||||
|
trashed_folders.clone(),
|
||||||
|
));
|
||||||
let file_repo = Arc::new(MockFileRepository::new(trashed_files));
|
let file_repo = Arc::new(MockFileRepository::new(trashed_files));
|
||||||
let folder_repo = Arc::new(MockFolderRepository::new(trashed_folders));
|
let folder_repo = Arc::new(MockFolderRepository::new(trashed_folders));
|
||||||
|
|
||||||
@@ -714,7 +723,10 @@ mod tests {
|
|||||||
// Arrange
|
// Arrange
|
||||||
let trashed_files = Arc::new(Mutex::new(HashMap::new()));
|
let trashed_files = Arc::new(Mutex::new(HashMap::new()));
|
||||||
let trashed_folders = Arc::new(Mutex::new(HashMap::new()));
|
let trashed_folders = Arc::new(Mutex::new(HashMap::new()));
|
||||||
let trash_repo = Arc::new(MockTrashRepository::new(trashed_files.clone(), trashed_folders.clone()));
|
let trash_repo = Arc::new(MockTrashRepository::new(
|
||||||
|
trashed_files.clone(),
|
||||||
|
trashed_folders.clone(),
|
||||||
|
));
|
||||||
let file_repo = Arc::new(MockFileRepository::new(trashed_files));
|
let file_repo = Arc::new(MockFileRepository::new(trashed_files));
|
||||||
let folder_repo = Arc::new(MockFolderRepository::new(trashed_folders));
|
let folder_repo = Arc::new(MockFolderRepository::new(trashed_folders));
|
||||||
|
|
||||||
@@ -780,7 +792,10 @@ mod tests {
|
|||||||
// Arrange
|
// Arrange
|
||||||
let trashed_files = Arc::new(Mutex::new(HashMap::new()));
|
let trashed_files = Arc::new(Mutex::new(HashMap::new()));
|
||||||
let trashed_folders = Arc::new(Mutex::new(HashMap::new()));
|
let trashed_folders = Arc::new(Mutex::new(HashMap::new()));
|
||||||
let trash_repo = Arc::new(MockTrashRepository::new(trashed_files.clone(), trashed_folders.clone()));
|
let trash_repo = Arc::new(MockTrashRepository::new(
|
||||||
|
trashed_files.clone(),
|
||||||
|
trashed_folders.clone(),
|
||||||
|
));
|
||||||
let file_repo = Arc::new(MockFileRepository::new(trashed_files));
|
let file_repo = Arc::new(MockFileRepository::new(trashed_files));
|
||||||
let folder_repo = Arc::new(MockFolderRepository::new(trashed_folders));
|
let folder_repo = Arc::new(MockFolderRepository::new(trashed_folders));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user