From 182bf972298b6d6b07f4fe086d3b70d8a0fdd42f Mon Sep 17 00:00:00 2001 From: cht <3237126351@qq.com> Date: Sat, 4 Dec 2021 08:48:35 +0800 Subject: [PATCH] cargo fmt --- src/utils.rs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/utils.rs b/src/utils.rs index 1f4698a..c5508c4 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -3,13 +3,11 @@ use serde_json::Value; use std::{ env, fs::{self, File}, - io::prelude::*, - io::Error, + io::{prelude::*, Result}, path::Path, - result::Result, }; #[allow(dead_code)] -pub enum Save{ +pub enum Save { Storage, Running, V2ray, @@ -18,12 +16,12 @@ fn create_storage_before() { let home = env::var("HOME").unwrap(); fs::create_dir_all(home + "/.config/tv2ray").unwrap(); } -pub fn create_json_file(save:Save,input: String) -> Result<(), Error> { +pub fn create_json_file(save: Save, input: String) -> Result<()> { let home = env::var("HOME").unwrap(); let location = match save { Save::Storage => format!("{}/.config/tv2ray/storage.json", home), - Save::Running => format!("{}/.config/tv2ray/running.json",home), - Save::V2ray => format!("{}/.config/tv2ray/v2core.json",home), + Save::Running => format!("{}/.config/tv2ray/running.json", home), + Save::V2ray => format!("{}/.config/tv2ray/v2core.json", home), }; let path = Path::new(location.as_str()); let mut file = File::create(&path)?; @@ -31,7 +29,7 @@ pub fn create_json_file(save:Save,input: String) -> Result<(), Error> { file.write_all(input.as_bytes())?; Ok(()) } -fn get_json() -> Result { +fn get_json() -> Result { let home = env::var("HOME").unwrap(); let location = format!("{}/.config/tv2ray/storage.json", home); let mut file = File::open(location)?; @@ -44,7 +42,7 @@ pub fn start() -> Vec { let messages = match get_json() { Ok(output) => output, Err(_) => { - if let Err(err) = create_json_file(Save::Storage,"[]".to_string()) { + if let Err(err) = create_json_file(Save::Storage, "[]".to_string()) { panic!("{}", err); }; "[]".to_string()