rust-scripts/rust-script-tool
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

style: fix clippy

Browse Source
This commit is contained in:
Hatter Jiang
2020-08-01 16:34:48 +08:00
parent 08aa838c80
commit 71ae5e2eb2
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.rs
View File

@@ -23,17 +23,22 @@ use cmd_new::CommandNew;
($($arg:tt)+) => ( crate::print_wa(&format!($($arg)+)); ) ($($arg:tt)+) => ( crate::print_wa(&format!($($arg)+)); )
} }
const GREEN: &str = "\x1B[92m";
const YELLOW: &str = "\x1B[93m";
const BOLD: &str = "\x1B[1m";
const END: &str = "\x1B[0m";
#[inline] #[inline]
fn print_in (msg: &str) { fn print_in (msg: &str) {
println!("{b}[INFO]{e} {m}", b = "\x1B[1m", e = "\x1B[0m", m = msg); println!("{b}[INFO]{e} {m}", b = BOLD, e = END, m = msg);
} }
#[inline] #[inline]
fn print_ok (msg: &str) { fn print_ok (msg: &str) {
println!("{g}{b}[ OK ]{e} {g}{m}{e}", g = "\x1B[92m", b = "\x1B[1m", e = "\x1B[0m", m = msg); println!("{g}{b}[ OK ]{e} {g}{m}{e}", g = GREEN, b = BOLD, e = END, m = msg);
} }
#[inline] #[inline]
fn print_wa (msg: &str) { fn print_wa (msg: &str) {
println!("{g}{b}[WARN]{e} {g}{m}{e}", g = "\x1B[93m", b = "\x1B[1m", e = "\x1B[0m", m = msg); println!("{g}{b}[WARN]{e} {g}{m}{e}", g = YELLOW, b = BOLD, e = END, m = msg);
} }
fn main() -> CommandError { fn main() -> CommandError {

7
src/script.rs
View File

@@ -25,11 +25,10 @@ pub struct ScriptLocalConfig {
pub fn _get_script_base_path(base: &PathBuf, file_name: &str) -> PathBuf { pub fn _get_script_base_path(base: &PathBuf, file_name: &str) -> PathBuf {
let mut fn_chars = file_name.chars().take_while(|c| *c != '.'); let mut fn_chars = file_name.chars().take_while(|c| *c != '.');
let path = base.join(fn_chars.next().unwrap_or('_').to_string()) base.join(fn_chars.next().unwrap_or('_').to_string())
.join(fn_chars.next().unwrap_or('_').to_string()) .join(fn_chars.next().unwrap_or('_').to_string())
.join(fn_chars.next().unwrap_or('_').to_string()) .join(fn_chars.next().unwrap_or('_').to_string())
.join(file_name); .join(file_name)
path
} }
pub fn _list_versions(script_base_path: &PathBuf) -> Vec<(PathBuf, String)> { pub fn _list_versions(script_base_path: &PathBuf) -> Vec<(PathBuf, String)> {
@@ -43,7 +42,7 @@ pub fn _list_versions(script_base_path: &PathBuf) -> Vec<(PathBuf, String)> {
trace!("Found dir: {:?}", path); trace!("Found dir: {:?}", path);
match path.file_name().to_str() { match path.file_name().to_str() {
None => error!("Get path file name: {:?}, is none", path), None => error!("Get path file name: {:?}, is none", path),
Some(file_name) => if file_name.starts_with("v") { Some(file_name) => if file_name.starts_with('v') {
let ver = get_dir_ver(&file_name); let ver = get_dir_ver(&file_name);
ret.push((path.path(), ver)); ret.push((path.path(), ver));
}, },