Radish alpha
r
Radicle CI broker
Radicle
Git (anonymous pull)
Log in to clone via SSH
refactor(filter-events.rs): drop use of BrokerError
Lars Wirzenius committed 1 year ago
commit 9f5db36e44c30983daee27b0ed3cc18dbd712f7e
parent e4b689703791af0c86a6f6418d375b7329594568
2 files changed +5 -8
modified src/bin/filter-events.rs
@@ -1,11 +1,12 @@
//! Show broker events that are allowed by a filter. This is meant to
//! be helpful for testing a filter configuration.

+
use anyhow::anyhow;
use log::info;
-
use std::{error::Error, path::PathBuf};
+
use std::path::PathBuf;

use radicle::prelude::Profile;
-
use radicle_ci_broker::{config::Config, error::BrokerError, event::NodeEventSource};
+
use radicle_ci_broker::{config::Config, event::NodeEventSource};

fn main() {
    if let Err(e) = fallible_main() {
@@ -18,14 +19,14 @@ fn main() {
    }
}

-
fn fallible_main() -> Result<(), BrokerError> {
+
fn fallible_main() -> anyhow::Result<()> {
    pretty_env_logger::init();

    let mut args = std::env::args().skip(1);
    let filename: PathBuf = if let Some(filename) = args.next() {
        PathBuf::from(filename)
    } else {
-
        return Err(BrokerError::Usage);
+
        return Err(anyhow!("usage: filter-events CONFIG"));
    };

    info!("using file: {:?}", filename);
modified src/error.rs
@@ -44,10 +44,6 @@ pub enum BrokerError {
    #[error("failed to spawn a CI adapter sub-process: {0}")]
    SpawnAdapter(PathBuf, #[source] std::io::Error),

-
    /// Usage error.
-
    #[error("usage: radicle-ci-broker CONFIG")]
-
    Usage,
-

    /// Default adapter is not in list of adapters.
    #[error("default adapter is not in list of adapters")]
    UnknownDefaultAdapter(String),