Skip to content

Commit

Permalink
Make rustfmt happy
Browse files Browse the repository at this point in the history
  • Loading branch information
imobachgs committed Nov 3, 2023
1 parent fdabc32 commit 7dd00b2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions rust/agama-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ use crate::error::CliError;
use agama_lib::error::ServiceError;
use agama_lib::manager::ManagerClient;
use agama_lib::progress::ProgressMonitor;
use tokio;
use commands::Commands;
use config::run as run_config_cmd;
use logs::run as run_logs_cmd;
Expand All @@ -26,6 +25,7 @@ use std::{
thread::sleep,
time::Duration,
};
use tokio;

#[derive(Parser)]
#[command(name = "agama", version, about, long_about = None)]
Expand All @@ -40,7 +40,9 @@ struct Cli {

async fn probe() -> anyhow::Result<()> {
let another_manager = build_manager().await?;
let probe = tokio::spawn(async move { let _ = another_manager.probe().await; });
let probe = tokio::spawn(async move {
let _ = another_manager.probe().await;
});
show_progress().await?;

Ok(probe.await?)
Expand Down
2 changes: 1 addition & 1 deletion rust/agama-dbus-server/tests/common/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::{
error::Error,
future::Future,
process::{Child, Command},
time::Duration
time::Duration,
};
use tokio;
use tokio_stream::StreamExt;
Expand Down
4 changes: 2 additions & 2 deletions rust/agama-lib/src/progress.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

use crate::error::ServiceError;
use crate::proxies::ProgressProxy;
use tokio_stream::{StreamMap, StreamExt};
use tokio_stream::{StreamExt, StreamMap};
use zbus::Connection;

/// Represents the progress for an Agama service.
Expand Down Expand Up @@ -147,7 +147,7 @@ impl<'a> ProgressMonitor<'a> {
///
/// It listens for changes in the `Current` property and generates a stream identifying the
/// proxy where the change comes from.
async fn build_stream(&self) -> StreamMap<&str, zbus::PropertyStream<'_, (u32, String)>>{
async fn build_stream(&self) -> StreamMap<&str, zbus::PropertyStream<'_, (u32, String)>> {
// let mut streams = SelectAll::new();
let mut streams = StreamMap::new();

Expand Down

0 comments on commit 7dd00b2

Please sign in to comment.