YGGverse/ggemini
1
0
Fork 0
mirror of https://github.com/YGGverse/ggemini.git synced 2026-03-31 09:05:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename constructors

Browse source
This commit is contained in:
yggverse 2025-03-24 19:40:12 +02:00
parent 5360c6bf19
commit 8feab6b93b
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/client/connection/response.rs
View file

@ -49,7 +49,7 @@ impl Response {
Ok(input) => Ok(Self::Input(input)), Ok(input) => Ok(Self::Input(input)),
Err(e) => Err(Error::Input(e)), 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)), Ok(success) => Ok(Self::Success(success)),
Err(e) => Err(Error::Success(e)), Err(e) => Err(Error::Success(e)),
}, },

6
src/client/connection/response/success.rs
View file

@ -15,11 +15,11 @@ impl Success {
// Constructors // Constructors
/// Parse new `Self` from buffer bytes /// Parse new `Self` from buffer bytes
pub fn parse(buffer: &[u8]) -> Result<Self, Error> { pub fn from_utf8(buffer: &[u8]) -> Result<Self, Error> {
if buffer.first().is_none_or(|b| *b != CODE) { if buffer.first().is_none_or(|b| *b != CODE) {
return Err(Error::Code); return Err(Error::Code);
} }
match Default::parse(buffer) { match Default::from_utf8(buffer) {
Ok(default) => Ok(Self::Default(default)), Ok(default) => Ok(Self::Default(default)),
Err(e) => Err(Error::Default(e)), Err(e) => Err(Error::Default(e)),
} }
@ -28,7 +28,7 @@ impl Success {
#[test] #[test]
fn 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) => { Success::Default(default) => {
assert_eq!(default.header.mime().unwrap(), "text/gemini"); assert_eq!(default.header.mime().unwrap(), "text/gemini");
assert_eq!(default.content, None) assert_eq!(default.content, None)

7
src/client/connection/response/success/default.rs
View file

@ -14,11 +14,11 @@ pub struct Default {
impl Default { impl Default {
// Constructors // Constructors
pub fn parse(buffer: &[u8]) -> Result<Self, Error> { pub fn from_utf8(buffer: &[u8]) -> Result<Self, Error> {
if !buffer.starts_with(CODE) { if !buffer.starts_with(CODE) {
return Err(Error::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 { Ok(Self {
content: buffer content: buffer
.get(header.len() + 1..) .get(header.len() + 1..)
@ -31,7 +31,8 @@ impl Default {
#[test] #[test]
fn 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.header.mime().unwrap(), "text/gemini");
assert_eq!(default.content, None) assert_eq!(default.content, None)
} }

2
src/client/connection/response/success/default/header.rs
View file

@ -6,7 +6,7 @@ pub struct Header(Vec<u8>);
impl Header { impl Header {
// Constructors // Constructors
pub fn parse(buffer: &[u8]) -> Result<Self, Error> { pub fn from_utf8(buffer: &[u8]) -> Result<Self, Error> {
if !buffer.starts_with(super::CODE) { if !buffer.starts_with(super::CODE) {
return Err(Error::Code); return Err(Error::Code);
} }