Shuffle web_interface into web::interface

src/lib.rs

@@ -5,7 +5,6 @@
 mod impl_from;
 
 pub mod commands;
-pub mod web_interface;
 
 // This module is only public for the purpose of testing right now, and won't be
 // part of the first version of the Rojo API.

src/web/api.rs

@@ -10,9 +10,11 @@ use rbx_dom_weak::RbxId;
 
 use crate::{
     serve_session::ServeSession,
-    web::util::response_json,
+    web::{
-    web_interface::{
+        interface::{
-        ReadResponse, ServerInfoResponse, SubscribeResponse, PROTOCOL_VERSION, SERVER_VERSION,
+            ReadResponse, ServerInfoResponse, SubscribeResponse, PROTOCOL_VERSION, SERVER_VERSION,
+        },
+        util::response_json,
     },
 };
 

src/web/mod.rs

@@ -1,4 +1,5 @@
 mod api;
+mod interface;
 mod ui;
 mod util;
 

src/web/ui.rs

@@ -6,7 +6,7 @@ use futures::{future, Future};
 use hyper::{header, service::Service, Body, Method, Request, Response, StatusCode};
 use ritz::html;
 
-use crate::{serve_session::ServeSession, web_interface::SERVER_VERSION};
+use crate::{serve_session::ServeSession, web::interface::SERVER_VERSION};
 
 static HOME_CSS: &str = include_str!("../../assets/index.css");