From f85011837dc67b46bc603c7bb73a5183c7e6f24c Mon Sep 17 00:00:00 2001 From: haixuanTao Date: Thu, 11 Jan 2024 19:38:38 +0100 Subject: [PATCH] Remove unused runtime args from examples --- examples/benchmark/run.rs | 12 ------------ examples/c++-dataflow/run.rs | 11 ----------- examples/c-dataflow/run.rs | 12 ------------ examples/cmake-dataflow/run.rs | 11 ----------- examples/multiple-daemons/run.rs | 18 ++---------------- examples/rust-dataflow-url/run.rs | 11 ----------- examples/rust-dataflow/run.rs | 12 ------------ examples/rust-ros2-dataflow/run.rs | 12 ------------ 8 files changed, 2 insertions(+), 97 deletions(-) diff --git a/examples/benchmark/run.rs b/examples/benchmark/run.rs index 54c8ac76..16df626e 100644 --- a/examples/benchmark/run.rs +++ b/examples/benchmark/run.rs @@ -2,20 +2,8 @@ use dora_tracing::set_up_tracing; use eyre::{bail, Context}; use std::path::Path; -#[derive(Debug, Clone, clap::Parser)] -pub struct Args { - #[clap(long)] - pub run_dora_runtime: bool, -} - #[tokio::main] async fn main() -> eyre::Result<()> { - let Args { run_dora_runtime } = clap::Parser::parse(); - - if run_dora_runtime { - return tokio::task::block_in_place(dora_daemon::run_dora_runtime); - } - set_up_tracing("benchmark-runner").wrap_err("failed to set up tracing subscriber")?; let root = Path::new(env!("CARGO_MANIFEST_DIR")); diff --git a/examples/c++-dataflow/run.rs b/examples/c++-dataflow/run.rs index 6915c73f..5f17138f 100644 --- a/examples/c++-dataflow/run.rs +++ b/examples/c++-dataflow/run.rs @@ -5,19 +5,8 @@ use std::{ path::Path, }; -#[derive(Debug, Clone, clap::Parser)] -pub struct Args { - #[clap(long)] - pub run_dora_runtime: bool, -} - #[tokio::main] async fn main() -> eyre::Result<()> { - let Args { run_dora_runtime } = clap::Parser::parse(); - - if run_dora_runtime { - return tokio::task::block_in_place(dora_daemon::run_dora_runtime); - } set_up_tracing("c++-dataflow-runner").wrap_err("failed to set up tracing")?; if cfg!(windows) { diff --git a/examples/c-dataflow/run.rs b/examples/c-dataflow/run.rs index 4268c25c..4ebcfdb5 100644 --- a/examples/c-dataflow/run.rs +++ b/examples/c-dataflow/run.rs @@ -5,20 +5,8 @@ use std::{ path::Path, }; -#[derive(Debug, Clone, clap::Parser)] -pub struct Args { - #[clap(long)] - pub run_dora_runtime: bool, -} - #[tokio::main] async fn main() -> eyre::Result<()> { - let Args { run_dora_runtime } = clap::Parser::parse(); - - if run_dora_runtime { - return tokio::task::block_in_place(dora_daemon::run_dora_runtime); - } - set_up_tracing("c-dataflow-runner").wrap_err("failed to set up tracing")?; let root = Path::new(env!("CARGO_MANIFEST_DIR")); diff --git a/examples/cmake-dataflow/run.rs b/examples/cmake-dataflow/run.rs index 6ede3e72..27cbc68c 100644 --- a/examples/cmake-dataflow/run.rs +++ b/examples/cmake-dataflow/run.rs @@ -2,19 +2,8 @@ use dora_tracing::set_up_tracing; use eyre::{bail, Context}; use std::path::Path; -#[derive(Debug, Clone, clap::Parser)] -pub struct Args { - #[clap(long)] - pub run_dora_runtime: bool, -} - #[tokio::main] async fn main() -> eyre::Result<()> { - let Args { run_dora_runtime } = clap::Parser::parse(); - - if run_dora_runtime { - return tokio::task::block_in_place(dora_daemon::run_dora_runtime); - } set_up_tracing("cmake-dataflow-runner").wrap_err("failed to set up tracing")?; if cfg!(windows) { diff --git a/examples/multiple-daemons/run.rs b/examples/multiple-daemons/run.rs index d3499382..c3b7dddd 100644 --- a/examples/multiple-daemons/run.rs +++ b/examples/multiple-daemons/run.rs @@ -22,19 +22,8 @@ use tokio::{ use tokio_stream::wrappers::ReceiverStream; use uuid::Uuid; -#[derive(Debug, Clone, clap::Parser)] -pub struct Args { - #[clap(long)] - pub run_dora_runtime: bool, -} - #[tokio::main] async fn main() -> eyre::Result<()> { - let Args { run_dora_runtime } = clap::Parser::parse(); - if run_dora_runtime { - return tokio::task::block_in_place(dora_daemon::run_dora_runtime); - } - set_up_tracing("multiple-daemon-runner").wrap_err("failed to set up tracing subscriber")?; let root = Path::new(env!("CARGO_MANIFEST_DIR")); @@ -45,11 +34,8 @@ async fn main() -> eyre::Result<()> { build_dataflow(dataflow).await?; let (coordinator_events_tx, coordinator_events_rx) = mpsc::channel(1); - let (coordinator_port, coordinator) = dora_coordinator::start( - dora_coordinator::Args { port: Some(0) }, - ReceiverStream::new(coordinator_events_rx), - ) - .await?; + let (coordinator_port, coordinator) = + dora_coordinator::start(Some(0), ReceiverStream::new(coordinator_events_rx)).await?; let coordinator_addr = SocketAddr::new(Ipv4Addr::LOCALHOST.into(), coordinator_port); let daemon_a = dora_daemon::Daemon::run(coordinator_addr, "A".into(), stream::empty()); let daemon_b = dora_daemon::Daemon::run(coordinator_addr, "B".into(), stream::empty()); diff --git a/examples/rust-dataflow-url/run.rs b/examples/rust-dataflow-url/run.rs index 7e16d3b9..c7c3d847 100644 --- a/examples/rust-dataflow-url/run.rs +++ b/examples/rust-dataflow-url/run.rs @@ -2,19 +2,8 @@ use dora_tracing::set_up_tracing; use eyre::{bail, Context}; use std::path::Path; -#[derive(Debug, Clone, clap::Parser)] -pub struct Args { - #[clap(long)] - pub run_dora_runtime: bool, -} - #[tokio::main] async fn main() -> eyre::Result<()> { - let Args { run_dora_runtime } = clap::Parser::parse(); - if run_dora_runtime { - return tokio::task::block_in_place(dora_daemon::run_dora_runtime); - } - set_up_tracing("rust-dataflow-url-runner").wrap_err("failed to set up tracing")?; let root = Path::new(env!("CARGO_MANIFEST_DIR")); diff --git a/examples/rust-dataflow/run.rs b/examples/rust-dataflow/run.rs index 2fbc50d9..82095d03 100644 --- a/examples/rust-dataflow/run.rs +++ b/examples/rust-dataflow/run.rs @@ -2,20 +2,8 @@ use dora_tracing::set_up_tracing; use eyre::{bail, Context}; use std::path::Path; -#[derive(Debug, Clone, clap::Parser)] -pub struct Args { - #[clap(long)] - pub run_dora_runtime: bool, -} - #[tokio::main] async fn main() -> eyre::Result<()> { - let Args { run_dora_runtime } = clap::Parser::parse(); - - if run_dora_runtime { - return tokio::task::block_in_place(dora_daemon::run_dora_runtime); - } - set_up_tracing("rust-dataflow-runner").wrap_err("failed to set up tracing subscriber")?; let root = Path::new(env!("CARGO_MANIFEST_DIR")); diff --git a/examples/rust-ros2-dataflow/run.rs b/examples/rust-ros2-dataflow/run.rs index cb999d8c..5818e03e 100644 --- a/examples/rust-ros2-dataflow/run.rs +++ b/examples/rust-ros2-dataflow/run.rs @@ -2,20 +2,8 @@ use dora_tracing::set_up_tracing; use eyre::{bail, Context}; use std::path::Path; -#[derive(Debug, Clone, clap::Parser)] -pub struct Args { - #[clap(long)] - pub run_dora_runtime: bool, -} - #[tokio::main] async fn main() -> eyre::Result<()> { - let Args { run_dora_runtime } = clap::Parser::parse(); - - if run_dora_runtime { - return tokio::task::block_in_place(dora_daemon::run_dora_runtime); - } - set_up_tracing("rust-ros2-dataflow-runner").wrap_err("failed to set up tracing subscriber")?; let root = Path::new(env!("CARGO_MANIFEST_DIR"));