diff options
| author | David Knaack <davidkna@users.noreply.github.com> | 2023-08-25 22:53:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-25 22:53:35 +0200 |
| commit | 77967148b6e5b37e862842a2add183c85bc91e4c (patch) | |
| tree | 3d65d3c5f91e33434abb67b60eaabadea0bb32d5 /src/modules | |
| parent | d3ec97f86f4a3f1dda40d640e35be708e4c8c98c (diff) | |
chore: handle rust 1.72 clippy & fmt changes (#5399)
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/package.rs | 14 | ||||
| -rw-r--r-- | src/modules/time.rs | 2 |
2 files changed, 8 insertions, 8 deletions
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); |