From 8feab6b93bc276685b160081a3b7a4948b384596 Mon Sep 17 00:00:00 2001 From: yggverse Date: Mon, 24 Mar 2025 19:40:12 +0200 Subject: [PATCH] rename constructors --- src/client/connection/response.rs | 2 +- src/client/connection/response/success.rs | 6 +++--- src/client/connection/response/success/default.rs | 7 ++++--- src/client/connection/response/success/default/header.rs | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/client/connection/response.rs b/src/client/connection/response.rs index 98fe2e3..a92e6e3 100644 --- a/src/client/connection/response.rs +++ b/src/client/connection/response.rs @@ -49,7 +49,7 @@ impl Response { Ok(input) => Ok(Self::Input(input)), Err(e) => Err(Error::Input(e)), }, - b'2' => match Success::parse(&buffer) { + b'2' => match Success::from_utf8(&buffer) { Ok(success) => Ok(Self::Success(success)), Err(e) => Err(Error::Success(e)), }, diff --git a/src/client/connection/response/success.rs b/src/client/connection/response/success.rs index 2139950..ecee769 100644 --- a/src/client/connection/response/success.rs +++ b/src/client/connection/response/success.rs @@ -15,11 +15,11 @@ impl Success { // Constructors /// Parse new `Self` from buffer bytes - pub fn parse(buffer: &[u8]) -> Result { + pub fn from_utf8(buffer: &[u8]) -> Result { if buffer.first().is_none_or(|b| *b != CODE) { return Err(Error::Code); } - match Default::parse(buffer) { + match Default::from_utf8(buffer) { Ok(default) => Ok(Self::Default(default)), Err(e) => Err(Error::Default(e)), } @@ -28,7 +28,7 @@ impl Success { #[test] fn test() { - match Success::parse("20 text/gemini; charset=utf-8; lang=en\r\n".as_bytes()).unwrap() { + match Success::from_utf8("20 text/gemini; charset=utf-8; lang=en\r\n".as_bytes()).unwrap() { Success::Default(default) => { assert_eq!(default.header.mime().unwrap(), "text/gemini"); assert_eq!(default.content, None) diff --git a/src/client/connection/response/success/default.rs b/src/client/connection/response/success/default.rs index 7544723..6180f2e 100644 --- a/src/client/connection/response/success/default.rs +++ b/src/client/connection/response/success/default.rs @@ -14,11 +14,11 @@ pub struct Default { impl Default { // Constructors - pub fn parse(buffer: &[u8]) -> Result { + pub fn from_utf8(buffer: &[u8]) -> Result { if !buffer.starts_with(CODE) { return Err(Error::Code); } - let header = Header::parse(buffer).map_err(Error::Header)?; + let header = Header::from_utf8(buffer).map_err(Error::Header)?; Ok(Self { content: buffer .get(header.len() + 1..) @@ -31,7 +31,8 @@ impl Default { #[test] fn test() { - let default = Default::parse("20 text/gemini; charset=utf-8; lang=en\r\n".as_bytes()).unwrap(); + let default = + Default::from_utf8("20 text/gemini; charset=utf-8; lang=en\r\n".as_bytes()).unwrap(); assert_eq!(default.header.mime().unwrap(), "text/gemini"); assert_eq!(default.content, None) } diff --git a/src/client/connection/response/success/default/header.rs b/src/client/connection/response/success/default/header.rs index 306a984..929cb96 100644 --- a/src/client/connection/response/success/default/header.rs +++ b/src/client/connection/response/success/default/header.rs @@ -6,7 +6,7 @@ pub struct Header(Vec); impl Header { // Constructors - pub fn parse(buffer: &[u8]) -> Result { + pub fn from_utf8(buffer: &[u8]) -> Result { if !buffer.starts_with(super::CODE) { return Err(Error::Code); }