From 717e3baed95e513186b18b8f17473ad0e99ed1c8 Mon Sep 17 00:00:00 2001
From: Graham Esau <gesau@hotmail.co.uk>
Date: Tue, 3 Sep 2019 19:28:17 +0100
Subject: [PATCH] Clippy fixes

---
 schemars/src/json_schema_impls.rs |  2 +-
 schemars/src/lib.rs               |  2 ++
 schemars_derive/src/lib.rs        | 10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/schemars/src/json_schema_impls.rs b/schemars/src/json_schema_impls.rs
index 89dbad1..dae6098 100644
--- a/schemars/src/json_schema_impls.rs
+++ b/schemars/src/json_schema_impls.rs
@@ -131,7 +131,7 @@ macro_rules! array_impls {
 }
 
 array_impls! {
-    01 02 03 04 05 06 07 08 09 10
+     1  2  3  4  5  6  7  8  9 10
     11 12 13 14 15 16 17 18 19 20
     21 22 23 24 25 26 27 28 29 30
     31 32
diff --git a/schemars/src/lib.rs b/schemars/src/lib.rs
index 7d45fbd..99987f5 100644
--- a/schemars/src/lib.rs
+++ b/schemars/src/lib.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::large_enum_variant)]
+
 pub type Map<K, V> = std::collections::BTreeMap<K, V>;
 pub type Set<T> = std::collections::BTreeSet<T>;
 
diff --git a/schemars_derive/src/lib.rs b/schemars_derive/src/lib.rs
index c82777d..d9288dc 100644
--- a/schemars_derive/src/lib.rs
+++ b/schemars_derive/src/lib.rs
@@ -41,7 +41,7 @@ pub fn derive_json_schema(input: proc_macro::TokenStream) -> proc_macro::TokenSt
         quote! {
             #schema_base_name.to_owned()
         }
-    } else if schema_base_name == type_name.to_string() {
+    } else if type_name == schema_base_name {
         let mut schema_name_fmt = schema_base_name;
         schema_name_fmt.push_str("_For_{}");
         schema_name_fmt.push_str(&"_And_{}".repeat(type_params.len() - 1));
@@ -93,7 +93,7 @@ fn compile_error(span: Span, message: String) -> TokenStream {
     }
 }
 
-fn is_unit_variant(v: &&Variant) -> bool {
+fn is_unit_variant(v: &Variant) -> bool {
     match v.style {
         Style::Unit => true,
         _ => false,
@@ -111,7 +111,7 @@ fn schema_for_enum(variants: &[Variant], cattrs: &attr::Container) -> TokenStrea
 
 fn schema_for_external_tagged_enum(variants: &[Variant], cattrs: &attr::Container) -> TokenStream {
     let (unit_variants, complex_variants): (Vec<_>, Vec<_>) =
-        variants.into_iter().partition(is_unit_variant);
+        variants.iter().partition(|v| is_unit_variant(v));
     let unit_count = unit_variants.len();
 
     let unit_names = unit_variants
@@ -158,7 +158,7 @@ fn schema_for_internal_tagged_enum(
     cattrs: &attr::Container,
     tag_name: &str,
 ) -> TokenStream {
-    let schemas = variants.into_iter().map(|variant| {
+    let schemas = variants.iter().map(|variant| {
         let name = variant.attrs.name().deserialize_name();
         let type_schema = wrap_schema_fields(quote! {
             instance_type: Some(schemars::schema::InstanceType::String.into()),
@@ -194,7 +194,7 @@ fn schema_for_internal_tagged_enum(
 
 fn schema_for_untagged_enum(variants: &[Variant], cattrs: &attr::Container) -> TokenStream {
     let schemas = variants
-        .into_iter()
+        .iter()
         .map(|v| schema_for_untagged_enum_variant(v, cattrs));
 
     wrap_schema_fields(quote! {