Add some benches and some internal cleanup

benches/parse.rs

@@ -4,7 +4,7 @@ extern crate wkt;
 
 use std::str::FromStr;
 
-fn criterion_benchmark(c: &mut criterion::Criterion) {
+fn bench_parse(c: &mut criterion::Criterion) {
     c.bench_function("parse small", |bencher| {
         let s = include_str!("./small.wkt");
         bencher.iter(|| {
@@ -20,5 +20,21 @@ fn criterion_benchmark(c: &mut criterion::Criterion) {
     });
 }
 
-criterion_group!(benches, criterion_benchmark);
+fn bench_parse_to_geo(c: &mut criterion::Criterion) {
+    c.bench_function("parse small to geo", |bencher| {
+        let s = include_str!("./small.wkt");
+        bencher.iter(|| {
+            let _ = geo_types::Geometry::try_from(wkt::Wkt::<f64>::from_str(s).unwrap());
+        });
+    });
+
+    c.bench_function("parse big to geo", |bencher| {
+        let s = include_str!("./big.wkt");
+        bencher.iter(|| {
+            let _ = geo_types::Geometry::try_from(wkt::Wkt::<f64>::from_str(s).unwrap());
+        });
+    });
+}
+
+criterion_group!(benches, bench_parse, bench_parse_to_geo);
 criterion_main!(benches);

benches/write.rs

@@ -0,0 +1,68 @@
+#[macro_use]
+extern crate criterion;
+
+extern crate wkt;
+use wkt::ToWkt;
+
+use std::str::FromStr;
+
+fn wkt_to_string(c: &mut criterion::Criterion) {
+    c.bench_function("to_string small wkt", |bencher| {
+        let s = include_str!("./small.wkt");
+        let w = wkt::Wkt::<f64>::from_str(s).unwrap();
+        bencher.iter(|| {
+            let _ = w.to_string();
+        });
+    });
+
+    c.bench_function("to_string big wkt", |bencher| {
+        let s = include_str!("./big.wkt");
+        let w = wkt::Wkt::<f64>::from_str(s).unwrap();
+        bencher.iter(|| {
+            let _ = w.to_string();
+        });
+    });
+}
+
+fn geo_to_wkt_string(c: &mut criterion::Criterion) {
+    c.bench_function("geo: serialize small wkt string", |bencher| {
+        let s = include_str!("./small.wkt");
+        let w = wkt::Wkt::<f64>::from_str(s).unwrap();
+        let g = geo_types::Geometry::try_from(w).unwrap();
+        bencher.iter(|| {
+            let _ = g.wkt_string();
+        });
+    });
+
+    c.bench_function("geo: serialize big wkt string", |bencher| {
+        let s = include_str!("./big.wkt");
+        let w = wkt::Wkt::<f64>::from_str(s).unwrap();
+        let g = geo_types::Geometry::try_from(w).unwrap();
+        bencher.iter(|| {
+            let _ = g.wkt_string();
+        });
+    });
+}
+
+fn geo_write_wkt(c: &mut criterion::Criterion) {
+    c.bench_function("geo: write small wkt", |bencher| {
+        let s = include_str!("./small.wkt");
+        let w = wkt::Wkt::<f64>::from_str(s).unwrap();
+        let g = geo_types::Geometry::try_from(w).unwrap();
+        bencher.iter(|| {
+            let _ = g.write_wkt(std::io::sink());
+        });
+    });
+
+    c.bench_function("geo: write big wkt", |bencher| {
+        let s = include_str!("./big.wkt");
+        let w = wkt::Wkt::<f64>::from_str(s).unwrap();
+        let g = geo_types::Geometry::try_from(w).unwrap();
+        bencher.iter(|| {
+            let _ = g.write_wkt(std::io::sink());
+        });
+    });
+}
+
+criterion_group!(benches, wkt_to_string, geo_to_wkt_string, geo_write_wkt);
+criterion_main!(benches);

src/geo_types_from_wkt.rs

@@ -1,11 +1,6 @@
 //! This module provides conversions between WKT primitives and [`geo_types`] primitives.
 //!
 //! See the [`std::convert::From`] and [`std::convert::TryFrom`] impls on individual [`crate::types`] and [`Wkt`] for details.
-//!
-//!
-//!
-//!
-//!
 // Copyright 2014-2018 The GeoRust Developers
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

src/lib.rs

@@ -27,7 +27,6 @@
 //! use wkt::Wkt;
 //! let point: Wkt<f64> = Wkt::from_str("POINT(10 20)").unwrap();
 //! ```
-//!
 #![cfg_attr(feature = "geo-types", doc = "```")]
 #![cfg_attr(not(feature = "geo-types"), doc = "```ignore")]
 //! // Convert to a geo_types primitive from a Wkt struct
@@ -58,9 +57,6 @@
 //!     }
 //!     _ => unreachable!(),
 //! };
-//!
-//!
-//!
 use std::default::Default;
 use std::fmt;
 use std::str::FromStr;
@@ -74,8 +70,8 @@ use crate::types::MultiPolygon;
 use crate::types::Point;
 use crate::types::Polygon;
 
+mod to_wkt;
 mod tokenizer;
-mod towkt;
 
 /// `WKT` primitive types and collections
 pub mod types;
@@ -85,7 +81,7 @@ extern crate geo_types;
 
 extern crate thiserror;
 
-pub use crate::towkt::ToWkt;
+pub use crate::to_wkt::ToWkt;
 
 #[cfg(feature = "geo-types")]
 #[deprecated(note = "renamed module to `wkt::geo_types_from_wkt`")]

src/towkt.rs → src/to_wkt.rs

@@ -12,7 +12,6 @@ where
     fn to_wkt(&self) -> Wkt<T>;
 
     /// Serialize as a WKT string
-    ///
     #[cfg_attr(feature = "geo-types", doc = "```")]
     #[cfg_attr(not(feature = "geo-types"), doc = "```ignore")]
     /// // This example requires the geo-types feature (on by default).
@@ -25,7 +24,6 @@ where
     }
 
     /// Write a WKT string to a [`File`](std::fs::File), or anything else that implements [`Write`](std::io::Write).
-    ///
     #[cfg_attr(feature = "geo-types", doc = "```")]
     #[cfg_attr(not(feature = "geo-types"), doc = "```ignore")]
     /// // This example requires the geo-types feature (on by default).