diff --git a/schemars/src/gen.rs b/schemars/src/gen.rs index 935c398..8523908 100644 --- a/schemars/src/gen.rs +++ b/schemars/src/gen.rs @@ -1,7 +1,6 @@ use crate::make_schema::MakeSchema; use crate::schema::*; -use crate::{MakeSchemaError, Result}; -use std::collections::BTreeMap as Map; +use crate::{MakeSchemaError, Map, Result}; #[derive(Debug, PartialEq, Clone)] pub struct SchemaSettings { diff --git a/schemars/src/lib.rs b/schemars/src/lib.rs index 5b36794..e522677 100644 --- a/schemars/src/lib.rs +++ b/schemars/src/lib.rs @@ -1,13 +1,15 @@ +pub type Map = std::collections::BTreeMap; +pub type Set = std::collections::BTreeSet; + pub mod gen; -pub mod make_schema; pub mod schema; mod error; +mod make_schema; #[macro_use] mod macros; pub use error::*; - pub use make_schema::MakeSchema; pub use schemars_derive::*; diff --git a/schemars/src/make_schema.rs b/schemars/src/make_schema.rs index dea9770..c748d52 100644 --- a/schemars/src/make_schema.rs +++ b/schemars/src/make_schema.rs @@ -1,8 +1,7 @@ use crate::gen::{BoolSchemas, SchemaGenerator}; use crate::schema::*; -use crate::Result; +use crate::{Map, Result}; use serde_json::json; -use std::collections::BTreeMap as Map; pub trait MakeSchema { fn is_referenceable() -> bool { diff --git a/schemars/src/schema.rs b/schemars/src/schema.rs index a645642..3afe4c8 100644 --- a/schemars/src/schema.rs +++ b/schemars/src/schema.rs @@ -1,9 +1,7 @@ use crate as schemars; -use crate::{MakeSchema, MakeSchemaError, Result}; +use crate::{MakeSchema, MakeSchemaError, Map, Result, Set}; use serde::{Deserialize, Serialize}; use serde_json::Value; -use std::collections::BTreeMap as Map; -use std::collections::BTreeSet as Set; #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, MakeSchema)] #[serde(untagged)] diff --git a/schemars_derive/src/lib.rs b/schemars_derive/src/lib.rs index c3ba663..9c47c6f 100644 --- a/schemars_derive/src/lib.rs +++ b/schemars_derive/src/lib.rs @@ -135,7 +135,7 @@ fn schema_for_external_tagged_enum(variants: &[Variant], cattrs: &attr::Containe wrap_schema_fields(quote! { instance_type: Some(schemars::schema::InstanceType::Object.into()), properties: { - let mut props = std::collections::BTreeMap::new(); + let mut props = schemars::Map::new(); props.insert(#name.to_owned(), #sub_schema); props }, @@ -198,12 +198,12 @@ fn schema_for_struct(fields: &[Field], cattrs: &attr::Container) -> TokenStream let schema = wrap_schema_fields(quote! { instance_type: Some(schemars::schema::InstanceType::Object.into()), properties: { - let mut props = std::collections::BTreeMap::new(); + let mut props = schemars::Map::new(); #(#recurse)* props }, required: { - let mut required = std::collections::BTreeSet::new(); + let mut required = schemars::Set::new(); #(required.insert(#required.to_owned());)* required },