Merge pull request #3 from duckontheweb/raw-identifiers

Use raw identifiers for type attribute
duckontheweb · Jun 26, 2021 · 1688b4a · 1688b4a
2 parents 78af3e1 + 7889fa5
commit 1688b4a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/rustac-core/src/lib.rs b/rustac-core/src/lib.rs
@@ -111,7 +111,7 @@
 //!   let item: Item = serde_json::from_value(example)?;
 //!
 //!   assert_eq!(item.stac_version, Version::parse("1.0.0-rc.2")?);
-//!   assert_eq!(item.type_, String::from("Feature"));
+//!   assert_eq!(item.r#type, String::from("Feature"));
 //!
 //!   Ok(())
 //! }

diff --git a/rustac-core/src/types/catalog.rs b/rustac-core/src/types/catalog.rs
@@ -14,8 +14,7 @@ pub struct Catalog {
 
     /// Set to Catalog if this Catalog only implements the Catalog spec.
     /// **This maps to the STAC `"type"` attribute, which is a reserved keyword.**
-    #[serde(rename = "type")]
-    pub type_: String,
+    pub r#type: String,
 
     /// A list of extension identifiers the Catalog implements.
     #[serde(skip_serializing_if = "Option::is_none")]

diff --git a/rustac-core/src/types/collection.rs b/rustac-core/src/types/collection.rs
@@ -18,8 +18,7 @@ pub struct Collection {
 
     /// Must be set to `"Collection"` to be a valid Collection.
     /// **This maps to the STAC `"type"` attribute, which is a reserved keyword.**
-    #[serde(rename = "type")]
-    pub type_: String,
+    pub r#type: String,
 
     /// A list of extension identifiers the Collection implements.
     #[serde(skip_serializing_if = "Option::is_none")]

diff --git a/rustac-core/src/types/common.rs b/rustac-core/src/types/common.rs
@@ -91,9 +91,8 @@ pub struct Asset {
     /// [Media type](https://github.com/radiantearth/stac-spec/blob/v1.0.0-rc.1/item-spec/item-spec.md#asset-media-type) of the asset.
     /// See the [common media types](https://github.com/radiantearth/stac-spec/blob/v1.0.0-rc.1/best-practices.md#common-media-types-in-stac)
     /// in the best practice doc for commonly used asset types.
-    #[serde(rename = "type")]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub type_: Option<String>,
+    pub r#type: Option<String>,
 
     /// The [semantic roles](https://github.com/radiantearth/stac-spec/blob/v1.0.0-rc.1/item-spec/item-spec.md#asset-role-types) of the asset,
     /// similar to the use of rel in links.
@@ -122,9 +121,8 @@ pub struct Link {
     pub rel: String,
 
     /// [Media type](https://github.com/radiantearth/stac-spec/blob/v1.0.0-rc.1/catalog-spec/catalog-spec.md#media-types) of the referenced entity.
-    #[serde(rename = "type")]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub type_: Option<String>,
+    pub r#type: Option<String>,
 
     /// A human readable title to be used in rendered displays of the link.
     #[serde(skip_serializing_if = "Option::is_none")]

diff --git a/rustac-core/src/types/item.rs b/rustac-core/src/types/item.rs
@@ -24,8 +24,7 @@ pub struct Item {
     pub id: String,
 
     /// Type of the GeoJSON Object. MUST be set to `"Feature"`.
-    #[serde(rename = "type")]
-    pub type_: String,
+    pub r#type: String,
 
     /// Defines the full footprint of the asset represented by this item. Coordinates are specified in Longitude/Latitude or Longitude/Latitude/Elevation based on WGS 84.
     pub geometry: Geometry,