Fix some clippy lints
This commit is contained in:
parent
2ccd8a9c55
commit
c7fd5f8ff1
6 changed files with 11 additions and 13 deletions
|
@ -41,8 +41,7 @@ pub async fn parse_site_logo(
|
||||||
let elem = elem_ref.value();
|
let elem = elem_ref.value();
|
||||||
let ancestors = elem_ref
|
let ancestors = elem_ref
|
||||||
.ancestors()
|
.ancestors()
|
||||||
.map(ElementRef::wrap)
|
.filter_map(ElementRef::wrap)
|
||||||
.flatten()
|
|
||||||
.map(|elem_ref| elem_ref.value())
|
.map(|elem_ref| elem_ref.value())
|
||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
|
@ -119,7 +118,7 @@ pub async fn parse_site_logo(
|
||||||
let href = if elem.name() == "svg" {
|
let href = if elem.name() == "svg" {
|
||||||
Some(Url::parse(&encode_svg(&elem_ref.html())).unwrap())
|
Some(Url::parse(&encode_svg(&elem_ref.html())).unwrap())
|
||||||
} else {
|
} else {
|
||||||
elem.attr("src").and_then(|href| url.join(&href).ok())
|
elem.attr("src").and_then(|href| url.join(href).ok())
|
||||||
};
|
};
|
||||||
|
|
||||||
if let Some(href) = &href {
|
if let Some(href) = &href {
|
||||||
|
|
|
@ -38,7 +38,7 @@ impl TryFrom<&str> for IconSizes {
|
||||||
type Error = Box<dyn Error>;
|
type Error = Box<dyn Error>;
|
||||||
|
|
||||||
fn try_from(sizes_str: &str) -> Result<Self, Self::Error> {
|
fn try_from(sizes_str: &str) -> Result<Self, Self::Error> {
|
||||||
let size_strs = sizes_str.split(" ");
|
let size_strs = sizes_str.split(' ');
|
||||||
|
|
||||||
let mut sizes = Vec::new();
|
let mut sizes = Vec::new();
|
||||||
for size in size_strs {
|
for size in size_strs {
|
||||||
|
@ -85,7 +85,7 @@ impl IntoIterator for IconSizes {
|
||||||
|
|
||||||
impl Ord for IconSizes {
|
impl Ord for IconSizes {
|
||||||
fn cmp(&self, other: &Self) -> Ordering {
|
fn cmp(&self, other: &Self) -> Ordering {
|
||||||
self.largest().cmp(&other.largest())
|
self.largest().cmp(other.largest())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,10 +28,10 @@ pub async fn get_jpeg_size<R: AsyncRead + Unpin>(
|
||||||
let page = marker[1];
|
let page = marker[1];
|
||||||
|
|
||||||
// Check for valid SOFn markers. C4, C8, and CC aren't dimension markers.
|
// Check for valid SOFn markers. C4, C8, and CC aren't dimension markers.
|
||||||
if (page >= 0xC0 && page <= 0xC3)
|
if (0xC0..=0xC3).contains(&page)
|
||||||
|| (page >= 0xC5 && page <= 0xC7)
|
|| (0xC5..=0xC7).contains(&page)
|
||||||
|| (page >= 0xC9 && page <= 0xCB)
|
|| (0xC9..=0xCB).contains(&page)
|
||||||
|| (page >= 0xCD && page <= 0xCF)
|
|| (0xCD..=0xCF).contains(&page)
|
||||||
{
|
{
|
||||||
// Only get outside image size
|
// Only get outside image size
|
||||||
if depth == 0 {
|
if depth == 0 {
|
||||||
|
|
|
@ -71,7 +71,7 @@ impl<'de> Deserialize<'de> for IconSize {
|
||||||
{
|
{
|
||||||
let value: String = Deserialize::deserialize(deserializer)?;
|
let value: String = Deserialize::deserialize(deserializer)?;
|
||||||
|
|
||||||
let mut split = value.split("x");
|
let mut split = value.split('x');
|
||||||
let width = split
|
let width = split
|
||||||
.next()
|
.next()
|
||||||
.ok_or(de::Error::custom("expected width"))?
|
.ok_or(de::Error::custom("expected width"))?
|
||||||
|
|
|
@ -129,8 +129,7 @@ impl SiteIcons {
|
||||||
}
|
}
|
||||||
.boxed_local(),
|
.boxed_local(),
|
||||||
async {
|
async {
|
||||||
let manifests =
|
let manifests = join_all(manifest_urls.map(SiteIcons::load_manifest)).await;
|
||||||
join_all(manifest_urls.map(|url| SiteIcons::load_manifest(url))).await;
|
|
||||||
|
|
||||||
LoadedKind::DefaultManifest(
|
LoadedKind::DefaultManifest(
|
||||||
manifests
|
manifests
|
||||||
|
|
|
@ -49,6 +49,6 @@ async fn load_manifest_cached(url: Url) -> Result<Vec<Icon>, String> {
|
||||||
}))
|
}))
|
||||||
.await
|
.await
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.filter_map(|icon| icon)
|
.flatten()
|
||||||
.collect())
|
.collect())
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue