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

return self anyway

Browse source
This commit is contained in:
yggverse 2024-10-25 21:01:06 +03:00
parent 32c238da4d
commit 8a5f1e2a57
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/client/socket/connection.rs
View file

@ -48,11 +48,11 @@ impl Connection {
cancelable.clone(), cancelable.clone(),
priority, priority,
chunk, chunk,
move |input| { move |this, input| {
callback( callback(
self, self,
match input { match input {
Ok(this) => Ok(this.buffer().to_utf8()), Ok(()) => Ok(this.buffer().to_utf8()),
Err(error) => Err(match error { Err(error) => Err(match error {
input::Error::BufferOverflow => Error::InputBufferOverflow, input::Error::BufferOverflow => Error::InputBufferOverflow,
input::Error::BufferWrite => Error::InputBufferWrite, input::Error::BufferWrite => Error::InputBufferWrite,

10
src/client/socket/connection/input.rs
View file

@ -87,7 +87,7 @@ impl Input {
cancelable: Option<Cancellable>, cancelable: Option<Cancellable>,
priority: Option<Priority>, priority: Option<Priority>,
chunk: Option<usize>, chunk: Option<usize>,
callback: impl FnOnce(Result<Self, Error>) + 'static, callback: impl FnOnce(Self, Result<(), Error>) + 'static,
) { ) {
// Continue bytes reading // Continue bytes reading
self.stream.clone().read_bytes_async( self.stream.clone().read_bytes_async(
@ -109,17 +109,17 @@ impl Input {
Ok(bytes) => { Ok(bytes) => {
// No bytes were read, end of stream // No bytes were read, end of stream
if bytes.len() == 0 { if bytes.len() == 0 {
return callback(Ok(self)); return callback(self, Ok(()));
} }
// Save chunk to buffer // Save chunk to buffer
match self.buffer.push(bytes) { match self.buffer.push(bytes) {
Err(buffer::Error::Overflow) => { Err(buffer::Error::Overflow) => {
return callback(Err(Error::BufferOverflow)) return callback(self, Err(Error::BufferOverflow))
} }
// Other errors related to write issues @TODO test // Other errors related to write issues @TODO test
Err(_) => return callback(Err(Error::BufferWrite)), Err(_) => return callback(self, Err(Error::BufferWrite)),
// Async function, nothing to return yet // Async function, nothing to return yet
_ => (), _ => (),
@ -128,7 +128,7 @@ impl Input {
// Continue bytes reading... // Continue bytes reading...
self.read_all_async(cancelable, priority, chunk, callback); self.read_all_async(cancelable, priority, chunk, callback);
} }
Err(_) => callback(Err(Error::StreamChunkRead)), Err(_) => callback(self, Err(Error::StreamChunkRead)),
} }
}, },
); );