cleanup

sifive · Sep 24, 2024 · af55c3e · af55c3e
1 parent a890138
commit af55c3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/rust/rsc/src/bin/rsc/main.rs b/rust/rsc/src/bin/rsc/main.rs
@@ -8,7 +8,7 @@ use clap::Parser;
 use itertools::Itertools;
 use migration::{Migrator, MigratorTrait};
 use rlimit::Resource;
-use rsc::database::{self, DeletedBlob};
+use rsc::database;
 use sea_orm::{prelude::Uuid, ConnectOptions, Database, DatabaseConnection};
 use std::collections::HashMap;
 use std::io::{Error, ErrorKind};
@@ -280,7 +280,7 @@ fn launch_blob_eviction(
             tracing::info!(%deleted, "N blobs deleted for eviction");
 
             // Delete blobs from blob store
-            let chunked: Vec<Vec<DeletedBlob>> = blobs
+            let chunked: Vec<Vec<database::DeletedBlob>> = blobs
                 .into_iter()
                 .chunks(config.blob_eviction.file_chunk_size)
                 .into_iter()

diff --git a/rust/rsc/src/bin/rsc/types.rs b/rust/rsc/src/bin/rsc/types.rs
@@ -58,11 +58,6 @@ pub struct File {
 pub struct Dir {
     pub path: String,
     pub mode: i32,
-<<<<<<< Updated upstream
-=======
-    // Optional member to allow for soft migration
-    pub hidden: Option<bool>,
->>>>>>> Stashed changes
 }
 
 #[derive(Debug, Deserialize, Serialize)]