From e48ea84fbdc27adb27a9cf4b1ee603c269e3321a Mon Sep 17 00:00:00 2001
From: Max Bradbury <max@tinybird.info>
Date: Fri, 25 Sep 2020 17:02:50 +0100
Subject: [PATCH] use new error formatting

---
 Cargo.toml  | 2 +-
 src/main.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7189bb0..ca153c1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bitsy-parser = "^0.72.0"
+bitsy-parser = "^0.72.1"
 gio = "^0"
 gtk = "^0"
diff --git a/src/main.rs b/src/main.rs
index 74cbf5d..96785f2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -58,7 +58,7 @@ fn parse_or_error(game_data: String, label: &str) -> Result<Game, ()> {
         Ok(main.unwrap())
     } else {
         error_popup(&format!(
-            "Couldn't parse {} game data: {:?}",
+            "Couldn't parse {} game data.\n\n{}",
             label,
             main.unwrap_err()));
         Err(())
@@ -101,7 +101,7 @@ fn build_ui(application: &gtk::Application) {
         if main.is_ok() && additional.is_ok() {
             let mut main = main.unwrap();
             let additional = additional.unwrap();
-            main.merge(additional);
+            main.merge(&additional);
 
             buffer_output.set_text(&main.to_string());
         }