titaniumtown/YTBN-Graphing-Software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify text.json loading code

Browse Source
This commit is contained in:
Simon Gardling 2022-04-08 13:13:32 -04:00
parent e453ec8da4
commit 04201de443
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/math_app.rs
View File

@ -108,17 +108,8 @@ lazy_static::lazy_static! {
panic!("Font File {} not expected!", path_string);
}
}
} else if path_string.ends_with(".json") {
// Parse json file
let string_data = str::from_utf8(&data).unwrap().to_string();
match path_string.as_ref() {
"text.json" => {
text_data = Some(SerdeValueHelper::new(&string_data).parse_values());
},
_ => {
panic!("Json file {} not expected!", path_string);
}
}
} else if path_string == "text.json" {
text_data = Some(SerdeValueHelper::new(str::from_utf8(&data).expect("unable to read text.json")).parse_values());
} else {
panic!("Other file {} not expected!", path_string);
}