From b8d885f774577eb262da2b8c70d45545d3bb18cc Mon Sep 17 00:00:00 2001 From: elvis Date: Wed, 12 Nov 2025 17:33:36 +0100 Subject: [PATCH] fmt --- execution/src/presets.rs | 6 ++++-- rsprocess/src/graph.rs | 18 ++++++++++++++---- rsprocess/src/process.rs | 8 ++++++-- rsprocess/src/reaction.rs | 5 ++--- rsprocess/src/set.rs | 2 +- rsprocess/src/system_test.rs | 3 ++- rsprocess/src/trace.rs | 2 +- 7 files changed, 30 insertions(+), 14 deletions(-) diff --git a/execution/src/presets.rs b/execution/src/presets.rs index 094a2ea..a84999a 100644 --- a/execution/src/presets.rs +++ b/execution/src/presets.rs @@ -727,8 +727,10 @@ pub fn dot( let graph = Arc::new(graph.to_owned()); - let node_formatter = node_color - .generate(Arc::clone(&graph), system.translator.encode_not_mut("*")); + let node_formatter = node_color.generate( + Arc::clone(&graph), + system.translator.encode_not_mut("*"), + ); let edge_formatter = edge_color.generate(Arc::clone(&graph)); let dot = dot::Dot::with_attr_getters( diff --git a/rsprocess/src/graph.rs b/rsprocess/src/graph.rs index 0f5ff09..2454b87 100644 --- a/rsprocess/src/graph.rs +++ b/rsprocess/src/graph.rs @@ -714,8 +714,10 @@ impl EdgeDisplay { Box::new(move |i, n| { let mut accumulator = String::new(); for b in &self.base { - let f = b - .match_edge_display(Arc::clone(&translator), common.clone()); + let f = b.match_edge_display( + Arc::clone(&translator), + common.clone(), + ); accumulator.push_str(&(f)(i, n)); } accumulator @@ -862,7 +864,11 @@ impl NodeColorConditional { use super::format_helpers::node_formatter::*; match self { | Self::ContextConditional(ContextColorConditional::Nill) => - format_nill(Arc::clone(&original_graph), color.to_string(), star), + format_nill( + Arc::clone(&original_graph), + color.to_string(), + star, + ), | Self::ContextConditional( ContextColorConditional::RecursiveIdentifier(s), ) => format_recursive_identifier( @@ -920,7 +926,11 @@ impl NodeColorConditional { use super::format_helpers::positive_node_formatter::*; match self { | Self::ContextConditional(ContextColorConditional::Nill) => - format_nill(Arc::clone(&original_graph), color.to_string(), star), + format_nill( + Arc::clone(&original_graph), + color.to_string(), + star, + ), | Self::ContextConditional( ContextColorConditional::RecursiveIdentifier(s), ) => format_recursive_identifier( diff --git a/rsprocess/src/process.rs b/rsprocess/src/process.rs index f926673..6e75bef 100644 --- a/rsprocess/src/process.rs +++ b/rsprocess/src/process.rs @@ -32,7 +32,9 @@ where // ----------------------------------------------------------------------------- -#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, Default)] +#[derive( + Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, Default, +)] pub enum Process { #[default] Nill, @@ -242,7 +244,9 @@ impl PrintableWithTranslator for Process { // ----------------------------------------------------------------------------- -#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, Default)] +#[derive( + Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, Default, +)] pub enum PositiveProcess { #[default] Nill, diff --git a/rsprocess/src/reaction.rs b/rsprocess/src/reaction.rs index ee1584b..01e29d4 100644 --- a/rsprocess/src/reaction.rs +++ b/rsprocess/src/reaction.rs @@ -316,8 +316,8 @@ impl Reaction { pub fn into_positive_reactions( reactions: &[Self], ) -> Vec { - let reactions = - reactions.iter() + let reactions = reactions + .iter() .filter(|r| !r.reactants.is_empty() || !r.inhibitors.is_empty()) .cloned() .collect::>(); @@ -325,7 +325,6 @@ impl Reaction { let mut res = vec![]; let old_reactions = &reactions; - let all_products = Reaction::all_products(old_reactions); for el in all_products { let p = Reaction::all_reactions_with_product(old_reactions, &el); diff --git a/rsprocess/src/set.rs b/rsprocess/src/set.rs index 77b1a29..4e33e6b 100644 --- a/rsprocess/src/set.rs +++ b/rsprocess/src/set.rs @@ -237,7 +237,7 @@ impl Set { inhibitors: &[Set], ) -> Result, String> { if reactants.is_empty() && inhibitors.is_empty() { - return Ok(vec![]) + return Ok(vec![]); } if reactants.len() != inhibitors.len() { return Err(format!( diff --git a/rsprocess/src/system_test.rs b/rsprocess/src/system_test.rs index 92ae0a5..fe07341 100644 --- a/rsprocess/src/system_test.rs +++ b/rsprocess/src/system_test.rs @@ -1,7 +1,8 @@ +use std::sync::Arc; + use super::set::PositiveSet; use super::system::BasicSystem; use crate::system::ExtensionsSystem; -use std::sync::Arc; #[test] fn one_transition() { diff --git a/rsprocess/src/trace.rs b/rsprocess/src/trace.rs index 385eeb3..f2a3aec 100644 --- a/rsprocess/src/trace.rs +++ b/rsprocess/src/trace.rs @@ -1,7 +1,7 @@ use std::fmt::Debug; use std::ops::{Index, IndexMut}; -use std::sync::Arc; use std::slice::SliceIndex; +use std::sync::Arc; use serde::{Deserialize, Serialize};