From 608f6a18df79537a3d0dd6cb1e462ac4c3d44876 Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Sun, 25 Sep 2022 19:03:10 +0900 Subject: [PATCH] cargo fmt --- src/main.rs | 21 ++++++++++++++------- src/options/update.rs | 15 +++++++-------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/main.rs b/src/main.rs index 6a6539c3..59d731e4 100644 --- a/src/main.rs +++ b/src/main.rs @@ -119,17 +119,25 @@ impl App { if configs::CONFIG.read().unwrap().args.update_rules { // エラーが出た場合はインターネット接続がそもそもできないなどの問題点もあるためエラー等の出力は行わない - let latest_version_data = if let Ok(data) = Update::get_latest_hayabusa_version(){ + let latest_version_data = if let Ok(data) = Update::get_latest_hayabusa_version() { data } else { None }; let now_version = configs::CONFIG.read().unwrap().app.get_version().unwrap(); - if latest_version_data.is_some() && now_version != latest_version_data.as_ref().unwrap_or(&now_version.to_string()) { + if latest_version_data.is_some() + && now_version + != latest_version_data + .as_ref() + .unwrap_or(&now_version.to_string()) + { write_color_buffer( &BufferWriter::stdout(ColorChoice::Always), None, - &format!("There is a new version of Hayabusa: {}", latest_version_data.unwrap()), + &format!( + "There is a new version of Hayabusa: {}", + latest_version_data.unwrap() + ), true, ) .ok(); @@ -141,10 +149,9 @@ impl App { ) .ok(); } - - match Update::update_rules( - configs::CONFIG.read().unwrap().args.rules.to_str().unwrap(), - ) { + + match Update::update_rules(configs::CONFIG.read().unwrap().args.rules.to_str().unwrap()) + { Ok(output) => { if output != "You currently have the latest rules." { write_color_buffer( diff --git a/src/options/update.rs b/src/options/update.rs index ebaf2b6b..61d19180 100644 --- a/src/options/update.rs +++ b/src/options/update.rs @@ -19,10 +19,12 @@ use termcolor::{BufferWriter, ColorChoice}; pub struct Update {} impl Update { - /// get latest hayabusa version number. pub fn get_latest_hayabusa_version() -> Result, Box> { - let res = reqwest::blocking::get("https://api.github.com/repos/Yamato-Security/hayabusa/releases/latest")?.json::>()?; + let res = reqwest::blocking::get( + "https://api.github.com/repos/Yamato-Security/hayabusa/releases/latest", + )? + .json::>()?; if let Some(o) = res.get("tag_name") { Ok(Some(o.to_owned())) } else { @@ -95,12 +97,9 @@ impl Update { } } if result.is_ok() { - let updated_modified_rules = - Update::get_updated_rules(rule_path, &prev_modified_time); - result = Update::print_diff_modified_rule_dates( - prev_modified_rules, - updated_modified_rules, - ); + let updated_modified_rules = Update::get_updated_rules(rule_path, &prev_modified_time); + result = + Update::print_diff_modified_rule_dates(prev_modified_rules, updated_modified_rules); } result }