Slightly abstract away map/set types

schemars/src/gen.rs

@@ -1,7 +1,6 @@
 use crate::make_schema::MakeSchema;
 use crate::schema::*;
-use crate::{MakeSchemaError, Result};
+use crate::{MakeSchemaError, Map, Result};
-use std::collections::BTreeMap as Map;
 
 #[derive(Debug, PartialEq, Clone)]
 pub struct SchemaSettings {

schemars/src/lib.rs

@@ -1,13 +1,15 @@
+pub type Map<K, V> = std::collections::BTreeMap<K, V>;
+pub type Set<T> = std::collections::BTreeSet<T>;
+
 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::*;

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 {

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)]

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
         },