Accept IpAddr or Ipv6Addr as socket.

Added port in builder for only specifying port

Cargo.lock

@@ -294,7 +294,7 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "lib"
-version = "1.3.2"
+version = "1.3.5"
 dependencies = [
  "axum",
  "derive",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lib"
-version = "1.3.2"
+version = "1.3.5"
 edition = "2021"
 authors = ["Martin Berg Alstad"]
 homepage = "emberal.github.io"

examples/multipart_file/Cargo.lock

@@ -286,7 +286,7 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "lib"
-version = "1.3.2"
+version = "1.3.5"
 dependencies = [
  "axum",
  "thiserror",

src/axum/app.rs

@@ -1,3 +1,4 @@
+use std::net::IpAddr;
 use {
     axum::{extract::Request, handler::Handler, Router, ServiceExt},
     std::{io, net::Ipv4Addr, net::SocketAddr},
@@ -26,7 +27,7 @@ macro_rules! create_app {
 #[derive(Default)]
 pub struct AppBuilder {
     router: Router,
-    socket: Option<(Ipv4Addr, u16)>,
+    socket: Option<(IpAddr, u16)>,
     cors: Option<CorsLayer>,
     normalize_path: Option<bool>,
     tracing: Option<TraceLayer<HttpMakeClassifier>>,
@@ -47,8 +48,18 @@ impl AppBuilder {
         self
     }
 
-    pub fn socket(mut self, socket: impl Into<(Ipv4Addr, u16)>) -> Self {
+    pub fn socket<IP: Into<IpAddr>>(mut self, socket: impl Into<(IP, u16)>) -> Self {
-        self.socket = Some(socket.into());
+        let (ip, port) = socket.into();
+        self.socket = Some((ip.into(), port));
+        self
+    }
+
+    pub fn port(mut self, port: u16) -> Self {
+        self.socket = if let Some((ip, _)) = self.socket {
+            Some((ip, port))
+        } else {
+            Some((Ipv4Addr::UNSPECIFIED.into(), port))
+        };
         self
     }
 
@@ -91,7 +102,7 @@ impl AppBuilder {
     }
 
     async fn listener(&self) -> io::Result<TcpListener> {
-        let addr = SocketAddr::from(self.socket.unwrap_or((Ipv4Addr::UNSPECIFIED, 8000)));
+        let addr = SocketAddr::from(self.socket.unwrap_or((Ipv4Addr::UNSPECIFIED.into(), 8000)));
         info!("Initializing server on: {addr}");
         TcpListener::bind(&addr).await
     }

src/axum/router.rs

@@ -20,12 +20,12 @@
 #[macro_export]
 macro_rules! router {
     ($body:expr) => {
-        pub(crate) fn router() -> axum::Router {
+        pub fn router() -> axum::Router {
             $body
         }
     };
     ($body:expr; $state:ty) => {
-        pub(crate) fn router() -> axum::Router<$state> {
+        pub fn router() -> axum::Router<$state> {
             $body
         }
     };

src/nom/combinators.rs

@@ -17,7 +17,7 @@ use {
 /// - Returns: A parser that trims leading and trailing whitespace from the input and then runs the value from the inner parser
 pub fn trim<'a, Parser, R>(inner: Parser) -> impl FnMut(&'a str) -> IResult<&'a str, R>
 where
-    Parser: Fn(&'a str) -> IResult<&'a str, R>,
+    Parser: FnMut(&'a str) -> IResult<&'a str, R>,
 {
     delimited(multispace0, inner, multispace0)
 }
@@ -29,8 +29,9 @@ where
 /// - Returns: A parser that parses a parenthesized expression
 pub fn parenthesized<'a, Parser, R>(inner: Parser) -> impl FnMut(&'a str) -> IResult<&'a str, R>
 where
-    Parser: Fn(&'a str) -> IResult<&'a str, R>,
+    Parser: FnMut(&'a str) -> IResult<&'a str, R>,
 {
+    // TODO move trim out of here
     delimited(char('('), trim(inner), char(')'))
 }
 
@@ -49,16 +50,15 @@ where
 
 pub fn exhausted<'a, Parser, R>(inner: Parser) -> impl FnMut(&'a str) -> IResult<&'a str, R>
 where
-    Parser: Fn(&'a str) -> IResult<&'a str, R>,
+    Parser: FnMut(&'a str) -> IResult<&'a str, R>,
 {
     terminated(inner, eof)
 }
 
 #[cfg(test)]
 mod tests {
-    use nom::bytes::streaming::take_while;
-
     use super::*;
+    use nom::{bytes::complete::take_while, sequence::tuple};
 
     #[test]
     fn test_trim_both_sides() {
@@ -154,4 +154,16 @@ mod tests {
         let input = "test ";
         assert!(exhausted(take_where(4, |c: char| c.is_ascii_alphabetic()))(input).is_err());
     }
+
+    #[test]
+    fn test_exhausted_tuple() {
+        let input = "test";
+        let (remaining, result) = exhausted(tuple((
+            take_where(3, |c: char| c.is_ascii_alphabetic()),
+            take_while(|c: char| c.is_ascii_alphabetic()),
+        )))(input)
+        .unwrap();
+        assert_eq!(remaining, "");
+        assert_eq!(result, ("tes", "t"));
+    }
 }