cargo fmt
This commit is contained in:
16
src/main.rs
16
src/main.rs
@@ -158,15 +158,7 @@ impl App {
|
|||||||
configs::CONFIG.write().unwrap().args.config = CURRENT_EXE_PATH.join("rules/config");
|
configs::CONFIG.write().unwrap().args.config = CURRENT_EXE_PATH.join("rules/config");
|
||||||
}
|
}
|
||||||
// ワーキングディレクトリ以外からの実行の際にrules-configオプションの指定がないとエラーが発生することを防ぐための処理
|
// ワーキングディレクトリ以外からの実行の際にrules-configオプションの指定がないとエラーが発生することを防ぐための処理
|
||||||
if configs::CONFIG
|
if configs::CONFIG.read().unwrap().args.rules.to_str().unwrap() == "./rules" {
|
||||||
.read()
|
|
||||||
.unwrap()
|
|
||||||
.args
|
|
||||||
.rules
|
|
||||||
.to_str()
|
|
||||||
.unwrap()
|
|
||||||
== "./rules"
|
|
||||||
{
|
|
||||||
configs::CONFIG.write().unwrap().args.rules = CURRENT_EXE_PATH.join("rules");
|
configs::CONFIG.write().unwrap().args.rules = CURRENT_EXE_PATH.join("rules");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -744,7 +736,8 @@ impl App {
|
|||||||
// case of exist hayabusa-rules repository
|
// case of exist hayabusa-rules repository
|
||||||
self._repo_main_reset_hard(hayabusa_rule_repo.as_ref().unwrap())?;
|
self._repo_main_reset_hard(hayabusa_rule_repo.as_ref().unwrap())?;
|
||||||
// case of failed fetching origin/main, git clone is not executed so network error has occurred possibly.
|
// case of failed fetching origin/main, git clone is not executed so network error has occurred possibly.
|
||||||
prev_modified_rules = self.get_updated_rules(&rules_path.to_str().unwrap(), &prev_modified_time);
|
prev_modified_rules =
|
||||||
|
self.get_updated_rules(&rules_path.to_str().unwrap(), &prev_modified_time);
|
||||||
prev_modified_time = fs::metadata(&rules_path).unwrap().modified().unwrap();
|
prev_modified_time = fs::metadata(&rules_path).unwrap().modified().unwrap();
|
||||||
result = self.pull_repository(&hayabusa_rule_repo.unwrap());
|
result = self.pull_repository(&hayabusa_rule_repo.unwrap());
|
||||||
} else {
|
} else {
|
||||||
@@ -775,7 +768,8 @@ impl App {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if result.is_ok() {
|
if result.is_ok() {
|
||||||
let updated_modified_rules = self.get_updated_rules(&rules_path.to_str().unwrap(), &prev_modified_time);
|
let updated_modified_rules =
|
||||||
|
self.get_updated_rules(&rules_path.to_str().unwrap(), &prev_modified_time);
|
||||||
result =
|
result =
|
||||||
self.print_diff_modified_rule_dates(prev_modified_rules, updated_modified_rules);
|
self.print_diff_modified_rule_dates(prev_modified_rules, updated_modified_rules);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user