🎨 cargo fmt

Author: comavius

lib/judge_core/src/lib.rs

@@ -3,4 +3,4 @@ pub mod job;
 pub mod problem_registry;
 pub mod procedure;
 pub mod runner;
-pub mod writer_schema_transpiler;
+pub mod writer_schema_transpiler;

lib/judge_core/src/problem_registry.rs

@@ -32,4 +32,4 @@ pub enum RegistrationError {
     InternalError(String),
     #[error("Invalid problem procedure schema: {0}")]
     InvalidSchema(String),
-}
+}

lib/judge_core/src/writer_schema_transpiler.rs

@@ -1,18 +1,21 @@
 #![allow(unused_variables)]
 
 use crate::{
-    *,
     problem_registry::*,
-    procedure::{
-        *,
-        writer_schema::*,
-    }
+    procedure::{writer_schema::*, *},
+    *,
 };
 use std::collections::HashMap;
 
 pub fn transpile(
     problem: writer_schema::Procedure,
-) -> Result<(registered::Procedure, HashMap<identifiers::ResourceId, String>), RegistrationError> {
+) -> Result<
+    (
+        registered::Procedure,
+        HashMap<identifiers::ResourceId, String>,
+    ),
+    RegistrationError,
+> {
     let mut name_to_id = HashMap::new();
     for resource in problem.resources.iter() {
         let name = match resource {
@@ -46,54 +49,72 @@ pub fn transpile(
     for resource in problem.resources.iter() {
         match resource {
             ResourceKind::TextFile(content) => {
-                let dep_id = name_to_id.get(&content.name)
-                    .ok_or(RegistrationError::InvalidSchema("TextFile name not found".to_string()))?
+                let dep_id = name_to_id
+                    .get(&content.name)
+                    .ok_or(RegistrationError::InvalidSchema(
+                        "TextFile name not found".to_string(),
+                    ))?
                     .clone();
                 let text = registered::Text {
-                    resource_id: content_to_id.get(&content.content)
-                        .ok_or(RegistrationError::InvalidSchema("TextFile content not found".to_string()))?
+                    resource_id: content_to_id
+                        .get(&content.content)
+                        .ok_or(RegistrationError::InvalidSchema(
+                            "TextFile content not found".to_string(),
+                        ))?
                         .clone(),
                     dep_id: dep_id.clone(),
                 };
                 texts.push(text);
-            },
+            }
             ResourceKind::EmptyDirectory(empty_dir) => {
-                let dep_id = name_to_id.get(&empty_dir.name)
-                    .ok_or(RegistrationError::InvalidSchema("EmptyDirectory name not found".to_string()))?
+                let dep_id = name_to_id
+                    .get(&empty_dir.name)
+                    .ok_or(RegistrationError::InvalidSchema(
+                        "EmptyDirectory name not found".to_string(),
+                    ))?
                     .clone();
                 let empty_directory = registered::EmptyDirectory {
                     dep_id: dep_id.clone(),
                 };
                 empty_directories.push(empty_directory);
-            },
+            }
             ResourceKind::RuntimeTextFile(runtime_text) => {
-                let dep_id = name_to_id.get(&runtime_text.name)
-                    .ok_or(RegistrationError::InvalidSchema("RuntimeText name not found".to_string()))?
+                let dep_id = name_to_id
+                    .get(&runtime_text.name)
+                    .ok_or(RegistrationError::InvalidSchema(
+                        "RuntimeText name not found".to_string(),
+                    ))?
                     .clone();
                 let runtime_text = registered::RuntimeText {
                     label: runtime_text.label.clone(),
                     dep_id: dep_id.clone(),
                 };
                 runtime_texts.push(runtime_text);
-            },
+            }
         }
     }
     let mut executions = Vec::new();
     for execution in problem.executions.iter() {
         let script = execution.script_name.clone();
         let mut dependencies = Vec::new();
         for dep in execution.depends_on.iter() {
-            let dep_id = name_to_id.get(&dep.ref_to)
-                .ok_or(RegistrationError::InvalidSchema("Dependency name not found".to_string()))?
+            let dep_id = name_to_id
+                .get(&dep.ref_to)
+                .ok_or(RegistrationError::InvalidSchema(
+                    "Dependency name not found".to_string(),
+                ))?
                 .clone();
             let depends_on = registered::DependsOn {
                 dep_id: dep_id.clone(),
                 envvar_name: dep.envvar_name.clone(),
             };
             dependencies.push(depends_on);
         }
-        let dep_id = name_to_id.get(&execution.name)
-            .ok_or(RegistrationError::InvalidSchema("Execution name not found".to_string()))?
+        let dep_id = name_to_id
+            .get(&execution.name)
+            .ok_or(RegistrationError::InvalidSchema(
+                "Execution name not found".to_string(),
+            ))?
             .clone();
         let priority = 0;
         let execution = registered::Execution {
@@ -112,6 +133,9 @@ pub fn transpile(
     };
     Ok((
         procedure,
-        content_to_id.iter().map(|(k, v)| (v.clone(), k.clone())).collect()
+        content_to_id
+            .iter()
+            .map(|(k, v)| (v.clone(), k.clone()))
+            .collect(),
     ))
-}
+}

lib/local_problem_registry/src/lib.rs

@@ -1,13 +1,14 @@
-pub mod registry_server;
 pub mod registry_client;
+pub mod registry_server;
 
-pub fn new_registry() -> (registry_server::RegistryServer, registry_client::RegistryClient) {
+pub fn new_registry() -> (
+    registry_server::RegistryServer,
+    registry_client::RegistryClient,
+) {
     let registry = std::sync::Arc::new(tokio::sync::Mutex::new(std::collections::HashMap::new()));
     let server = registry_server::RegistryServer {
         registry: registry.clone(),
     };
-    let client = registry_client::RegistryClient {
-        registry,
-    };
+    let client = registry_client::RegistryClient { registry };
     (server, client)
 }

lib/local_problem_registry/src/registry_client.rs

@@ -18,4 +18,4 @@ impl problem_registry::ProblemRegistryClient for RegistryClient {
             None => Err(problem_registry::ResourceFetchError::NotFound(resource_id)),
         }
     }
-}
+}

lib/local_problem_registry/src/registry_server.rs

@@ -1,9 +1,4 @@
-use judge_core::{
-    *,
-    procedure::*,
-    problem_registry::*,
-    writer_schema_transpiler::transpile,
-};
+use judge_core::{problem_registry::*, procedure::*, writer_schema_transpiler::transpile, *};
 use std::collections::HashMap;
 use std::sync::Arc;
 use tokio::sync::Mutex;

pylib/traopy/src/procedure.rs

@@ -19,9 +19,21 @@ pub struct PyProcedure {
 impl From<PyProcedure> for Procedure {
     fn from(py_procedure: PyProcedure) -> Self {
         Self {
-            resources: py_procedure.resources.iter().map(|(_, v)| v.clone()).collect(),
-            executions: py_procedure.executions.iter().map(|(_, v)| v.clone()).collect(),
-            scripts: py_procedure.scripts.iter().map(|(_, v)| v.clone()).collect(),
+            resources: py_procedure
+                .resources
+                .iter()
+                .map(|(_, v)| v.clone())
+                .collect(),
+            executions: py_procedure
+                .executions
+                .iter()
+                .map(|(_, v)| v.clone())
+                .collect(),
+            scripts: py_procedure
+                .scripts
+                .iter()
+                .map(|(_, v)| v.clone())
+                .collect(),
         }
     }
 }