From 30f65b62e84fcd9975643716d61fa21bc8495291 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Mon, 8 Apr 2019 16:25:54 +0200
Subject: Import model structs to main models module.

---
 src/controllers/film.rs      | 4 ++--
 src/controllers/room.rs      | 4 ++--
 src/controllers/screening.rs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/controllers')

diff --git a/src/controllers/film.rs b/src/controllers/film.rs
index e61a543..827b3ab 100644
--- a/src/controllers/film.rs
+++ b/src/controllers/film.rs
@@ -18,7 +18,7 @@
 
 use crate::{
     db,
-    models::film,
+    models,
 };
 
 use rocket::get;
@@ -27,6 +27,6 @@ use rocket_contrib::{
 };
 
 #[get("/")]
-pub fn get_films(db: db::Connection) -> Json<Vec<film::Film>> {
+pub fn get_films(db: db::Connection) -> Json<Vec<models::Film>> {
     Json(db.get_films().unwrap())
 }
diff --git a/src/controllers/room.rs b/src/controllers/room.rs
index a203454..419afae 100644
--- a/src/controllers/room.rs
+++ b/src/controllers/room.rs
@@ -18,7 +18,7 @@
 
 use crate::{
     db,
-    models::room,
+    models,
 };
 
 use rocket::get;
@@ -27,6 +27,6 @@ use rocket_contrib::{
 };
 
 #[get("/")]
-pub fn get_rooms(db: db::Connection) -> Json<Vec<room::Room>> {
+pub fn get_rooms(db: db::Connection) -> Json<Vec<models::Room>> {
     Json(db.get_rooms().unwrap())
 }
diff --git a/src/controllers/screening.rs b/src/controllers/screening.rs
index 622e9cb..29b6afa 100644
--- a/src/controllers/screening.rs
+++ b/src/controllers/screening.rs
@@ -18,7 +18,7 @@
 
 use crate::{
     db,
-    models::{screening::Screening, film::Film, room::Room},
+    models::{Film, Room, Screening},
 };
 
 use rocket::get;
-- 
cgit v1.2.3