Fix clippy lints

huntiep · Jul 5, 2017 · 985aa0e · 985aa0e
1 parent 3e8e092
commit 985aa0e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/libs/bart_derive/src/generator.rs b/libs/bart_derive/src/generator.rs
@@ -59,15 +59,15 @@ pub fn generate(node: ast::Ast, scope_level: u32, partials_resolver: &mut Partia
         Iteration { name, nested } => {
             let (name, scope_variable, nested) = scope(name, scope_level, *nested, partials_resolver);
             quote! {
-                for ref #scope_variable in (&#name).into_iter() {
+                for #scope_variable in #name.iter() {
                     #nested
                 }
             }
         },
         NegativeIteration { name, nested } => {
             let (name, scope_variable, nested) = scope(name, scope_level, *nested, partials_resolver);
             quote! {
-                for ref #scope_variable in _bart::NegativeIterator::neg_iter(&#name) {
+                for #scope_variable in _bart::NegativeIterator::neg_iter(&#name) {
                     #nested
                 }
             }
@@ -76,7 +76,7 @@ pub fn generate(node: ast::Ast, scope_level: u32, partials_resolver: &mut Partia
             let (name, scope_variable, nested) = scope(name, scope_level, *nested, partials_resolver);
             quote! {
                 if _bart::Conditional::val(&#name) {
-                    let ref #scope_variable = #name;
+                    let #scope_variable = &#name;
                     #nested
                 }
             }
@@ -85,7 +85,7 @@ pub fn generate(node: ast::Ast, scope_level: u32, partials_resolver: &mut Partia
             let (name, scope_variable, nested) = scope(name, scope_level, *nested, partials_resolver);
             quote! {
                 if !_bart::Conditional::val(&#name) {
-                    let ref #scope_variable = #name;
+                    let #scope_variable = &#name;
                     #nested
                 }
             }
@@ -94,7 +94,7 @@ pub fn generate(node: ast::Ast, scope_level: u32, partials_resolver: &mut Partia
             let (name, scope_variable, nested) = scope(name, scope_level, *nested, partials_resolver);
             quote! {
                 {
-                    let ref #scope_variable = #name;
+                    let #scope_variable = &#name;
                     #nested
                 }
             }
@@ -104,7 +104,7 @@ pub fn generate(node: ast::Ast, scope_level: u32, partials_resolver: &mut Partia
             let nested = partials_resolver.generate_partial(partial_name);
             quote! {
                 {
-                    let ref _s0 = #root;
+                    let _s0 = &#root;
                     #nested
                 }
             }

diff --git a/libs/bart_derive/src/lib.rs b/libs/bart_derive/src/lib.rs
@@ -131,7 +131,7 @@ pub fn bart_display(input: TokenStream) -> TokenStream {
                         let _ = include_bytes!(#dependencies);
                     )*
 
-                    let ref _s0 = #template_root;
+                    let _s0 = &#template_root;
 
                     #generated
 

diff --git a/src/display_html_safe.rs b/src/display_html_safe.rs
@@ -24,7 +24,7 @@ named!(part(&str) -> &str,
 impl<'a> Write for EscapingWriter<'a> {
     fn write_str(&mut self, buf: &str) -> fmt::Result {
         let mut rest = buf;
-        while let IResult::Done(new_rest, parsed) = part(&rest) {
+        while let IResult::Done(new_rest, parsed) = part(rest) {
             self.inner.write_str(parsed)?;
             rest = new_rest;
         }
@@ -104,4 +104,4 @@ mod test {
             format!("{}", Fake { text: "<te&\"xt'" })
         );
     }
-}
+}
diff --git a/src/negative_iterator.rs b/src/negative_iterator.rs
@@ -12,9 +12,9 @@ impl<T> NegativeIterator for Option<T> {
     type IntoIter = <Option<()> as IntoIterator>::IntoIter;
 
     fn neg_iter(&self) -> Self::IntoIter {
-        match self {
-            &Some(_) => None,
-            &None => Some(())
+        match *self {
+            Some(_) => None,
+            None => Some(())
         }.into_iter()
     }
 }
@@ -24,9 +24,9 @@ impl<'a, T, E> NegativeIterator for &'a Result<T, E> {
     type IntoIter = <Option<&'a E> as IntoIterator>::IntoIter;
 
     fn neg_iter(&self) -> Self::IntoIter {
-        match *self {
-            &Ok(_) => None,
-            &Err(ref err) => Some(err)
+        match *(*self) {
+            Ok(_) => None,
+            Err(ref err) => Some(err)
         }.into_iter()
     }
 }
@@ -68,9 +68,9 @@ mod test {
     fn result_err() {
         let mut iterations = 0;
         let result: Result<i32, i32> = Err(5);
-        for ref x in (&result).neg_iter() {
+        for x in (&result).neg_iter() {
             iterations += 1;
-            assert_eq!(&&5, x);
+            assert_eq!(&5, x);
         }
         assert_eq!(1, iterations);
     }