[librsvg: 8/10] Appease Clippy about unnecessary Result
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 8/10] Appease Clippy about unnecessary Result
- Date: Thu, 29 Apr 2021 00:06:46 +0000 (UTC)
commit 4e61fc7760f70a6db52e32c88f9c95e507626b83
Author: Federico Mena Quintero <federico gnome org>
Date: Wed Apr 28 18:38:16 2021 -0500
Appease Clippy about unnecessary Result
src/filter_func.rs | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/src/filter_func.rs b/src/filter_func.rs
index e7e51a67..2ede5abb 100644
--- a/src/filter_func.rs
+++ b/src/filter_func.rs
@@ -40,6 +40,9 @@ where
parser.parse_nested_block(f)
}
+// This function doesn't fail, but returns a Result like the other parsers, so tell Clippy
+// about that.
+#[allow(clippy::unnecessary_wraps)]
fn parse_blur<'i>(parser: &mut Parser<'i, '_>) -> Result<FilterFunction, ParseError<'i>> {
let length = if let Ok(length) = parser.try_parse(|p| Length::parse(p)) {
Some(length)
@@ -57,7 +60,7 @@ impl Blur {
&self,
values: &ComputedValues,
params: &ViewParams,
- ) -> Result<FilterSpec, FilterResolveError> {
+ ) -> FilterSpec {
// The 0.0 default is from the spec
let std_dev = self
.std_deviation
@@ -75,10 +78,10 @@ impl Blur {
}
.into_user_space(values, params);
- Ok(FilterSpec {
+ FilterSpec {
user_space_filter,
primitives: vec![gaussian_blur],
- })
+ }
}
}
@@ -95,6 +98,8 @@ impl Parse for FilterFunction {
}
impl FilterFunction {
+ // If this function starts actually returning an Err, remove this Clippy exception:
+ #[allow(clippy::unnecessary_wraps)]
pub fn to_filter_spec(
&self,
values: &ComputedValues,
@@ -104,7 +109,7 @@ impl FilterFunction {
let params = draw_ctx.push_coord_units(CoordUnits::UserSpaceOnUse);
match self {
- FilterFunction::Blur(v) => v.to_filter_spec(values, ¶ms),
+ FilterFunction::Blur(v) => Ok(v.to_filter_spec(values, ¶ms)),
}
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]