mirror of
https://github.com/getzola/zola
synced 2024-12-13 13:52:28 +00:00
Fix clippy warnings (#1618)
Fixes clippy warnings for the `needless_borrow` lint.
https://rust-lang.github.io/rust-clippy/master/index.html#needless_borrow
Removes the unused `starts_with_schema` function
(dead code since 4086b075
).
This commit is contained in:
parent
7a0cf261bf
commit
aaa25cee2a
3 changed files with 9 additions and 38 deletions
|
@ -236,7 +236,7 @@ mod tests {
|
||||||
let syntax_and_theme = resolve_syntax_and_theme(Some("py"), &config);
|
let syntax_and_theme = resolve_syntax_and_theme(Some("py"), &config);
|
||||||
let mut highlighter = SyntaxHighlighter::new(false, syntax_and_theme);
|
let mut highlighter = SyntaxHighlighter::new(false, syntax_and_theme);
|
||||||
let mut out = String::new();
|
let mut out = String::new();
|
||||||
for line in LinesWithEndings::from(&code) {
|
for line in LinesWithEndings::from(code) {
|
||||||
out.push_str(&highlighter.highlight_line(line));
|
out.push_str(&highlighter.highlight_line(line));
|
||||||
}
|
}
|
||||||
assert!(!out.contains("<script>"));
|
assert!(!out.contains("<script>"));
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
use lazy_static::lazy_static;
|
use lazy_static::lazy_static;
|
||||||
use pulldown_cmark as cmark;
|
use pulldown_cmark as cmark;
|
||||||
use regex::Regex;
|
|
||||||
|
|
||||||
use crate::context::RenderContext;
|
use crate::context::RenderContext;
|
||||||
use crate::table_of_contents::{make_table_of_contents, Heading};
|
use crate::table_of_contents::{make_table_of_contents, Heading};
|
||||||
|
@ -59,21 +58,6 @@ fn find_anchor(anchors: &[String], name: String, level: u16) -> String {
|
||||||
find_anchor(anchors, name, level + 1)
|
find_anchor(anchors, name, level + 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns whether the given string starts with a schema.
|
|
||||||
///
|
|
||||||
/// Although there exists [a list of registered URI schemes][uri-schemes], a link may use arbitrary,
|
|
||||||
/// private schemes. This function checks if the given string starts with something that just looks
|
|
||||||
/// like a scheme, i.e., a case-insensitive identifier followed by a colon.
|
|
||||||
///
|
|
||||||
/// [uri-schemes]: https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml
|
|
||||||
fn starts_with_schema(s: &str) -> bool {
|
|
||||||
lazy_static! {
|
|
||||||
static ref PATTERN: Regex = Regex::new(r"^[0-9A-Za-z\-]+:").unwrap();
|
|
||||||
}
|
|
||||||
|
|
||||||
PATTERN.is_match(s)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Returns whether a link starts with an HTTP(s) scheme.
|
/// Returns whether a link starts with an HTTP(s) scheme.
|
||||||
fn is_external_link(link: &str) -> bool {
|
fn is_external_link(link: &str) -> bool {
|
||||||
link.starts_with("http:") || link.starts_with("https:")
|
link.starts_with("http:") || link.starts_with("https:")
|
||||||
|
@ -368,25 +352,6 @@ pub fn markdown_to_html(content: &str, context: &RenderContext) -> Result<Render
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_starts_with_schema() {
|
|
||||||
// registered
|
|
||||||
assert!(starts_with_schema("https://example.com/"));
|
|
||||||
assert!(starts_with_schema("ftp://example.com/"));
|
|
||||||
assert!(starts_with_schema("mailto:user@example.com"));
|
|
||||||
assert!(starts_with_schema("xmpp:node@example.com"));
|
|
||||||
assert!(starts_with_schema("tel:18008675309"));
|
|
||||||
assert!(starts_with_schema("sms:18008675309"));
|
|
||||||
assert!(starts_with_schema("h323:user@example.com"));
|
|
||||||
|
|
||||||
// arbitrary
|
|
||||||
assert!(starts_with_schema("zola:post?content=hi"));
|
|
||||||
|
|
||||||
// case-insensitive
|
|
||||||
assert!(starts_with_schema("MailTo:user@example.com"));
|
|
||||||
assert!(starts_with_schema("MAILTO:user@example.com"));
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_is_external_link() {
|
fn test_is_external_link() {
|
||||||
assert!(is_external_link("http://example.com/"));
|
assert!(is_external_link("http://example.com/"));
|
||||||
|
|
|
@ -96,7 +96,7 @@ impl DataSource {
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(path) = path_arg {
|
if let Some(path) = path_arg {
|
||||||
return match search_for_file(&base_path, &path, &theme, &output_path)
|
return match search_for_file(base_path, &path, theme, output_path)
|
||||||
.map_err(|e| format!("`load_data`: {}", e))?
|
.map_err(|e| format!("`load_data`: {}", e))?
|
||||||
{
|
{
|
||||||
Some((f, _)) => Ok(Some(DataSource::Path(f))),
|
Some((f, _)) => Ok(Some(DataSource::Path(f))),
|
||||||
|
@ -226,7 +226,13 @@ impl TeraFn for LoadData {
|
||||||
|
|
||||||
// If the file doesn't exist, source is None
|
// If the file doesn't exist, source is None
|
||||||
let data_source = match (
|
let data_source = match (
|
||||||
DataSource::from_args(path_arg.clone(), url_arg, &self.base_path, &self.theme, &self.output_path),
|
DataSource::from_args(
|
||||||
|
path_arg.clone(),
|
||||||
|
url_arg,
|
||||||
|
&self.base_path,
|
||||||
|
&self.theme,
|
||||||
|
&self.output_path,
|
||||||
|
),
|
||||||
required,
|
required,
|
||||||
) {
|
) {
|
||||||
// If the file was not required, return a Null value to the template
|
// If the file was not required, return a Null value to the template
|
||||||
|
|
Loading…
Reference in a new issue