Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix more clippy warnings in components/shared/net (#31548)

Browse source 
* Fix clippy warnings in components/shared

* Fix build error

* Fixes in order to solve some merge issues

---------

Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Mucha Naibei 2024-03-10 20:47:38 +03:00 • committed by GitHub
parent 67b277c992
commit 0bc685ed97
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/net/fetch/methods.rs
View file

@ -820,10 +820,10 @@ async fn scheme_fetch(
let (id, origin) = match parse_blob_url(&url) {
Ok((id, origin)) => (id, origin),
Err(()) => {
return Response::network_error(NetworkError::Internal(
"Invalid blob url".into(),
));
Err(error) => {
return Response::network_error(NetworkError::Internal(format!(
"Invalid blob URL ({error})"
)));
},
};

18
components/shared/net/blob_url_store.rs
View file

@ -41,20 +41,24 @@ pub struct BlobBuf {
/// Parse URL as Blob URL scheme's definition
///
/// <https://w3c.github.io/FileAPI/#DefinitionOfScheme>
pub fn parse_blob_url(url: &ServoUrl) -> Result<(Uuid, FileOrigin), ()> {
let url_inner = Url::parse(url.path()).map_err(|_| ())?;
pub fn parse_blob_url(url: &ServoUrl) -> Result<(Uuid, FileOrigin), &'static str> {
let url_inner = Url::parse(url.path()).map_err(|_| "Failed to parse URL path")?;
let segs = url_inner
.path_segments()
.map(|c| c.collect::<Vec<_>>())
.ok_or(())?;
.ok_or("URL has no path segments")?;
if url.query().is_some() || segs.len() > 1 {
return Err(());
if url.query().is_some() {
return Err("URL should not contain a query");
}
if segs.len() > 1 {
return Err("URL should not have more than one path segment");
}
let id = {
let id = segs.first().ok_or(())?;
Uuid::from_str(id).map_err(|_| ())?
let id = segs.first().ok_or("URL has no path segments")?;
Uuid::from_str(id).map_err(|_| "Failed to parse UUID from path segment")?
};
Ok((id, get_blob_origin(&ServoUrl::from_url(url_inner))))
}