VienDesu/schemars
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clippy fixes

Browse source
This commit is contained in:
Graham Esau 2019-09-03 19:28:17 +01:00
parent 9938c498a0
commit 717e3baed9
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
schemars/src/json_schema_impls.rs
View file

@ -131,7 +131,7 @@ macro_rules! array_impls {
} }
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 11 12 13 14 15 16 17 18 19 20
21 22 23 24 25 26 27 28 29 30 21 22 23 24 25 26 27 28 29 30
31 32 31 32

2
schemars/src/lib.rs
View file

@ -1,3 +1,5 @@
#![allow(clippy::large_enum_variant)]
pub type Map<K, V> = std::collections::BTreeMap<K, V>; pub type Map<K, V> = std::collections::BTreeMap<K, V>;
pub type Set<T> = std::collections::BTreeSet<T>; pub type Set<T> = std::collections::BTreeSet<T>;

10
schemars_derive/src/lib.rs
View file

@ -41,7 +41,7 @@ pub fn derive_json_schema(input: proc_macro::TokenStream) -> proc_macro::TokenSt
quote! { quote! {
#schema_base_name.to_owned() #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; let mut schema_name_fmt = schema_base_name;
schema_name_fmt.push_str("_For_{}"); schema_name_fmt.push_str("_For_{}");
schema_name_fmt.push_str(&"_And_{}".repeat(type_params.len() - 1)); 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 { match v.style {
Style::Unit => true, Style::Unit => true,
_ => false, _ => 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 { fn schema_for_external_tagged_enum(variants: &[Variant], cattrs: &attr::Container) -> TokenStream {
let (unit_variants, complex_variants): (Vec<_>, Vec<_>) = 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_count = unit_variants.len();
let unit_names = unit_variants let unit_names = unit_variants
@ -158,7 +158,7 @@ fn schema_for_internal_tagged_enum(
cattrs: &attr::Container, cattrs: &attr::Container,
tag_name: &str, tag_name: &str,
) -> TokenStream { ) -> TokenStream {
let schemas = variants.into_iter().map(|variant| { let schemas = variants.iter().map(|variant| {
let name = variant.attrs.name().deserialize_name(); let name = variant.attrs.name().deserialize_name();
let type_schema = wrap_schema_fields(quote! { let type_schema = wrap_schema_fields(quote! {
instance_type: Some(schemars::schema::InstanceType::String.into()), 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 { fn schema_for_untagged_enum(variants: &[Variant], cattrs: &attr::Container) -> TokenStream {
let schemas = variants let schemas = variants
.into_iter() .iter()
.map(|v| schema_for_untagged_enum_variant(v, cattrs)); .map(|v| schema_for_untagged_enum_variant(v, cattrs));
wrap_schema_fields(quote! { wrap_schema_fields(quote! {