Rename SchemaRef to Ref

schemars/Cargo.toml

@@ -2,16 +2,16 @@
 name = "schemars"
 description = "Generate JSON Schemas from Rust code"
 repository = "https://github.com/GREsau/schemars"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Graham Esau <gesau@hotmail.co.uk>"]
 edition = "2018"
 license = "MIT"
 keywords = ["rust", "json-schema", "serde"]
 
 [dependencies]
+schemars_derive = { version = "0.1.0", path = "../schemars_derive" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-schemars_derive = { version = "0.1.0", path = "../schemars_derive" }
 
 [dev-dependencies]
 pretty_assertions = "0.6.1"

schemars/src/gen.rs

@@ -95,7 +95,7 @@ impl SchemaGenerator {
             self.insert_new_subschema_for::<T>(name.clone())?;
         }
         let reference = format!("{}{}", self.settings().definitions_path, name);
-        Ok(SchemaRef { reference }.into())
+        Ok(Ref { reference }.into())
     }
 
     fn insert_new_subschema_for<T: ?Sized + MakeSchema>(&mut self, name: String) -> Result<()> {

schemars/src/schema.rs

@@ -7,7 +7,7 @@ use serde_json::Value;
 #[serde(untagged)]
 pub enum Schema {
     Bool(bool),
-    Ref(SchemaRef),
+    Ref(Ref),
     Object(SchemaObject),
 }
 
@@ -23,8 +23,8 @@ impl From<bool> for Schema {
     }
 }
 
-impl From<SchemaRef> for Schema {
-    fn from(r: SchemaRef) -> Self {
+impl From<Ref> for Schema {
+    fn from(r: Ref) -> Self {
         Schema::Ref(r)
     }
 }
@@ -87,7 +87,7 @@ impl Schema {
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, MakeSchema)]
-pub struct SchemaRef {
+pub struct Ref {
     #[serde(rename = "$ref")]
     pub reference: String,
 }

schemars/tests/expected/schema-openapi3.json

@@ -6,7 +6,7 @@
       "type": "boolean"
     },
     {
-      "$ref": "#/components/schemas/SchemaRef"
+      "$ref": "#/components/schemas/Ref"
     },
     {
       "$ref": "#/components/schemas/SchemaObject"
@@ -30,7 +30,7 @@
           "type": "boolean"
         },
         {
-          "$ref": "#/components/schemas/SchemaRef"
+          "$ref": "#/components/schemas/Ref"
         },
         {
           "$ref": "#/components/schemas/SchemaObject"
@@ -97,7 +97,7 @@
               "type": "boolean"
             },
             {
-              "$ref": "#/components/schemas/SchemaRef"
+              "$ref": "#/components/schemas/Ref"
             },
             {
               "$ref": "#/components/schemas/SchemaObject"
@@ -145,7 +145,7 @@
       },
       "additionalProperties": true
     },
-    "SchemaRef": {
+    "Ref": {
       "type": "object",
       "properties": {
         "$ref": {

schemars/tests/expected/schema.json

@@ -6,7 +6,7 @@
       "type": "boolean"
     },
     {
-      "$ref": "#/definitions/SchemaRef"
+      "$ref": "#/definitions/Ref"
     },
     {
       "$ref": "#/definitions/SchemaObject"
@@ -30,7 +30,7 @@
           "type": "boolean"
         },
         {
-          "$ref": "#/definitions/SchemaRef"
+          "$ref": "#/definitions/Ref"
         },
         {
           "$ref": "#/definitions/SchemaObject"
@@ -181,7 +181,7 @@
       },
       "additionalProperties": true
     },
-    "SchemaRef": {
+    "Ref": {
       "type": "object",
       "properties": {
         "$ref": {