[librsvg: 6/13] Rename DifferentUriSchemes variant per clippy
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 6/13] Rename DifferentUriSchemes variant per clippy
- Date: Mon, 12 Apr 2021 16:15:01 +0000 (UTC)
commit 4459c42b7678b589b0681006859c999493e4d449
Author: Federico Mena Quintero <federico gnome org>
Date: Mon Apr 12 10:21:09 2021 -0500
Rename DifferentUriSchemes variant per clippy
src/error.rs | 4 ++--
src/url_resolver.rs | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/error.rs b/src/error.rs
index 75bd25b4..afe422a2 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -284,7 +284,7 @@ pub enum AllowedUrlError {
BaseRequired,
/// Cannot reference a file with a different URI scheme from the base file
- DifferentURISchemes,
+ DifferentUriSchemes,
/// Some scheme we don't allow loading
DisallowedScheme,
@@ -308,7 +308,7 @@ impl fmt::Display for AllowedUrlError {
match *self {
AllowedUrlError::UrlParseError(e) => write!(f, "URL parse error: {}", e),
AllowedUrlError::BaseRequired => write!(f, "base required"),
- AllowedUrlError::DifferentURISchemes => write!(f, "different URI schemes"),
+ AllowedUrlError::DifferentUriSchemes => write!(f, "different URI schemes"),
AllowedUrlError::DisallowedScheme => write!(f, "disallowed scheme"),
AllowedUrlError::NotSiblingOrChildOfBaseFile => {
write!(f, "not sibling or child of base file")
diff --git a/src/url_resolver.rs b/src/url_resolver.rs
index 9155072d..954430c0 100644
--- a/src/url_resolver.rs
+++ b/src/url_resolver.rs
@@ -49,7 +49,7 @@ impl UrlResolver {
// Deny loads from differing URI schemes
if url.scheme() != base_url.scheme() {
- return Err(AllowedUrlError::DifferentURISchemes);
+ return Err(AllowedUrlError::DifferentUriSchemes);
}
// resource: is allowed to load anything from other resources
@@ -149,7 +149,7 @@ mod tests {
));
assert!(matches!(
url_resolver.resolve_href("file:///etc/passwd"),
- Err(AllowedUrlError::DifferentURISchemes)
+ Err(AllowedUrlError::DifferentUriSchemes)
));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]