clippy fixes

mzabaluev · Nov 9, 2017 · 23dce74 · 23dce74
1 parent d350b3f
commit 23dce74
Show file tree

Hide file tree

Showing 9 changed files with 137 additions and 136 deletions.
diff --git a/src/exec.rs b/src/exec.rs
diff --git a/src/funcs.rs b/src/funcs.rs
@@ -182,7 +182,7 @@ pub fn print(args: &[Arc<Any>]) -> Result<Arc<Any>, String> {
  let mut no_space = true;
  let mut s = String::new();
  for val in vals {
- if let &Value::String(ref v) = val {
+ if let Value::String(ref v) = *val {
  no_space = true;
  s.push_str(v);
  } else {
@@ -222,14 +222,14 @@ pub fn println(args: &[Arc<Any>]) -> Result<Arc<Any>, String> {
  Some(first_elt) => {
  let (lower, _) = iter.size_hint();
  let mut result = String::with_capacity(lower + 1);
- if let &&Value::String(ref v) = first_elt {
+ if let Value::String(ref v) = *(*first_elt) {
  result.push_str(v);
  } else {
  write!(&mut result, "{}", first_elt).unwrap();
  }
  for elt in iter {
  result.push_str(" ");
- if let &&Value::String(ref v) = elt {
+ if let Value::String(ref v) = *(*elt) {
  result.push_str(v);
  } else {
  write!(&mut result, "{}", elt).unwrap();

diff --git a/src/lexer.rs b/src/lexer.rs
@@ -1,3 +1,4 @@
+#[allow(unused_imports)] // for clippy
 use std::ascii::AsciiExt;
 use std::collections::HashMap;
 use std::fmt;

diff --git a/src/lib.rs b/src/lib.rs
@@ -48,5 +48,5 @@ pub use gtmpl_value::Value;
 pub fn template<T: Into<Value>>(template_str: &str, context: T) -> Result<String, String> {
  let mut tmpl = Template::default();
  tmpl.parse(template_str)?;
- tmpl.render(Context::from(context)?)
+ tmpl.render(&Context::from(context)?)
 }
diff --git a/src/node.rs b/src/node.rs
@@ -341,7 +341,7 @@ node!(
 );
 
 impl VariableNode {
- pub fn new(tr: TreeId, pos: Pos, ident: String) -> VariableNode {
+ pub fn new(tr: TreeId, pos: Pos, ident: &str) -> VariableNode {
  VariableNode {
  typ: NodeType::Variable,
  tr,
@@ -404,7 +404,7 @@ node!(
 );
 
 impl FieldNode {
- pub fn new(tr: TreeId, pos: Pos, ident: String) -> FieldNode {
+ pub fn new(tr: TreeId, pos: Pos, ident: &str) -> FieldNode {
  FieldNode {
  typ: NodeType::Field,
  tr,
@@ -517,9 +517,9 @@ impl NumberNode {
  tr: TreeId,
  pos: Pos,
  text: String,
- item_typ: ItemType,
+ item_typ: &ItemType,
  ) -> Result<NumberNode, Error> {
- match item_typ {
+ match *item_typ {
  ItemType::ItemCharConstant => {
  unquote_char(&text, '\'')
  .and_then(|c| {