Switch HashMap to BTreeMap, lints

CHANGELOG.md

@@ -1,3 +1,7 @@
+<a name="v0.4.0"></a>
+### v0.4.0 (2022-11-19)
+* Switch all `HashMap` to `BTreeMap` for consistent serialization ordering
+
 <a name="v0.3.4"></a>
 ### v0.3.4 (2022-11-15)
 * Add proper `Error` implementation to `Bounds` and `Center` parsing errors

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tilejson"
-version = "0.3.4"
+version = "0.4.0"
 description = "Library for serializing the TileJSON file format"
 authors = [
     "Stepan Kuzmin <[email protected]>",
@@ -20,3 +20,10 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_tuple = "0.5"
 thiserror = "1"
+
+[lints.rust]
+unsafe_code = "forbid"
+unused_qualifications = "warn"
+
+[lints.clippy]
+pedantic = "warn"

src/bounds.rs

@@ -87,7 +87,7 @@ impl Display for Bounds {
     /// # use std::str::FromStr;
     /// let bounds = Bounds::new(-1.5, -2.5, 3.5, 4.5);
     /// assert_eq!(bounds.to_string(), "-1.5,-2.5,3.5,4.5");
-    /// assert_eq!(format!("{:.2}", bounds), "-1.50,-2.50,3.50,4.50");
+    /// assert_eq!(format!("{bounds:.2}"), "-1.50,-2.50,3.50,4.50");
     /// assert_eq!(Bounds::from_str(&bounds.to_string()).unwrap(), bounds);
     /// ```
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
@@ -322,15 +322,9 @@ impl FromStr for Bounds {
         let mut values = s.split(',');
         let mut result = [0.; 4];
         for val in &mut result {
-            *val = values
-                .next()
-                .ok_or(ParseBoundsError::BadLen)?
-                .trim()
-                .parse()?;
+            *val = values.next().ok_or(BadLen)?.trim().parse()?;
         }
-        values
-            .next()
-            .map_or(Ok(result.into()), |_| Err(ParseBoundsError::BadLen))
+        values.next().map_or(Ok(result.into()), |_| Err(BadLen))
     }
 }
 

src/center.rs

@@ -31,7 +31,7 @@ impl Display for Center {
     /// # use std::str::FromStr;
     /// let center = Center::new(1.5, -2.5, 8);
     /// assert_eq!(center.to_string(), "1.5,-2.5,8");
-    /// assert_eq!(format!("{:.2}", center), "1.50,-2.50,8");
+    /// assert_eq!(format!("{center:.2}"), "1.50,-2.50,8");
     /// assert_eq!(Center::from_str(&center.to_string()).unwrap(), center);
     /// ```
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {

src/tilejson.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -204,7 +204,7 @@ pub struct TileJSON {
 
     /// Any unrecognized fields will be stored here
     #[serde(flatten)]
-    pub other: HashMap<String, Value>,
+    pub other: BTreeMap<String, Value>,
 }
 
 impl TileJSON {
@@ -353,6 +353,34 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_other() {
+        let tilejson_str = r#"{
+        "tilejson": "3.0.0",
+        "attribution": "",
+        "name": "compositing",
+        "scheme": "tms",
+        "tiles": [
+            "http://localhost:8888/foo/{z}/{x}/{y}.png"
+        ],
+        "foo": "foo value",
+        "bar": "bar value"
+    }"#;
+
+        let tilejson: TileJSON = serde_json::from_str(tilejson_str).unwrap();
+        let mut expected = tilejson! {
+            tilejson: "3.0.0".to_string(),
+            tiles: vec!["http://localhost:8888/foo/{z}/{x}/{y}.png".to_string()],
+            attribution: "".to_string(),
+            name: "compositing".to_string(),
+            scheme: "tms".to_string(),
+        };
+        expected.other.insert("foo".to_string(), "foo value".into());
+        expected.other.insert("bar".to_string(), "bar value".into());
+
+        assert_eq!(tilejson, expected);
+    }
+
     #[test]
     fn test_writing() {
         let source = "http://localhost:8888/foo/{z}/{x}/{y}.png";
@@ -371,7 +399,7 @@ mod tests {
 
         let vl = VectorLayer::new(
             "a".to_string(),
-            HashMap::from([("b".to_string(), "c".to_string())]),
+            BTreeMap::from([("b".to_string(), "c".to_string())]),
         );
         let tj = tilejson! {
             source.to_string(),

src/vector_layer.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -66,7 +66,7 @@ pub struct VectorLayer {
     /// Each value (description) MUST be a string that describes the underlying data.
     /// If no fields are present, the fields key MUST be an empty object.
     /// <https://github.com/mapbox/tilejson-spec/tree/master/3.0.0#332-fields>
-    pub fields: HashMap<String, String>,
+    pub fields: BTreeMap<String, String>,
 
     /// A string representing a human-readable description of the entire layer's contents.
     ///
@@ -90,11 +90,11 @@ pub struct VectorLayer {
 
     /// Any unrecognized fields will be stored here.
     #[serde(flatten)]
-    pub other: HashMap<String, Value>,
+    pub other: BTreeMap<String, Value>,
 }
 
 impl VectorLayer {
-    pub fn new(id: String, fields: HashMap<String, String>) -> Self {
+    pub fn new(id: String, fields: BTreeMap<String, String>) -> Self {
         Self {
             id,
             fields,