Skip to content

Commit

Permalink
Merge pull request #235 from mobusoperandi/clippy
Browse files Browse the repository at this point in the history
style: clippy
  • Loading branch information
mightyiam authored Oct 10, 2023
2 parents 889ab06 + a2129f3 commit 5ad6282
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions ssg-parent/src/dev.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ where
reactive::driver::child_process_killer::ChildProcessKillerDriver::new();
let (open_browser_driver, browser_opened) =
reactive::driver::open_that::StaticOpenThatDriver::new(url.to_string());
let (eprintln_driver, _) = reactive::driver::println::EprintlnDriver::new();
let (eprintln_driver, ()) = reactive::driver::println::EprintlnDriver::new();
let (notify_driver, notify) =
match reactive::driver::notify::FsChangeDriver::new(BUILDER_CRATE_NAME) {
Ok(val) => val,
Expand Down Expand Up @@ -90,11 +90,11 @@ where

futures::select! {
error = error.fuse() => error,
_ = builder_driver_task.fuse() => unreachable!(),
_ = child_process_killer_driver_task.fuse() => unreachable!(),
_ = stderr_driver_task.fuse() => unreachable!(),
_ = open_browser_driver_task.fuse() => unreachable!(),
_ = stream_splitter_task.fuse() => unreachable!(),
_ = notify_driver_task.fuse() => unreachable!(),
() = builder_driver_task.fuse() => unreachable!(),
() = child_process_killer_driver_task.fuse() => unreachable!(),
() = stderr_driver_task.fuse() => unreachable!(),
() = open_browser_driver_task.fuse() => unreachable!(),
() = stream_splitter_task.fuse() => unreachable!(),
() = notify_driver_task.fuse() => unreachable!(),
}
}
4 changes: 2 additions & 2 deletions ssg-parent/src/dev/app/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ impl super::App {
#[allow(clippy::unnecessary_wraps)]
fn builder_killed(&mut self, result: std::io::Result<()>) -> Option<super::OutputEvent> {
match result {
Ok(_) => match self.builder {
Ok(()) => match self.builder {
BuilderState::AwaitingKillResult => {
self.builder = BuilderState::AwaitingChild;
Some(super::OutputEvent::RunBuilder)
Expand Down Expand Up @@ -80,7 +80,7 @@ impl super::App {

fn browser_opened(result: Result<(), std::io::Error>) -> Option<super::OutputEvent> {
match result {
Ok(_) => None,
Ok(()) => None,
Err(error) => Some(super::OutputEvent::Error(super::super::DevError::Io(error))),
}
}
Expand Down

0 comments on commit 5ad6282

Please sign in to comment.