From 5a4ac0fe462faf2a3ba3b3f4334863cdb4bbf45a Mon Sep 17 00:00:00 2001
From: Bardi Harborow <bardi@bardiharborow.com>
Date: Fri, 12 Jul 2019 04:43:41 +1000
Subject: Implement selected clippy recommendations.
---
askama_derive/src/generator.rs | 2 +-
askama_derive/src/input.rs | 11 ++++-------
askama_derive/src/parser.rs | 2 +-
3 files changed, 6 insertions(+), 9 deletions(-)
(limited to 'askama_derive')
diff --git a/askama_derive/src/generator.rs b/askama_derive/src/generator.rs
index aa91de0..7757016 100644
--- a/askama_derive/src/generator.rs
+++ b/askama_derive/src/generator.rs
@@ -109,7 +109,7 @@ impl<'a> Generator<'a> {
);
// Make sure the compiler understands that the generated code depends on the template files.
- for (path, _) in self.contexts {
+ for path in self.contexts.keys() {
// Skip the fake path of templates defined in rust source.
let path_is_valid = match self.input.source {
Source::Path(_) => true,
diff --git a/askama_derive/src/input.rs b/askama_derive/src/input.rs
index 0cc852c..0bf6093 100644
--- a/askama_derive/src/input.rs
+++ b/askama_derive/src/input.rs
@@ -4,7 +4,6 @@ use quote::ToTokens;
use askama_shared::{Config, Syntax};
-use std::io::{self, Write};
use std::path::PathBuf;
use syn;
@@ -146,12 +145,10 @@ impl<'a> TemplateInput<'a> {
};
if parent.is_some() {
- io::stderr()
- .write_fmt(format_args!(
- " --> in struct {}\n = use of deprecated field '_parent'\n",
- ast.ident
- ))
- .unwrap();
+ eprint!(
+ " --> in struct {}\n = use of deprecated field '_parent'\n",
+ ast.ident
+ );
}
// Validate syntax
diff --git a/askama_derive/src/parser.rs b/askama_derive/src/parser.rs
index a37a112..b8fa94d 100644
--- a/askama_derive/src/parser.rs
+++ b/askama_derive/src/parser.rs
@@ -117,7 +117,7 @@ fn split_ws_parts(s: &[u8]) -> Node {
(&s[..start], &s[start..], &s[0..0])
} else {
let end = end.unwrap();
- (&s[..start], &s[start..end + 1], &s[end + 1..])
+ (&s[..start], &s[start..=end], &s[end + 1..])
}
};
Node::Lit(
--
cgit