Misc clippy fixes (#872)

* `clippy::bool_assert_comparison`
* `clippy::field_reassign_with_default`
* `clippy::legacy_numeric_constants`
* `clippy::manual_clamp`
* `clippy::map_flatten`
* `clippy::needless_borrows_for_generic_args`
* `clippy::needless_lifetimes`
* `clippy::redundant_field_names`
* `clippy::to_string_in_format_args`
* `clippy::unnecessary_cast`
* `clippy::useless_format`

Author: waywardmonkeys

crates/c-api/lib.rs

@@ -155,7 +155,7 @@ pub extern "C" fn resvg_options_set_resources_dir(opt: *mut resvg_options, path:
 /// Default: 96
 #[no_mangle]
 pub extern "C" fn resvg_options_set_dpi(opt: *mut resvg_options, dpi: f32) {
-    cast_opt(opt).dpi = dpi as f32;
+    cast_opt(opt).dpi = dpi;
 }
 
 /// @brief Sets the default font family.

crates/resvg/examples/draw_bboxes.rs

@@ -18,11 +18,13 @@ fn main() {
         1.0
     };
 
-    let mut opt = usvg::Options::default();
-    // Get file's absolute directory.
-    opt.resources_dir = std::fs::canonicalize(&args[1])
-        .ok()
-        .and_then(|p| p.parent().map(|p| p.to_path_buf()));
+    let mut opt = usvg::Options {
+        // Get file's absolute directory.
+        resources_dir: std::fs::canonicalize(&args[1])
+            .ok()
+            .and_then(|p| p.parent().map(|p| p.to_path_buf())),
+        ..usvg::Options::default()
+    };
 
     opt.fontdb_mut().load_system_fonts();
 
@@ -38,8 +40,10 @@ fn main() {
     let render_ts = tiny_skia::Transform::from_scale(zoom, zoom);
     resvg::render(&tree, render_ts, &mut pixmap.as_mut());
 
-    let mut stroke = tiny_skia::Stroke::default();
-    stroke.width = 1.0 / zoom; // prevent stroke scaling as well
+    let stroke = tiny_skia::Stroke {
+        width: 1.0 / zoom, // prevent stroke scaling as well
+        ..tiny_skia::Stroke::default()
+    };
 
     let mut paint1 = tiny_skia::Paint::default();
     paint1.set_color_rgba8(255, 0, 0, 127);

crates/resvg/examples/minimal.rs

@@ -9,12 +9,13 @@ fn main() {
     }
 
     let tree = {
-        let mut opt = usvg::Options::default();
-        // Get file's absolute directory.
-        opt.resources_dir = std::fs::canonicalize(&args[1])
-            .ok()
-            .and_then(|p| p.parent().map(|p| p.to_path_buf()));
-
+        let mut opt = usvg::Options {
+            // Get file's absolute directory.
+            resources_dir: std::fs::canonicalize(&args[1])
+                .ok()
+                .and_then(|p| p.parent().map(|p| p.to_path_buf())),
+            ..usvg::Options::default()
+        };
         opt.fontdb_mut().load_system_fonts();
 
         let svg_data = std::fs::read(&args[1]).unwrap();

crates/resvg/src/main.rs

@@ -553,7 +553,7 @@ fn parse_args() -> Result<Args, String> {
 
     let style_sheet = match args.style_sheet.as_ref() {
         Some(p) => Some(
-            std::fs::read(&p)
+            std::fs::read(p)
                 .ok()
                 .and_then(|s| std::str::from_utf8(&s).ok().map(|s| s.to_string()))
                 .ok_or("failed to read stylesheet".to_string())?,

crates/resvg/tests/integration/main.rs

@@ -33,14 +33,16 @@ pub fn render(name: &str) -> usize {
     let svg_path = format!("tests/{}.svg", name);
     let png_path = format!("tests/{}.png", name);
 
-    let mut opt = usvg::Options::default();
-    opt.resources_dir = Some(
-        std::path::PathBuf::from(&svg_path)
-            .parent()
-            .unwrap()
-            .to_owned(),
-    );
-    opt.fontdb = GLOBAL_FONTDB.clone();
+    let opt = usvg::Options {
+        resources_dir: Some(
+            std::path::PathBuf::from(&svg_path)
+                .parent()
+                .unwrap()
+                .to_owned(),
+        ),
+        fontdb: GLOBAL_FONTDB.clone(),
+        ..usvg::Options::default()
+    };
 
     let tree = {
         let svg_data = std::fs::read(&svg_path).unwrap();
@@ -98,8 +100,10 @@ pub fn render_extra_with_scale(name: &str, scale: f32) -> usize {
     let svg_path = format!("tests/{}.svg", name);
     let png_path = format!("tests/{}.png", name);
 
-    let mut opt = usvg::Options::default();
-    opt.fontdb = GLOBAL_FONTDB.clone();
+    let opt = usvg::Options {
+        fontdb: GLOBAL_FONTDB.clone(),
+        ..usvg::Options::default()
+    };
 
     let tree = {
         let svg_data = std::fs::read(&svg_path).unwrap();
@@ -148,8 +152,10 @@ pub fn render_node(name: &str, id: &str) -> usize {
     let svg_path = format!("tests/{}.svg", name);
     let png_path = format!("tests/{}.png", name);
 
-    let mut opt = usvg::Options::default();
-    opt.fontdb = GLOBAL_FONTDB.clone();
+    let opt = usvg::Options {
+        fontdb: GLOBAL_FONTDB.clone(),
+        ..usvg::Options::default()
+    };
 
     let tree = {
         let svg_data = std::fs::read(&svg_path).unwrap();

crates/usvg/src/main.rs

@@ -313,7 +313,7 @@ fn main() {
     }
 
     if let Err(e) = process(args) {
-        eprintln!("Error: {}.", e.to_string());
+        eprintln!("Error: {}.", e);
         process::exit(1);
     }
 }
@@ -326,7 +326,7 @@ fn process(args: Args) -> Result<(), String> {
         let svg_from = if in_svg == "-" {
             InputFrom::Stdin
         } else if in_svg == "-c" {
-            return Err(format!("-c should be set after input"));
+            return Err("-c should be set after input".to_string());
         } else {
             InputFrom::File(in_svg)
         };
@@ -456,13 +456,13 @@ fn process(args: Args) -> Result<(), String> {
         OutputTo::Stdout => {
             io::stdout()
                 .write_all(s.as_bytes())
-                .map_err(|_| format!("failed to write to the stdout"))?;
+                .map_err(|_| "failed to write to the stdout".to_string())?;
         }
         OutputTo::File(path) => {
             let mut f =
-                File::create(path).map_err(|_| format!("failed to create the output file"))?;
+                File::create(path).map_err(|_| "failed to create the output file".to_string())?;
             f.write_all(s.as_bytes())
-                .map_err(|_| format!("failed to write to the output file"))?;
+                .map_err(|_| "failed to write to the output file".to_string())?;
         }
     }
 
@@ -476,7 +476,7 @@ fn load_stdin() -> Result<Vec<u8>, String> {
 
     handle
         .read_to_end(&mut buf)
-        .map_err(|_| format!("failed to read from stdin"))?;
+        .map_err(|_| "failed to read from stdin".to_string())?;
 
     Ok(buf)
 }

crates/usvg/src/parser/filter.rs

@@ -75,7 +75,7 @@ pub(crate) fn convert(
                 id: cache.gen_filter_id(),
                 rect,
                 primitives: vec![Primitive {
-                    rect: rect,
+                    rect,
                     // Unlike `filter` elements, filter functions use sRGB colors by default.
                     color_interpolation: ColorInterpolation::SRGB,
                     result: "result".to_string(),
@@ -800,8 +800,8 @@ fn convert_std_dev_attr(fe: SvgNode, scale: Size, default: &str) -> (PositiveF32
     let std_dev_x = (std_dev_x as f32) * scale.width();
     let std_dev_y = (std_dev_y as f32) * scale.height();
 
-    let std_dev_x = PositiveF32::new(std_dev_x as f32).unwrap_or(PositiveF32::ZERO);
-    let std_dev_y = PositiveF32::new(std_dev_y as f32).unwrap_or(PositiveF32::ZERO);
+    let std_dev_x = PositiveF32::new(std_dev_x).unwrap_or(PositiveF32::ZERO);
+    let std_dev_y = PositiveF32::new(std_dev_y).unwrap_or(PositiveF32::ZERO);
 
     (std_dev_x, std_dev_y)
 }

crates/usvg/src/parser/image.rs

@@ -328,37 +328,35 @@ fn get_image_data_format(data: &[u8]) -> Option<ImageFormat> {
 /// Unlike `Tree::from_*` methods, this one will also remove all `image` elements
 /// from the loaded SVG, as required by the spec.
 pub(crate) fn load_sub_svg(data: &[u8], opt: &Options) -> Option<ImageKind> {
-    let mut sub_opt = Options::default();
-    sub_opt.resources_dir = None;
-    sub_opt.dpi = opt.dpi;
-    sub_opt.font_size = opt.font_size;
-    sub_opt.languages = opt.languages.clone();
-    sub_opt.shape_rendering = opt.shape_rendering;
-    sub_opt.text_rendering = opt.text_rendering;
-    sub_opt.image_rendering = opt.image_rendering;
-    sub_opt.default_size = opt.default_size;
-
-    // The referenced SVG image cannot have any 'image' elements by itself.
-    // Not only recursive. Any. Don't know why.
-    sub_opt.image_href_resolver = ImageHrefResolver {
-        resolve_data: Box::new(|_, _, _| None),
-        resolve_string: Box::new(|_, _| None),
-    };
-
-    #[cfg(feature = "text")]
-    {
+    let sub_opt = Options {
+        resources_dir: None,
+        dpi: opt.dpi,
+        font_size: opt.font_size,
+        languages: opt.languages.clone(),
+        shape_rendering: opt.shape_rendering,
+        text_rendering: opt.text_rendering,
+        image_rendering: opt.image_rendering,
+        default_size: opt.default_size,
+        // The referenced SVG image cannot have any 'image' elements by itself.
+        // Not only recursive. Any. Don't know why.
+        image_href_resolver: ImageHrefResolver {
+            resolve_data: Box::new(|_, _, _| None),
+            resolve_string: Box::new(|_, _| None),
+        },
         // In the referenced SVG, we start with the unmodified user-provided
         // fontdb, not the one from the cache.
-        sub_opt.fontdb = opt.fontdb.clone();
-
+        #[cfg(feature = "text")]
+        fontdb: opt.fontdb.clone(),
         // Can't clone the resolver, so we create a new one that forwards to it.
-        sub_opt.font_resolver = crate::FontResolver {
+        #[cfg(feature = "text")]
+        font_resolver: crate::FontResolver {
             select_font: Box::new(|font, db| (opt.font_resolver.select_font)(font, db)),
             select_fallback: Box::new(|c, used_fonts, db| {
                 (opt.font_resolver.select_fallback)(c, used_fonts, db)
             }),
-        };
-    }
+        },
+        ..Options::default()
+    };
 
     let tree = Tree::from_data(data, &sub_opt);
     let tree = match tree {

crates/usvg/src/parser/style.rs

@@ -160,14 +160,12 @@ fn convert_paint(
         svgtypes::Paint::ContextFill => state
             .context_element
             .clone()
-            .map(|(f, _)| f)
-            .flatten()
+            .and_then(|(f, _)| f)
             .map(|f| (f.paint, f.context_element)),
         svgtypes::Paint::ContextStroke => state
             .context_element
             .clone()
-            .map(|(_, s)| s)
-            .flatten()
+            .and_then(|(_, s)| s)
             .map(|s| (s.paint, s.context_element)),
         svgtypes::Paint::CurrentColor => {
             let svg_color: svgtypes::Color = node

crates/usvg/src/parser/svgtree/mod.rs

@@ -155,7 +155,7 @@ pub(crate) struct NodeId(NonZeroU32);
 impl NodeId {
     #[inline]
     fn new(id: u32) -> Self {
-        debug_assert!(id < core::u32::MAX);
+        debug_assert!(id < u32::MAX);
 
         // We are using `NonZeroU32` to reduce overhead of `Option<NodeId>`.
         NodeId(NonZeroU32::new(id + 1).unwrap())
@@ -176,7 +176,7 @@ impl From<usize> for NodeId {
     #[inline]
     fn from(id: usize) -> Self {
         // We already checked that `id` is limited by u32::MAX.
-        debug_assert!(id <= core::u32::MAX as usize);
+        debug_assert!(id <= u32::MAX as usize);
         NodeId::new(id as u32)
     }
 }