Merge pull request #502 from http-rs/move-files-around

Change file structure to match external exports

Author: yoshuawuyts

src/fs/mod.rs

@@ -0,0 +1,3 @@
+mod serve_dir;
+
+pub(crate) use serve_dir::ServeDir;

src/server/serve_dir.rs renamed to src/fs/serve_dir.rs

@@ -187,9 +187,11 @@
 
 mod cookies;
 mod endpoint;
+mod fs;
 mod middleware;
 mod request;
 mod response;
+mod route;
 mod router;
 mod server;
 mod utils;
@@ -198,23 +200,17 @@ pub mod log;
 pub mod prelude;
 pub mod redirect;
 pub mod security;
-
-pub use endpoint::Endpoint;
-pub use request::Request;
 pub mod sse;
 
-#[doc(inline)]
-pub use http_types::{Body, Error, Status, StatusCode};
-
-#[doc(inline)]
+pub use endpoint::Endpoint;
 pub use middleware::{Middleware, Next};
-#[doc(inline)]
+pub use request::Request;
 pub use response::Response;
-#[doc(inline)]
-pub use server::{Route, Server};
+pub use route::Route;
+pub use server::Server;
 
 #[doc(inline)]
-pub use http_types as http;
+pub use http_types::{self as http, Body, Error, Status, StatusCode};
 
 /// Create a new Tide server.
 ///

src/lib.rs

@@ -3,8 +3,8 @@ use std::io;
 use std::path::Path;
 use std::sync::Arc;
 
-use super::serve_dir::ServeDir;
 use crate::endpoint::MiddlewareEndpoint;
+use crate::fs::ServeDir;
 use crate::log;
 use crate::utils::BoxFuture;
 use crate::{router::Router, Endpoint, Middleware};

src/server/route.rs renamed to src/route.rs

@@ -15,12 +15,7 @@ use crate::log;
 use crate::middleware::{Middleware, Next};
 use crate::router::{Router, Selection};
 use crate::utils::BoxFuture;
-use crate::{Endpoint, Request};
-
-mod route;
-mod serve_dir;
-
-pub use route::Route;
+use crate::{Endpoint, Request, Route};
 
 /// An HTTP server.
 ///