fix some clippy lints

This commit is contained in:
Damien Elmes 2020-05-02 08:55:27 +10:00
parent 6046bbc779
commit d7cdb10aa8
2 changed files with 4 additions and 5 deletions

View file

@ -1,4 +1,3 @@
use prost_build;
use std::fs; use std::fs;
use std::path::Path; use std::path::Path;
@ -97,7 +96,7 @@ fn main() -> std::io::Result<()> {
let mut buf = String::new(); let mut buf = String::new();
let mut ftl_template_dirs = vec!["./ftl".to_string()]; let mut ftl_template_dirs = vec!["./ftl".to_string()];
if let Ok(paths) = std::env::var("FTL_TEMPLATE_DIRS") { if let Ok(paths) = std::env::var("FTL_TEMPLATE_DIRS") {
ftl_template_dirs.extend(paths.split(",").map(|s| s.to_string())); ftl_template_dirs.extend(paths.split(',').map(|s| s.to_string()));
} }
for ftl_dir in ftl_template_dirs { for ftl_dir in ftl_template_dirs {
let ftl_dir = Path::new(&ftl_dir); let ftl_dir = Path::new(&ftl_dir);
@ -132,7 +131,7 @@ fn main() -> std::io::Result<()> {
// write the other language ftl files // write the other language ftl files
let mut ftl_lang_dirs = vec!["./ftl/repo/core".to_string()]; let mut ftl_lang_dirs = vec!["./ftl/repo/core".to_string()];
if let Ok(paths) = std::env::var("FTL_LOCALE_DIRS") { if let Ok(paths) = std::env::var("FTL_LOCALE_DIRS") {
ftl_lang_dirs.extend(paths.split(",").map(|s| s.to_string())); ftl_lang_dirs.extend(paths.split(',').map(|s| s.to_string()));
} }
let mut langs = HashMap::new(); let mut langs = HashMap::new();
for ftl_dir in ftl_lang_dirs { for ftl_dir in ftl_lang_dirs {
@ -152,7 +151,7 @@ fn main() -> std::io::Result<()> {
} }
langs langs
.entry(lang_name) .entry(lang_name)
.or_insert_with(|| String::new()) .or_insert_with(String::new)
.push_str(&buf) .push_str(&buf)
} }
} }

View file

@ -64,7 +64,7 @@ impl Backend {
Ok(cont) => cont, Ok(cont) => cont,
Err(e) => { Err(e) => {
println!("callback did not return bool: {:?}", e); println!("callback did not return bool: {:?}", e);
return false; false
} }
} }
}; };