summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarge Bot <marge-bot@gnome.org>2022-11-09 13:26:31 +0000
committerMarge Bot <marge-bot@gnome.org>2022-11-09 13:26:31 +0000
commit46cf63339df2262973b87856088ff9f59b15ec55 (patch)
treea807638488a0b74f5754bab80dda54e617b94a8b
parent05542bbb120bc96bc76a868e2efc8d5eaf21c184 (diff)
parent8702623d64436d0e439de0b382ab21ec103589d1 (diff)
downloadlibrsvg-46cf63339df2262973b87856088ff9f59b15ec55.tar.gz
Merge branch 'happier_clippy' into 'main'
Make clippy happier See merge request GNOME/librsvg!766
-rw-r--r--src/bin/rsvg-convert.rs2
-rw-r--r--src/text.rs2
-rw-r--r--src/url_resolver.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/bin/rsvg-convert.rs b/src/bin/rsvg-convert.rs
index 54d8c958..8c9a9aa2 100644
--- a/src/bin/rsvg-convert.rs
+++ b/src/bin/rsvg-convert.rs
@@ -1048,7 +1048,7 @@ fn parse_args() -> Result<Converter, Error> {
let background_str: &String = matches
.get_one("background")
.expect("already provided default_value");
- let background_color: Option<Color> = parse_background_color(&**background_str)
+ let background_color: Option<Color> = parse_background_color(background_str)
.map_err(|e| clap::Error::raw(clap::error::ErrorKind::InvalidValue, e))?;
// librsvg expects ids starting with '#', so it can lookup ids in externs like "subfile.svg#subid".
diff --git a/src/text.rs b/src/text.rs
index dceae602..a02b5077 100644
--- a/src/text.rs
+++ b/src/text.rs
@@ -655,7 +655,7 @@ impl Chars {
depth: usize,
link_target: Option<String>,
) -> Span {
- self.ensure_normalized_string(node, &*values);
+ self.ensure_normalized_string(node, &values);
Span::new(
self.space_normalized.borrow().as_ref().unwrap(),
diff --git a/src/url_resolver.rs b/src/url_resolver.rs
index 06e70dda..4ec9c07c 100644
--- a/src/url_resolver.rs
+++ b/src/url_resolver.rs
@@ -82,7 +82,7 @@ impl UrlResolver {
let url_canon =
canonicalize(&url_path).map_err(|_| AllowedUrlError::CanonicalizationError)?;
let parent_canon =
- canonicalize(&base_parent).map_err(|_| AllowedUrlError::CanonicalizationError)?;
+ canonicalize(base_parent).map_err(|_| AllowedUrlError::CanonicalizationError)?;
if url_canon.starts_with(parent_canon) {
Ok(AllowedUrl(url))