apply some clippy corrections

This commit is contained in:
yggverse 2024-11-15 22:01:47 +02:00
parent d6dc4d6870
commit 1d4dc50380
4 changed files with 18 additions and 21 deletions

View file

@ -43,7 +43,7 @@ impl Meta {
match buffer.get(..if len > MAX_LEN { MAX_LEN } else { len }) { match buffer.get(..if len > MAX_LEN { MAX_LEN } else { len }) {
Some(slice) => { Some(slice) => {
// Parse data // Parse data
let data = Data::from_utf8(&slice); let data = Data::from_utf8(slice);
if let Err(reason) = data { if let Err(reason) = data {
return Err(( return Err((
@ -57,7 +57,7 @@ impl Meta {
// MIME // MIME
let mime = Mime::from_utf8(&slice); let mime = Mime::from_utf8(slice);
if let Err(reason) = mime { if let Err(reason) = mime {
return Err(( return Err((
@ -72,7 +72,7 @@ impl Meta {
// Status // Status
let status = Status::from_utf8(&slice); let status = Status::from_utf8(slice);
if let Err(reason) = status { if let Err(reason) = status {
return Err(( return Err((

View file

@ -22,7 +22,7 @@ impl Data {
/// from entire response or just header slice /// from entire response or just header slice
/// ///
/// * result could be `None` for some [status codes](https://geminiprotocol.net/docs/protocol-specification.gmi#status-codes) /// * result could be `None` for some [status codes](https://geminiprotocol.net/docs/protocol-specification.gmi#status-codes)
/// that does not expect any data in header /// that does not expect any data in header
pub fn from_utf8(buffer: &[u8]) -> Result<Option<Self>, Error> { pub fn from_utf8(buffer: &[u8]) -> Result<Option<Self>, Error> {
// Define max buffer length for this method // Define max buffer length for this method
const MAX_LEN: usize = 0x400; // 1024 const MAX_LEN: usize = 0x400; // 1024

View file

@ -33,9 +33,9 @@ impl Mime {
/// Create new `Self` from UTF-8 buffer (that includes **header**) /// Create new `Self` from UTF-8 buffer (that includes **header**)
/// ///
/// * result could be `None` for some [status codes](https://geminiprotocol.net/docs/protocol-specification.gmi#status-codes) /// * result could be `None` for some [status codes](https://geminiprotocol.net/docs/protocol-specification.gmi#status-codes)
/// that does not expect MIME type in header /// that does not expect MIME type in header
/// * includes `Self::from_string` parser, /// * includes `Self::from_string` parser,
/// it means that given buffer should contain some **header** (not filepath or any other type of strings) /// it means that given buffer should contain some **header** (not filepath or any other type of strings)
pub fn from_utf8(buffer: &[u8]) -> Result<Option<Self>, Error> { pub fn from_utf8(buffer: &[u8]) -> Result<Option<Self>, Error> {
// Define max buffer length for this method // Define max buffer length for this method
const MAX_LEN: usize = 0x400; // 1024 const MAX_LEN: usize = 0x400; // 1024

View file

@ -27,11 +27,8 @@ pub fn from_stream_async(
base_io_stream, base_io_stream,
cancelable, cancelable,
priority, priority,
bytes_in_chunk, (bytes_in_chunk, bytes_total_limit, 0),
bytes_total_limit, (on_chunk, on_complete),
0, // initial `bytes_total` value
on_chunk,
on_complete,
); );
} }
@ -43,12 +40,15 @@ pub fn read_all_from_stream_async(
base_io_stream: impl IsA<IOStream>, base_io_stream: impl IsA<IOStream>,
cancelable: Option<Cancellable>, cancelable: Option<Cancellable>,
priority: Priority, priority: Priority,
bytes_in_chunk: usize, bytes: (usize, usize, usize),
bytes_total_limit: usize, callback: (
bytes_total: usize, impl Fn((Bytes, usize)) + 'static,
on_chunk: impl Fn((Bytes, usize)) + 'static, impl FnOnce(Result<MemoryInputStream, (Error, Option<&str>)>) + 'static,
on_complete: impl FnOnce(Result<MemoryInputStream, (Error, Option<&str>)>) + 'static, ),
) { ) {
let (on_chunk, on_complete) = callback;
let (bytes_in_chunk, bytes_total_limit, bytes_total) = bytes;
base_io_stream.input_stream().read_bytes_async( base_io_stream.input_stream().read_bytes_async(
bytes_in_chunk, bytes_in_chunk,
priority, priority,
@ -80,11 +80,8 @@ pub fn read_all_from_stream_async(
base_io_stream, base_io_stream,
cancelable, cancelable,
priority, priority,
bytes_in_chunk, (bytes_in_chunk, bytes_total_limit, bytes_total),
bytes_total_limit, (on_chunk, on_complete),
bytes_total,
on_chunk,
on_complete,
); );
} }
Err(reason) => { Err(reason) => {