upgrade versions

Author: sdrll

Cargo.lock

@@ -10,21 +10,21 @@ edition = "2021"
 anyhow = "1.0"
 clap = { version = "4", features = ["derive"] }
 cosmogony = { path = "cosmogony" }
-env_logger = "0.9"
+env_logger = "0.10.0"
 flate2 = "1.0"
-geo = "0.23"
+geo = "0.26.0"
 geojson = { version = "0.24", features = ["geo-types"] }
 geos = { version = "8.0", features= ["geo"] }
 geo-types = { version = "0.7.9", features = ["rstar"] }
 include_dir = "0.7"
-itertools = "0.10"
+itertools = "0.11.0"
 lazy_static = "1"
 log = "0.4"
 osm_boundaries_utils = "0.11.0"
 osmpbfreader = "0.16"
 rayon = "1.5"
 regex = "1"
-rstar = "0.9"
+rstar = "0.11.0"
 serde_derive = "1"
 serde_json = "1"
 serde = { version = "1", features = ["rc"] }

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cosmogony"
-version = "0.12.8"
+version = "0.14.0"
 authors = ["Adrien Matissart <[email protected]>", "Antoine Desbordes <[email protected]>"]
 license = "Apache-2.0"
 repository = "https://github.com/osm-without-borders/cosmogony"

cosmogony/Cargo.toml

@@ -20,14 +20,14 @@ impl OutputFormat {
     pub fn from_filename(filename: impl AsRef<Path>) -> Result<OutputFormat, Error> {
         ALL_EXTENSIONS
             .iter()
-            .find(|&&(ref e, _)| {
+            .find(|&(e, _)| {
                 filename
                     .as_ref()
                     .file_name()
                     .and_then(|f| f.to_str())
                     .map_or(false, |f| f.ends_with(e))
             })
-            .map(|&(_, ref f)| f.clone())
+            .map(|(_, f)| f.clone())
             .ok_or_else(|| {
                 let extensions_str = ALL_EXTENSIONS
                     .iter()

cosmogony/src/file_format.rs

@@ -152,7 +152,7 @@ impl Zone {
     /// iter_hierarchy gives an iterator over the whole hierachy including self
     pub fn iter_hierarchy<'a>(&'a self, all_zones: &'a MutableSlice<'_>) -> HierarchyIterator<'a> {
         HierarchyIterator {
-            zone: Some(&self),
+            zone: Some(self),
             all_zones,
         }
     }
@@ -170,7 +170,7 @@ impl<'a> Iterator for HierarchyIterator<'a> {
         match z {
             Some(z) => {
                 self.zone = match &z.parent {
-                    Some(ref p_idx) => Some(self.all_zones.get(&p_idx)),
+                    Some(ref p_idx) => Some(self.all_zones.get(p_idx)),
                     _ => None,
                 };
                 Some(z)

cosmogony/src/zone.rs

@@ -229,7 +229,7 @@ pub fn build_cosmogony(
 ) -> Result<Cosmogony, Error> {
     let path = Path::new(&pbf_path);
     info!("Reading pbf with geometries...");
-    let file = File::open(&path).context("no pbf file")?;
+    let file = File::open(path).context("no pbf file")?;
     let file = BufReader::with_capacity(FILE_BUF_SIZE, file);
 
     let parsed_pbf = OsmPbfReader::new(file)

src/lib.rs

@@ -35,7 +35,6 @@ impl CosmogonyMerger {
     fn read_cosmogony(&mut self, file: &Path, writer: impl std::io::Write) -> Result<()> {
         let mut max_id = 0;
         let zones = read_zones_from_file(file)?
-            .into_iter()
             .filter_map(|z| z.ok())
             .map(|mut z| {
                 z.id = self.get_updated_id(z.id);

src/merger.rs

@@ -235,20 +235,20 @@ impl ZoneExt for Zone {
 
     fn contains(&self, other: &Zone) -> bool {
         match (&self.boundary, &other.boundary) {
-            (&Some(ref mpoly1), &Some(ref mpoly2)) => {
+            (Some(mpoly1), Some(mpoly2)) => {
                 let m_self: Result<Geometry, _> = mpoly1.try_into();
                 let m_other: Result<Geometry, _> = mpoly2.try_into();
 
                 match (&m_self, &m_other) {
-                    (&Ok(ref m_self), &Ok(ref m_other)) => {
+                    (Ok(m_self), Ok(m_other)) => {
                         // In GEOS, "covers" is less strict than "contains".
                         // eg: a polygon does NOT "contain" its boundary, but "covers" it.
                         m_self.covers(m_other)
                         .map_err(|e| info!("impossible to compute geometries coverage for zone {:?}/{:?}: error {}",
                         &self.osm_id, &other.osm_id, e))
                         .unwrap_or(false)
                     }
-                    (&Err(ref e), _) => {
+                    (Err(e), _) => {
                         info!(
                             "impossible to convert to geos for zone {:?}, error {}",
                             &self.osm_id, e
@@ -259,7 +259,7 @@ impl ZoneExt for Zone {
                         );
                         false
                     }
-                    (_, &Err(ref e)) => {
+                    (_, Err(e)) => {
                         info!(
                             "impossible to convert to geos for zone {:?}, error {}",
                             &other.osm_id, e
@@ -278,7 +278,7 @@ impl ZoneExt for Zone {
 
     fn contains_center(&self, other: &Zone) -> bool {
         match (&self.boundary, &other.center) {
-            (&Some(ref mpoly1), &Some(ref point)) => mpoly1.contains(point),
+            (Some(mpoly1), Some(point)) => mpoly1.contains(point),
             _ => false,
         }
     }