From 4a05021bdd4441c130c4f6a121b2ccadc70c8ebe Mon Sep 17 00:00:00 2001 From: Max Bradbury Date: Fri, 6 Nov 2020 16:04:38 +0000 Subject: [PATCH] fix broken binaries --- src/bin/bitsy-dedupe.rs | 2 +- src/bin/bitsy-merge.rs | 4 ++-- src/bin/bitsy-parse.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/bitsy-dedupe.rs b/src/bin/bitsy-dedupe.rs index 606b986..a65bbf1 100644 --- a/src/bin/bitsy-dedupe.rs +++ b/src/bin/bitsy-dedupe.rs @@ -7,7 +7,7 @@ fn main() { let game = env::args().nth(1).expect(SYNTAX_ERROR); let output = env::args().nth(2).expect(SYNTAX_ERROR); - let mut game = Game::from(fs::read_to_string(game).unwrap()).unwrap(); + let (mut game, _err) = Game::from(fs::read_to_string(game).unwrap()).unwrap(); game.dedupe_tiles(); diff --git a/src/bin/bitsy-merge.rs b/src/bin/bitsy-merge.rs index abda527..2b98693 100644 --- a/src/bin/bitsy-merge.rs +++ b/src/bin/bitsy-merge.rs @@ -9,8 +9,8 @@ fn main() { let output = env::args().nth(3).expect(SYNTAX_ERROR); // todo allow numerous additional games - let mut game_a = Game::from(fs::read_to_string(game_a).unwrap()).unwrap(); - let game_b = Game::from(fs::read_to_string(game_b).unwrap()).unwrap(); + let (mut game_a, _) = Game::from(fs::read_to_string(game_a).unwrap()).unwrap(); + let ( game_b, _) = Game::from(fs::read_to_string(game_b).unwrap()).unwrap(); game_a.merge(&game_b); diff --git a/src/bin/bitsy-parse.rs b/src/bin/bitsy-parse.rs index 5e00aa6..2107727 100644 --- a/src/bin/bitsy-parse.rs +++ b/src/bin/bitsy-parse.rs @@ -8,7 +8,7 @@ fn main() { let input = env::args().nth(1).expect(SYNTAX_ERROR); let output = env::args().nth(2).expect(SYNTAX_ERROR); - let game = Game::from(fs::read_to_string(input).unwrap()).unwrap(); + let (game, _err) = Game::from(fs::read_to_string(input).unwrap()).unwrap(); fs::write(output, game.to_string()).expect("Failed to write output file"); }