Use roxmltree/std to get an error implementation and make using it mo…

…re ergonomic
a-b-street · Jan 5, 2021 · eb9bf77 · eb9bf77
1 parent e99def9
commit eb9bf77
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/convert_osm/Cargo.toml b/convert_osm/Cargo.toml
@@ -13,5 +13,5 @@ geom = { path = "../geom" }
 kml = { path = "../kml" }
 log = "0.4.11"
 map_model = { path = "../map_model" }
-roxmltree = "0.14.0"
+roxmltree = { version = "0.14.0", features=["std"] }
 serde = "1.0.116"
diff --git a/convert_osm/src/reader.rs b/convert_osm/src/reader.rs
@@ -45,7 +45,7 @@ pub fn read(path: &str, input_gps_bounds: &GPSBounds, timer: &mut Timer) -> Resu
     timer.start(format!("read {}", path));
     let bytes = slurp_file(path)?;
     let raw_string = std::str::from_utf8(&bytes)?;
-    let tree = roxmltree::Document::parse(raw_string).map_err(|err| anyhow!("{}", err))?;
+    let tree = roxmltree::Document::parse(raw_string)?;
     timer.stop(format!("read {}", path));
 
     let mut doc = Document {

diff --git a/kml/Cargo.toml b/kml/Cargo.toml
@@ -10,5 +10,5 @@ abstutil = { path = "../abstutil" }
 anyhow = "1.0.37"
 csv = "1.1.4"
 geom = { path = "../geom" }
-roxmltree = "0.14.0"
+roxmltree = { version = "0.14.0", features=["std"] }
 serde = "1.0.116"
diff --git a/kml/src/lib.rs b/kml/src/lib.rs
@@ -41,7 +41,7 @@ pub fn load(
     timer.start(format!("read {}", path));
     let bytes = abstio::slurp_file(path)?;
     let raw_string = std::str::from_utf8(&bytes)?;
-    let tree = roxmltree::Document::parse(raw_string).map_err(|err| anyhow!("{}", err))?;
+    let tree = roxmltree::Document::parse(raw_string)?;
     timer.stop(format!("read {}", path));
 
     let mut shapes = Vec::new();