From de6deb3a06fed74d464ed96be8e65e5c569be938 Mon Sep 17 00:00:00 2001
From: Pavel Perestoronin <eigenein@gmail.com>
Date: Wed, 7 Dec 2022 15:21:21 +0100
Subject: [PATCH] Break: extract the re-imports to `prelude`

---
 README.md                        | 3 +--
 src/lib.rs                       | 7 ++-----
 src/models/battle_results_dat.rs | 3 ++-
 src/prelude.rs                   | 4 ++++
 tests/battle_results.rs          | 5 ++---
 5 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 src/prelude.rs

diff --git a/README.md b/README.md
index d3950c6..6e8480a 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,7 @@ World of Tanks Blitz replay parser in Rust.
 use std::fs::File;
 
 use anyhow::Result;
-use wotbreplay_parser::Replay;
-use wotbreplay_parser::models::TeamNumber;
+use wotbreplay_parser::prelude::*;
 
 fn main() -> Result<()> {
     let battle_results = Replay::open(File::open("tests/replays/battle_results.wotbreplay")?)?
diff --git a/src/lib.rs b/src/lib.rs
index d7db746..392c6c2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,14 +11,11 @@
 )]
 
 mod error;
-pub mod models;
+mod models;
+pub mod prelude;
 mod replay;
 mod result;
 
-pub use crate::error::Error;
-pub use crate::replay::Replay;
-pub use crate::result::Result;
-
 #[cfg(doctest)]
 mod test_readme {
     macro_rules! external_doc_test {
diff --git a/src/models/battle_results_dat.rs b/src/models/battle_results_dat.rs
index 8733756..f48181a 100644
--- a/src/models/battle_results_dat.rs
+++ b/src/models/battle_results_dat.rs
@@ -4,8 +4,9 @@ use prost::Message;
 use serde::Deserialize;
 use serde_bytes::ByteBuf;
 
+use crate::error::Error;
 use crate::models::BattleResults;
-use crate::{Error, Result};
+use crate::result::Result;
 
 /// Represents un-pickled `battle_results.dat`.
 #[derive(Debug, Deserialize)]
diff --git a/src/prelude.rs b/src/prelude.rs
new file mode 100644
index 0000000..d6df9f8
--- /dev/null
+++ b/src/prelude.rs
@@ -0,0 +1,4 @@
+pub use crate::error::Error;
+pub use crate::models::*;
+pub use crate::replay::Replay;
+pub use crate::result::Result;
diff --git a/tests/battle_results.rs b/tests/battle_results.rs
index 62d00b4..6d51c4e 100644
--- a/tests/battle_results.rs
+++ b/tests/battle_results.rs
@@ -1,8 +1,7 @@
 use std::fs::File;
 
 use anyhow::Result;
-use wotbreplay_parser::models::TeamNumber;
-use wotbreplay_parser::Replay;
+use wotbreplay_parser::prelude::*;
 
 #[test]
 fn player_results_ok() -> Result<()> {
@@ -114,7 +113,7 @@ fn author_results_ok() -> Result<()> {
     assert_eq!(battle_results.author.credits_earned, 53623);
     assert_eq!(battle_results.author.combat_xp, 2370);
     assert_eq!(battle_results.author.damage_dealt, 1738);
-    assert_eq!(battle_results.author.account_id, 594778041);
+    assert_eq!(battle_results.author.account_id, AccountId(594778041));
     assert_eq!(battle_results.free_xp, 116);
 
     Ok(())