From de8cd21e9432422264fb4853277256f286fb6fb4 Mon Sep 17 00:00:00 2001
From: Mingwei Samuel <mingwei.samuel@gmail.com>
Date: Sun, 3 Nov 2019 10:48:45 -0800
Subject: [PATCH] move dtos to 'models' module

---
 src/endpoints.rs                             | 5 ++---
 src/lib.rs                                   | 2 ++
 src/{endpoints/dto.rs => models.rs}          | 2 ++
 srcgen/endpoints.rs.dt                       | 5 ++---
 srcgen/{endpoints/dto.rs.dt => models.rs.dt} | 2 ++
 tests/tests_kr.rs.ignored                    | 2 +-
 tests/tests_na.rs                            | 2 +-
 tests/tests_tr.rs                            | 2 +-
 8 files changed, 13 insertions(+), 9 deletions(-)
 rename src/{endpoints/dto.rs => models.rs} (97%)
 rename srcgen/{endpoints/dto.rs.dt => models.rs.dt} (94%)

diff --git a/src/endpoints.rs b/src/endpoints.rs
index 0d15e49..cfc04a6 100644
--- a/src/endpoints.rs
+++ b/src/endpoints.rs
@@ -9,10 +9,9 @@
 // http://www.mingweisamuel.com/riotapi-schema/tool/
 // Version 3bd5ca30e5a7aa15963ca4366e3b6be89defe567
 
-//! Automatically generated endpoint handles and data transfer structs.
+//! Automatically generated endpoint handles.
 
-mod dto;
-pub use dto::*;
+use crate::models::*;
 
 use std::future::Future;
 use std::vec::Vec;
diff --git a/src/lib.rs b/src/lib.rs
index 0d5c5b7..aff8243 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,6 +11,8 @@ pub mod endpoints;
 mod error;
 pub use error::*;
 
+pub mod models;
+
 mod req;
 
 mod riot_api;
diff --git a/src/endpoints/dto.rs b/src/models.rs
similarity index 97%
rename from src/endpoints/dto.rs
rename to src/models.rs
index 7764ed1..1868196 100644
--- a/src/endpoints/dto.rs
+++ b/src/models.rs
@@ -9,6 +9,8 @@
 // http://www.mingweisamuel.com/riotapi-schema/tool/
 // Version 3bd5ca30e5a7aa15963ca4366e3b6be89defe567
 
+//! Automatically generated data transfer structs.
+
 /// ChampionMasteryV4 data objects. This module is automatically generated.
 #[allow(dead_code)]
 pub mod champion_mastery_v4 {
diff --git a/srcgen/endpoints.rs.dt b/srcgen/endpoints.rs.dt
index 95245de..381bdd4 100644
--- a/srcgen/endpoints.rs.dt
+++ b/srcgen/endpoints.rs.dt
@@ -6,10 +6,9 @@
 // http://www.mingweisamuel.com/riotapi-schema/tool/
 // Version {{= spec.info.version }}
 
-//! Automatically generated endpoint handles and data transfer structs.
+//! Automatically generated endpoint handles.
 
-mod dto;
-pub use dto::*;
+use crate::models::*;
 
 use std::future::Future;
 use std::vec::Vec;
diff --git a/srcgen/endpoints/dto.rs.dt b/srcgen/models.rs.dt
similarity index 94%
rename from srcgen/endpoints/dto.rs.dt
rename to srcgen/models.rs.dt
index f2d11b0..cd48248 100644
--- a/srcgen/endpoints/dto.rs.dt
+++ b/srcgen/models.rs.dt
@@ -6,6 +6,8 @@
 // http://www.mingweisamuel.com/riotapi-schema/tool/
 // Version {{= spec.info.version }}
 
+//! Automatically generated data transfer structs.
+
 {{
     let schemas = spec.components.schemas;
     let schemaKeyByEndpoint = Object.keys(schemas)
diff --git a/tests/tests_kr.rs.ignored b/tests/tests_kr.rs.ignored
index c3710bf..628f823 100644
--- a/tests/tests_kr.rs.ignored
+++ b/tests/tests_kr.rs.ignored
@@ -10,7 +10,7 @@ use futures_util::future;
 use colored::*;
 
 use riven::consts::*;
-use riven::endpoints::summoner_v4::Summoner;
+use riven::models::summoner_v4::Summoner;
 
 const REGION: Region = Region::KR;
 
diff --git a/tests/tests_na.rs b/tests/tests_na.rs
index df88255..1f7002a 100644
--- a/tests/tests_na.rs
+++ b/tests/tests_na.rs
@@ -8,7 +8,7 @@ use testutils::*;
 use colored::*;
 
 use riven::consts::*;
-use riven::endpoints::summoner_v4::*;
+use riven::models::summoner_v4::*;
 
 
 fn validate_lugnutsk(s: Summoner, tag: &str) -> Result<(), String> {
diff --git a/tests/tests_tr.rs b/tests/tests_tr.rs
index 4fc04ec..59a4b98 100644
--- a/tests/tests_tr.rs
+++ b/tests/tests_tr.rs
@@ -8,7 +8,7 @@ use testutils::{ RIOT_API, future_start };
 use colored::*;
 
 use riven::consts::*;
-use riven::endpoints::summoner_v4::Summoner;
+use riven::models::summoner_v4::Summoner;
 
 const REGION: Region = Region::TR;