nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 00:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Account for possibly empty license_template_path

Browse Source 
Don't attempt to load license_template if the path wasn't specified.
This commit is contained in:
David Lukes 2018-02-26 12:31:09 +01:00
parent ead81205cc
commit e48d7f3ebb
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/config/config_type.rs
View File

@ -392,35 +392,37 @@ macro_rules! create_config {
}
fn set_license_template(&mut self) {
let license_template_path = self.license_template_path();
let mut license_template_file = match File::open(&license_template_path) {
Ok(file) => file,
Err(e) => {
eprintln!("Warning: unable to open license template file {:?}: {}",
license_template_path, e);
return;
}
};
let mut license_template_str = String::new();
if let Err(e) = license_template_file.read_to_string(&mut license_template_str) {
eprintln!("Warning: unable to read from license template file {:?}: {}",
license_template_path, e);
return;
};
let license_template_parsed = match parse_license_template(&license_template_str) {
Ok(string) => string,
Err(e) => {
eprintln!("Warning: unable to parse license template file {:?}: {}",
license_template_path, e);
return;
}
};
self.license_template = match Regex::new(&license_template_parsed) {
Ok(re) => Some(re),
Err(e) => {
eprintln!("Warning: regex syntax error in placeholder, unable to compile \
license template from file {:?}: {}", license_template_path, e);
if self.was_set().license_template_path() {
let license_template_path = self.license_template_path();
let mut license_template_file = match File::open(&license_template_path) {
Ok(file) => file,
Err(e) => {
eprintln!("Warning: unable to open license template file {:?}: {}",
license_template_path, e);
return;
}
};
let mut license_template_str = String::new();
if let Err(e) = license_template_file.read_to_string(&mut license_template_str) {
eprintln!("Warning: unable to read from license template file {:?}: {}",
license_template_path, e);
return;
};
let license_template_parsed = match parse_license_template(&license_template_str) {
Ok(string) => string,
Err(e) => {
eprintln!("Warning: unable to parse license template file {:?}: {}",
license_template_path, e);
return;
}
};
self.license_template = match Regex::new(&license_template_parsed) {
Ok(re) => Some(re),
Err(e) => {
eprintln!("Warning: regex syntax error in placeholder, unable to compile \
license template from file {:?}: {}", license_template_path, e);
return;
}
}
}
}