Move request handler module into the server crate

The request handler is used by the http server. Keep the http crate
simple. Only include the http abstractions needed by both the server
and the client.

Author: saulvaldelvira

crates/http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "http-utils"
-version = "0.1.2"
+version = "0.2.0"
 edition = "2021"
 description = "Http utils"
 authors = ["Saúl Valdelvira <saul@saulv.es>"]
@@ -13,10 +13,7 @@ path = "src/lib.rs"
 
 [dependencies]
 base64 = { package = "rb64", version = ">=0.1.0", git = "https://github.com/saulvaldelvira/rb64" }
-mime = { package = "rmime", version = ">=0.1.0", path = "../mime" }
 url = { package = "url-utils", version = ">=0.1.0", path = "../url" }
-html = { package = "rhtml", version = ">=0.1.0", path = "../html" }
-regexpr = { version = ">=0.3.3", git = "https://github.com/saulvaldelvira/regexpr" }
 
 [dependencies.builders]
 package = "builders"

crates/http/src/error.rs

@@ -43,8 +43,6 @@ macro_rules! err {
     };
 }
 
-use regexpr::RegexError;
-
 impl From<io::Error> for HttpError {
     #[inline]
     fn from(value: io::Error) -> Self {
@@ -82,12 +80,6 @@ impl From<Cow<'static, str>> for HttpError {
     }
 }
 
-impl From<RegexError> for HttpError {
-    fn from(value: RegexError) -> Self {
-        Self::new(value.inner().clone())
-    }
-}
-
 impl Debug for HttpError {
     #[inline]
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {

crates/http/src/request/mod.rs

@@ -1,4 +1,4 @@
-pub mod handler;
+/* pub mod handler; */
 use builders::Builder;
 mod parse;
 use std::{

crates/server/Cargo.toml

@@ -2,14 +2,19 @@
 name = "http-srv"
 description = "Http Server"
 authors = ["Saúl Valdelvira <saul@saulv.es>"]
-version = "0.3.3"
+version = "0.4.0"
 edition = "2021"
 license = "MIT"
 readme = "README"
 repository = "https://git.saulv.es/http-server"
 
 [dependencies]
 http.workspace = true
+mime = { package = "rmime", version = ">=0.1.0", path = "../mime" }
+regexpr = { version = ">=0.3.3", git = "https://github.com/saulvaldelvira/regexpr" }
 pool = { package = "job-pool", version = ">=0.1.0", git = "https://github.com/saulvaldelvira/job-pool" }
 jsonrs = { package = "jsonrs", version = ">=0.1.4", git = "https://github.com/saulvaldelvira/json.rs" }
 delay_init = { package = "delay_init" , version = ">=0.2.0", git = "https://github.com/saulvaldelvira/delay-init" }
+base64 = { package = "rb64", version = ">=0.1.0", git = "https://github.com/saulvaldelvira/rb64" }
+url = { package = "url-utils", version = ">=0.1.0", path = "../url" }
+html = { package = "rhtml", version = ">=0.1.0", path = "../html" }

crates/http/src/request/handler/auth.rs crates/server/src/handler/auth.rscrates/http/src/request/handler/auth.rs renamed to crates/server/src/handler/auth.rs

@@ -16,7 +16,7 @@ use crate::{err, HttpRequest, Result};
 /// # Example
 /// ```
 /// use http::*;
-/// use http::request::handler::*;
+/// use http_srv::handler::*;
 ///
 /// let auth = AuthConfig::of_list(&[("user", "passwd")]);
 ///

…tes/http/src/request/handler/indexing.rs crates/server/src/handler/indexing.rscrates/http/src/request/handler/indexing.rs renamed to crates/server/src/handler/indexing.rs crates/http/src/request/handler/indexing.rs renamed to crates/server/src/handler/indexing.rs

@@ -12,14 +12,12 @@ use std::{
 };
 
 pub use auth::AuthConfig;
+use http::HttpMethod;
 use mime::Mime;
 use regexpr::Regex;
 
 use self::{indexing::index_of, ranges::get_range_for};
-use crate::{
-    request::{HttpMethod, HttpRequest},
-    Result,
-};
+use crate::{request::HttpRequest, Result};
 
 /* /// HandlerFunc trait */
 /* /// */
@@ -69,7 +67,8 @@ pub struct UrlMatcher(UrlMatcherInner);
 
 impl UrlMatcher {
     pub fn regex(src: &str) -> Result<Self> {
-        Ok(UrlMatcher(UrlMatcherInner::Regex(Regex::compile(src)?)))
+        let regex = Regex::compile(src).map_err(|err| err.to_string())?;
+        Ok(UrlMatcher(UrlMatcherInner::Regex(regex)))
     }
     #[must_use]
     pub fn literal(src: String) -> Self {
@@ -96,7 +95,7 @@ impl From<String> for UrlMatcher {
 ///
 /// # Example
 /// ```
-/// use http::request::handler::{self,*};
+/// use http_srv::handler::{self,*};
 /// use http::request::HttpRequest;
 /// use http::HttpMethod;
 ///

crates/http/src/request/handler/mod.rs crates/server/src/handler/mod.rscrates/http/src/request/handler/mod.rs renamed to crates/server/src/handler/mod.rs

@@ -34,18 +34,17 @@
 pub use http::{self, request, response, HttpRequest, HttpResponse};
 pub mod config;
 
+pub mod handler;
+
 #[doc(hidden)]
 pub mod prelude {
-    pub use http::{
-        request::{
-            handler::{self, AuthConfig, Handler},
-            HttpRequest,
-        },
-        response::*,
-        *,
-    };
+    pub use http::{request::HttpRequest, response::*, *};
 
-    pub use crate::{config::*, HttpServer};
+    pub use crate::{
+        config::*,
+        handler::{self, AuthConfig, Handler},
+        HttpServer,
+    };
 }
 use prelude::*;
 
@@ -75,7 +74,7 @@ use log::prelude::*;
 /// ```rust,no_run
 /// use http_srv::HttpServer;
 /// use http_srv::ServerConfig;
-/// use http_srv::http::request::handler::Handler;
+/// use http_srv::handler::Handler;
 /// use http_srv::request::HttpRequest;
 ///
 /// let config = ServerConfig::default();