max
/
mixsy-gtk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use new error formatting

This commit is contained in:
Max Bradbury 2020-09-25 17:02:50 +01:00
parent d340bd1044
commit e48ea84fbd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -7,6 +7,6 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
bitsy-parser = "^0.72.0" bitsy-parser = "^0.72.1"
gio = "^0" gio = "^0"
gtk = "^0" gtk = "^0"

4
src/main.rs
View File

@ -58,7 +58,7 @@ fn parse_or_error(game_data: String, label: &str) -> Result<Game, ()> {
Ok(main.unwrap()) Ok(main.unwrap())
} else { } else {
error_popup(&format!( error_popup(&format!(
"Couldn't parse {} game data: {:?}", "Couldn't parse {} game data.\n\n{}",
label, label,
main.unwrap_err())); main.unwrap_err()));
Err(()) Err(())
@ -101,7 +101,7 @@ fn build_ui(application: &gtk::Application) {
if main.is_ok() && additional.is_ok() { if main.is_ok() && additional.is_ok() {
let mut main = main.unwrap(); let mut main = main.unwrap();
let additional = additional.unwrap(); let additional = additional.unwrap();
main.merge(additional); main.merge(&additional);
buffer_output.set_text(&main.to_string()); buffer_output.set_text(&main.to_string());
} }