diff options
| -rw-r--r-- | build.rs | 2 | ||||
| -rw-r--r-- | src/config.rs | 106 | ||||
| -rw-r--r-- | src/formatter/string_formatter.rs | 4 | ||||
| -rw-r--r-- | src/logger.rs | 4 | ||||
| -rw-r--r-- | src/module.rs | 2 | ||||
| -rw-r--r-- | src/modules/package.rs | 14 | ||||
| -rw-r--r-- | src/modules/time.rs | 2 |
7 files changed, 66 insertions, 68 deletions
@@ -22,7 +22,7 @@ fn gen_presets_hook(mut file: &File) -> SdResult<()> { println!("cargo:rerun-if-changed=docs/.vuepress/public/presets/toml"); let paths = fs::read_dir("docs/.vuepress/public/presets/toml")?; let mut sortedpaths = paths.collect::<io::Result<Vec<_>>>()?; - sortedpaths.sort_by_key(|e| e.path()); + sortedpaths.sort_by_key(std::fs::DirEntry::path); let mut presets = String::new(); let mut match_arms = String::new(); diff --git a/src/config.rs b/src/config.rs index f778cf310..9ff37f1d8 100644 --- a/src/config.rs +++ b/src/config.rs @@ -287,64 +287,62 @@ pub fn parse_style_string( ) -> Option<nu_ansi_term::Style> { style_string .split_whitespace() - .fold(Some(nu_ansi_term::Style::new()), |maybe_style, token| { - maybe_style.and_then(|style| { - let token = token.to_lowercase(); - - // Check for FG/BG identifiers and strip them off if appropriate - // If col_fg is true, color the foreground. If it's false, color the background. - let (token, col_fg) = if token.as_str().starts_with("fg:") { - (token.trim_start_matches("fg:").to_owned(), true) - } else if token.as_str().starts_with("bg:") { - (token.trim_start_matches("bg:").to_owned(), false) - } else { - (token, true) // Bare colors are assumed to color the foreground - }; - - match token.as_str() { - "underline" => Some(style.underline()), - "bold" => Some(style.bold()), - "italic" => Some(style.italic()), - "dimmed" => Some(style.dimmed()), - "inverted" => Some(style.reverse()), - "blink" => Some(style.blink()), - "hidden" => Some(style.hidden()), - "strikethrough" => Some(style.strikethrough()), - // When the string is supposed to be a color: - // Decide if we yield none, reset background or set color. - color_string => { - if color_string == "none" && col_fg { - None // fg:none yields no style. + .try_fold(nu_ansi_term::Style::new(), |style, token| { + let token = token.to_lowercase(); + + // Check for FG/BG identifiers and strip them off if appropriate + // If col_fg is true, color the foreground. If it's false, color the background. + let (token, col_fg) = if token.as_str().starts_with("fg:") { + (token.trim_start_matches("fg:").to_owned(), true) + } else if token.as_str().starts_with("bg:") { + (token.trim_start_matches("bg:").to_owned(), false) + } else { + (token, true) // Bare colors are assumed to color the foreground + }; + + match token.as_str() { + "underline" => Some(style.underline()), + "bold" => Some(style.bold()), + "italic" => Some(style.italic()), + "dimmed" => Some(style.dimmed()), + "inverted" => Some(style.reverse()), + "blink" => Some(style.blink()), + "hidden" => Some(style.hidden()), + "strikethrough" => Some(style.strikethrough()), + // When the string is supposed to be a color: + // Decide if we yield none, reset background or set color. + color_string => { + if color_string == "none" && col_fg { + None // fg:none yields no style. + } else { + // Either bg or valid color or both. + let parsed = parse_color_string( + color_string, + context.and_then(|x| { + get_palette( + &x.root_config.palettes, + x.root_config.palette.as_deref(), + ) + }), + ); + // bg + invalid color = reset the background to default. + if !col_fg && parsed.is_none() { + let mut new_style = style; + new_style.background = Option::None; + Some(new_style) } else { - // Either bg or valid color or both. - let parsed = parse_color_string( - color_string, - context.and_then(|x| { - get_palette( - &x.root_config.palettes, - x.root_config.palette.as_deref(), - ) - }), - ); - // bg + invalid color = reset the background to default. - if !col_fg && parsed.is_none() { - let mut new_style = style; - new_style.background = Option::None; - Some(new_style) - } else { - // Valid color, apply color to either bg or fg - parsed.map(|ansi_color| { - if col_fg { - style.fg(ansi_color) - } else { - style.on(ansi_color) - } - }) - } + // Valid color, apply color to either bg or fg + parsed.map(|ansi_color| { + if col_fg { + style.fg(ansi_color) + } else { + style.on(ansi_color) + } + }) } } } - }) + } }) } diff --git a/src/formatter/string_formatter.rs b/src/formatter/string_formatter.rs index 249048949..3339fae6a 100644 --- a/src/formatter/string_formatter.rs +++ b/src/formatter/string_formatter.rs @@ -546,12 +546,12 @@ mod tests { #[test] fn test_escaped_chars() { - const FORMAT_STR: &str = r#"\\\[\$text\]\(red bold\)"#; + const FORMAT_STR: &str = r"\\\[\$text\]\(red bold\)"; let formatter = StringFormatter::new(FORMAT_STR).unwrap().map(empty_mapper); let result = formatter.parse(None, None).unwrap(); let mut result_iter = result.iter(); - match_next!(result_iter, r#"\[$text](red bold)"#, None); + match_next!(result_iter, r"\[$text](red bold)", None); } #[test] diff --git a/src/logger.rs b/src/logger.rs index 9ab75cb11..e8c60ffa6 100644 --- a/src/logger.rs +++ b/src/logger.rs @@ -37,12 +37,12 @@ pub fn cleanup_log_files<P: AsRef<Path>>(path: P) { let log_dir = path.as_ref(); let Ok(log_files) = fs::read_dir(log_dir) else { // Avoid noisily handling errors in this cleanup function. - return + return; }; for file in log_files { // Skip files that can't be read. - let Ok (file) = file else { + let Ok(file) = file else { continue; }; diff --git a/src/module.rs b/src/module.rs index b2434a259..401b8e59f 100644 --- a/src/module.rs +++ b/src/module.rs @@ -231,7 +231,7 @@ where strs.into_iter() .chain(std::iter::once(fill.ansi_string(fill_size))) }) - .chain(current.into_iter()) + .chain(current) .collect::<Vec<AnsiString>>() } } diff --git a/src/modules/package.rs b/src/modules/package.rs index 8c8480ab6..4c9f20b15 100644 --- a/src/modules/package.rs +++ b/src/modules/package.rs @@ -194,7 +194,7 @@ fn get_meson_version(context: &Context, config: &PackageConfig) -> Option<String .split_ascii_whitespace() .collect::<String>(); - let re = Regex::new(r#"project\([^())]*,version:'(?P<version>[^']+)'[^())]*\)"#).unwrap(); + let re = Regex::new(r"project\([^())]*,version:'(?P<version>[^']+)'[^())]*\)").unwrap(); let caps = re.captures(&file_contents)?; format_version(&caps["version"], config.version_format) @@ -487,12 +487,12 @@ mod tests { fn test_extract_nimble_package_version() -> io::Result<()> { let config_name = "test_project.nimble"; - let config_content = r##" + let config_content = r#" version = "0.1.0" author = "Mr. nimble" description = "A new awesome nimble package" license = "MIT" -"##; +"#; let project_dir = create_project_dir()?; fill_config(&project_dir, config_name, Some(config_content))?; @@ -505,7 +505,7 @@ license = "MIT" .cmd( "nimble dump --json", Some(CommandOutput { - stdout: r##" + stdout: r#" { "name": "test_project.nimble", "version": "0.1.0", @@ -524,7 +524,7 @@ license = "MIT" "srcDir": "", "backend": "c" } -"## +"# .to_owned(), stderr: String::new(), }), @@ -547,12 +547,12 @@ license = "MIT" ) -> io::Result<()> { let config_name = "test_project.nimble"; - let config_content = r##" + let config_content = r#" version = "0.1.0" author = "Mr. nimble" description = "A new awesome nimble package" license = "MIT" -"##; +"#; let project_dir = create_project_dir()?; fill_config(&project_dir, config_name, Some(config_content))?; diff --git a/src/modules/time.rs b/src/modules/time.rs index a5e6277ca..fc13dd088 100644 --- a/src/modules/time.rs +++ b/src/modules/time.rs @@ -81,7 +81,7 @@ fn create_offset_time_string( if utc_time_offset_in_hours < 24_f32 && utc_time_offset_in_hours > -24_f32 { let utc_offset_in_seconds: i32 = (utc_time_offset_in_hours * 3600_f32) as i32; let Some(timezone_offset) = FixedOffset::east_opt(utc_offset_in_seconds) else { - return Err("Invalid offset") + return Err("Invalid offset"); }; log::trace!("Target timezone offset is {}", timezone_offset); |