aboutsummaryrefslogtreecommitdiffstats
path: root/components/net/fetch
diff options
context:
space:
mode:
authoreri <eri@inventati.org>2024-03-21 13:51:45 +0100
committerGitHub <noreply@github.com>2024-03-21 12:51:45 +0000
commitda696b7e57fd4fbf615b3853ac48cf522e87e098 (patch)
treec52bb9149c8f38a3484838ca78729de4ca788048 /components/net/fetch
parentea62a5e24f5c9a3b7c0588506f7a38de9ddbcd67 (diff)
downloadservo-da696b7e57fd4fbf615b3853ac48cf522e87e098.tar.gz
servo-da696b7e57fd4fbf615b3853ac48cf522e87e098.zip
clippy: fix `result_unit_err` warnings (#31791)
* clippy: fix `result_unit_err` warnings * feat: fix result warnings in script * doc: document `generate_key` return type Co-authored-by: Martin Robinson <mrobinson@igalia.com> * feat: add back result to RangeRequestBounds::get_final Co-authored-by: Martin Robinson <mrobinson@igalia.com> --------- Co-authored-by: Martin Robinson <mrobinson@igalia.com>
Diffstat (limited to 'components/net/fetch')
-rw-r--r--components/net/fetch/methods.rs14
1 files changed, 6 insertions, 8 deletions
diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs
index 42a95f542ea..1bf15eace4c 100644
--- a/components/net/fetch/methods.rs
+++ b/components/net/fetch/methods.rs
@@ -569,7 +569,7 @@ pub enum RangeRequestBounds {
}
impl RangeRequestBounds {
- pub fn get_final(&self, len: Option<u64>) -> Result<RelativePos, ()> {
+ pub fn get_final(&self, len: Option<u64>) -> Result<RelativePos, &'static str> {
match self {
RangeRequestBounds::Final(pos) => {
if let Some(len) = len {
@@ -577,7 +577,7 @@ impl RangeRequestBounds {
return Ok(pos.clone());
}
}
- Err(())
+ Err("Tried to process RangeRequestBounds::Final without len")
},
RangeRequestBounds::Pending(offset) => Ok(RelativePos::from_opts(
if let Some(len) = len {
@@ -750,12 +750,10 @@ async fn scheme_fetch(
let range_header = request.headers.typed_get::<Range>();
let is_range_request = range_header.is_some();
- let range = match get_range_request_bounds(range_header).get_final(file_size) {
- Ok(range) => range,
- Err(_) => {
- range_not_satisfiable_error(&mut response);
- return response;
- },
+ let Ok(range) = get_range_request_bounds(range_header).get_final(file_size)
+ else {
+ range_not_satisfiable_error(&mut response);
+ return response;
};
let mut reader = BufReader::with_capacity(FILE_CHUNK_SIZE, file);
if reader.seek(SeekFrom::Start(range.start as u64)).is_err() {