rsc: Correct structure to match cargo expectations

rust/rsc/Cargo.toml

@@ -3,14 +3,6 @@ name = "rsc"
 version = "0.1.0"
 edition = "2021"
 
-[[bin]]
-name = "rsc"
-path = "src/rsc/main.rs"
-
-[[bin]]
-name = "rsc_tool"
-path = "src/rsc_tool/main.rs"
-
 [dependencies]
 entity = { path = "../entity" }
 migration = { path = "../migration" }

rust/rsc/src/rsc/add_job.rs → rust/rsc/src/bin/rsc/add_job.rs

@@ -7,8 +7,7 @@ use sea_orm::{ActiveModelTrait, ActiveValue::*, DatabaseConnection, DbErr, Trans
 use std::sync::Arc;
 use tracing;
 
-#[path = "../common/database.rs"]
-mod database;
+use rsc::database;
 
 #[tracing::instrument(skip_all)]
 pub async fn add_job(

rust/rsc/src/rsc/blob.rs → rust/rsc/src/bin/rsc/blob.rs

@@ -6,7 +6,7 @@ use entity::blob;
 use futures::stream::BoxStream;
 use futures::TryStreamExt;
 use sea_orm::prelude::Uuid;
-use sea_orm::{ActiveModelTrait, ActiveValue::*, DatabaseConnection};
+use sea_orm::{ActiveValue::*, DatabaseConnection};
 use std::sync::Arc;
 use tokio_util::bytes::Bytes;
 use tracing;

rust/rsc/src/rsc/main.rs → rust/rsc/src/bin/rsc/main.rs

@@ -3,36 +3,30 @@ use axum::{
     routing::{get, post},
     Router,
 };
+use chrono::Utc;
 use clap::Parser;
 use data_encoding::HEXLOWER;
 use migration::{Migrator, MigratorTrait};
 use rand_core::{OsRng, RngCore};
-use rlimit::{getrlimit, Resource};
+use rlimit::Resource;
+use rsc::{config, database};
+use sea_orm::{
+    prelude::Uuid, ActiveModelTrait, ActiveValue::*, ColumnTrait, ConnectOptions, ConnectionTrait,
+    Database, DatabaseConnection, EntityTrait, QueryFilter,
+};
 use std::collections::HashMap;
 use std::io::{Error, ErrorKind};
 use std::sync::Arc;
 use std::time::Duration;
 use tracing;
 
-use sea_orm::{
-    prelude::Uuid, ActiveModelTrait, ActiveValue::*, ColumnTrait, ConnectOptions, ConnectionTrait,
-    Database, DatabaseConnection, EntityTrait, QueryFilter,
-};
-
-use chrono::Utc;
-
 mod add_job;
 mod api_key_check;
 mod blob;
 mod blob_store_impls;
 mod read_job;
 mod types;
 
-#[path = "../common/config.rs"]
-mod config;
-#[path = "../common/database.rs"]
-mod database;
-
 #[derive(Debug, Parser)]
 struct ServerOptions {
     #[arg(help = "Specify a config override file", value_name = "CONFIG", long)]

rust/rsc/src/rsc_tool/main.rs → rust/rsc/src/bin/rsc_tool/main.rs

@@ -2,17 +2,13 @@ use clap::{Parser, Subcommand};
 use inquire::{Confirm, Text};
 use is_terminal::IsTerminal;
 use migration::{DbErr, Migrator, MigratorTrait};
+use rsc::{config, database};
 use sea_orm::{prelude::Uuid, DatabaseConnection};
 use std::io::{Error, ErrorKind};
 use tracing;
 
 mod table;
 
-#[path = "../common/config.rs"]
-mod config;
-#[path = "../common/database.rs"]
-mod database;
-
 async fn add_api_key(
     key: Option<String>,
     desc: String,

rust/rsc/src/common/database.rs → rust/rsc/src/database.rs

@@ -1,7 +1,7 @@
 use chrono::NaiveDateTime;
 use data_encoding::BASE64;
 use entity::prelude::{
-    Blob, BlobStore, Job, LocalBlobStore, OutputDir, OutputFile, OutputSymlink, VisibleFile,
+    Blob, BlobStore, LocalBlobStore, OutputDir, OutputFile, OutputSymlink, VisibleFile,
 };
 use entity::{
     api_key, blob, blob_store, job, local_blob_store, output_dir, output_file, output_symlink,
@@ -13,8 +13,7 @@ use rand_core::{OsRng, RngCore};
 use sea_orm::ExecResult;
 use sea_orm::{
     prelude::Uuid, ActiveModelTrait, ActiveValue::*, ColumnTrait, ConnectionTrait, DbBackend,
-    DbErr, DeleteResult, EntityTrait, PaginatorTrait, QueryFilter, QueryOrder, QuerySelect,
-    Statement,
+    DbErr, DeleteResult, EntityTrait, PaginatorTrait, QueryFilter, QueryOrder, Statement,
 };
 use tracing;
 

rust/rsc/src/lib.rs

@@ -0,0 +1,2 @@
+pub mod config;
+pub mod database;