Rename macro and identifiers

neo4j-labs · Oct 14, 2023 · 1c1f0ab · 1c1f0ab
1 parent f3e90b8
commit 1c1f0ab
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/crates/app/src/app.rs b/crates/app/src/app.rs
@@ -2,7 +2,7 @@ use std::{path::PathBuf, time::Instant};
 
 use graph::prelude::*;
 
-use crate::runner::runner;
+use crate::runner::gen_runner;
 use kommandozeile::*;
 use log::info;
 
@@ -11,9 +11,9 @@ mod runner;
 mod serialize;
 mod triangle_count;
 
-runner!(unweighted: page_rank, graph::page_rank::page_rank, PageRankConfig);
-runner!(unweighted: wcc, graph::wcc::wcc_afforest_dss, WccConfig);
-runner!(weighted: sssp, graph::sssp::delta_stepping, DeltaSteppingConfig, f32);
+gen_runner!(directed+unweighted: page_rank, graph::page_rank::page_rank, PageRankConfig);
+gen_runner!(directed+unweighted: wcc, graph::wcc::wcc_afforest_dss, WccConfig);
+gen_runner!(directed+weighted: sssp, graph::sssp::delta_stepping, DeltaSteppingConfig, f32);
 
 fn main() -> Result<()> {
     let args = setup_clap::<Args>().run()?;

diff --git a/crates/app/src/runner.rs b/crates/app/src/runner.rs
@@ -1,21 +1,21 @@
-macro_rules! runner {
-    (unweighted: $algo_name:ident, $algo_func:expr, $algo_config:ty) => {
+macro_rules! gen_runner {
+    (directed+unweighted: $algo_name:ident, $algo_func:expr, $algo_config:ty) => {
         mod $algo_name {
             use graph::prelude::*;
-            crate::runner!(__entry: $algo_config);
-            crate::runner!(__run_file_format_all: $algo_config, ());
-            crate::runner!(__run_graph_format: $algo_config, ());
-            crate::runner!(__bench: $algo_func, $algo_config, DirectedNeighbors<NI>, ());
+            crate::gen_runner!(__entry: $algo_config);
+            crate::gen_runner!(__run_file_format_all: $algo_config, ());
+            crate::gen_runner!(__run_graph_format: $algo_config, ());
+            crate::gen_runner!(__bench: $algo_func, $algo_config, DirectedNeighbors<NI>, ());
         }
     };
 
-    (weighted: $algo_name:ident, $algo_func:expr, $algo_config:ty, $ev_type:ty) => {
+    (directed+weighted: $algo_name:ident, $algo_func:expr, $algo_config:ty, $ev_type:ty) => {
         mod $algo_name {
             use graph::prelude::*;
-            crate::runner!(__entry: $algo_config);
-            crate::runner!(__run_file_format_edge_list: $algo_config, $ev_type);
-            crate::runner!(__run_graph_format: $algo_config, $ev_type);
-            crate::runner!(__bench: $algo_func, $algo_config, DirectedNeighborsWithValues<NI, $ev_type>, $ev_type);
+            crate::gen_runner!(__entry: $algo_config);
+            crate::gen_runner!(__run_file_format_edge_list: $algo_config, $ev_type);
+            crate::gen_runner!(__run_graph_format: $algo_config, $ev_type);
+            crate::gen_runner!(__bench: $algo_func, $algo_config, DirectedNeighborsWithValues<NI, $ev_type>, $ev_type);
         }
     };
 
@@ -133,4 +133,4 @@ macro_rules! runner {
     };
 }
 
-pub(crate) use runner;
+pub(crate) use gen_runner;