Upgrade all geo dependencies! No behavioral difference

a-b-street · Feb 22, 2022 · d141a2a · d141a2a
1 parent ca51661
commit d141a2a
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,10 +36,3 @@ opt-level = 3
 [patch.crates-io]
 # Waiting for release: https://github.com/21re/rust-geo-booleanop/pull/27
 geo-booleanop = { git = "https://github.com/21re/rust-geo-booleanop" }
-
-# Waiting for a new crates.io release, but git uses latest geo versions
-polylabel = { git = "https://github.com/urschrei/polylabel-rs" }
-
-# Waiting on release of PR: https://github.com/georust/geo/pull/654
-geo = { git = "https://github.com/georust/geo" }
-geo-types = { git = "https://github.com/georust/geo" }
diff --git a/apps/fifteen_min/Cargo.toml b/apps/fifteen_min/Cargo.toml
@@ -15,7 +15,7 @@ wasm = ["getrandom/js", "map_gui/wasm", "wasm-bindgen", "widgetry/wasm-backend"]
 abstio = { path = "../../abstio" }
 abstutil = { path = "../../abstutil" }
 contour = "0.4.0"
-geojson = { version = "0.22.0", features = ["geo-types"] }
+geojson = { version = "0.22.2", features = ["geo-types"] }
 geom = { path = "../../geom" }
 getrandom = { version = "0.2.3", optional = true }
 log = "0.4"

diff --git a/apps/game/Cargo.toml b/apps/game/Cargo.toml
@@ -28,8 +28,8 @@ downcast-rs = "1.2.0"
 enumset = "1.0.3"
 fs-err = "2.6.0"
 futures-channel = { version = "0.3.12"}
-geo = "0.18"
-geojson = { version = "0.22.0", features = ["geo-types"] }
+geo = "0.19"
+geojson = { version = "0.22.2", features = ["geo-types"] }
 geom = { path = "../../geom" }
 getrandom = { version = "0.2.3", optional = true }
 instant = "0.1.7"

diff --git a/apps/ltn/Cargo.toml b/apps/ltn/Cargo.toml
@@ -17,8 +17,8 @@ abstutil = { path = "../../abstutil" }
 anyhow = "1.0.38"
 contour = "0.4.0"
 fs-err = "2.6.0"
-geo = "0.18"
-geojson = { version = "0.22.0", features = ["geo-types"] }
+geo = "0.19"
+geojson = { version = "0.22.2", features = ["geo-types"] }
 geom = { path = "../../geom" }
 getrandom = { version = "0.2.3", optional = true }
 js-sys = { version = "0.3.47", optional = true }

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -10,8 +10,8 @@ abstutil = { path = "../abstutil" }
 anyhow = "1.0.38"
 csv = "1.1.4"
 fs-err = "2.6.0"
-geo = "0.18.0"
-geojson = { version = "0.22.0", features = ["geo-types"] }
+geo = "0.19"
+geojson = { version = "0.22.2", features = ["geo-types"] }
 geom = { path = "../geom" }
 importer = { path = "../importer" }
 log = "0.4.14"

diff --git a/geom/Cargo.toml b/geom/Cargo.toml
@@ -10,13 +10,13 @@ abstutil = { path = "../abstutil" }
 anyhow = "1.0.38"
 earcutr = "0.1.1"
 fs-err = "2.6.0"
-geo = "0.18"
+geo = "0.19"
 geo-booleanop = "0.3.2"
 geojson = { version = "0.22.0", features = ["geo-types"] }
 histogram = "0.6.9"
 instant = "0.1.7"
 ordered-float = { version = "2.4.0", features=["serde"] }
-polylabel = "2.4"
+polylabel = { git = "https://github.com/urschrei/polylabel-rs" }
 serde = "1.0.123"
 
 [dev-dependencies]

diff --git a/headless/Cargo.toml b/headless/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 abstio = { path = "../abstio" }
 abstutil = { path = "../abstutil" }
 anyhow = "1.0.38"
-geojson = { version = "0.22.0", features = ["geo-types"] }
+geojson = { version = "0.22.2", features = ["geo-types"] }
 geom = { path = "../geom" }
 hyper = { version = "0.14.2", features = ["full"] }
 lazy_static = "1.4.0"

diff --git a/importer/Cargo.toml b/importer/Cargo.toml
@@ -16,8 +16,8 @@ anyhow = "1.0.38"
 collisions = { path = "../collisions" }
 convert_osm = { path = "../convert_osm" }
 csv = "1.1.4"
-geo = "0.18.0"
-geojson = { version = "0.22.0", features = ["geo-types"] }
+geo = "0.19"
+geojson = { version = "0.22.2", features = ["geo-types"] }
 geom = { path = "../geom" }
 gdal = { version = "0.8.0", optional = true }
 kml = { path = "../kml" }

diff --git a/map_gui/Cargo.toml b/map_gui/Cargo.toml
@@ -22,7 +22,7 @@ colorous = "1.0.3"
 contour = "0.4.0"
 flate2 = "1.0.20"
 futures-channel = { version = "0.3.12"}
-geojson = { version = "0.22.0", features = ["geo-types"] }
+geojson = { version = "0.22.2", features = ["geo-types"] }
 geom = { path = "../geom" }
 instant = "0.1.7"
 lazy_static = "1.4.0"

diff --git a/popdat/Cargo.toml b/popdat/Cargo.toml
@@ -10,8 +10,8 @@ abstutil = { path = "../abstutil" }
 anyhow = "1.0.38"
 flatgeobuf = { version = "0.5" }
 futures = "0.3.12"
-geo = "0.18.0"
-geojson = { version = "0.22.0", features = ["geo-types"] }
+geo = "0.19"
+geojson = { version = "0.22.2", features = ["geo-types"] }
 geom = { path = "../geom" }
 geozero = "0.7"
 log = "0.4.14"

diff --git a/widgetry/Cargo.toml b/widgetry/Cargo.toml
@@ -19,7 +19,7 @@ flate2 = "1.0.20"
 fs-err = "2.6.0"
 futures = { version = "0.3.12" }
 futures-channel = { version = "0.3.12"}
-geojson = { version = "0.22.0", features = ["geo-types"] }
+geojson = { version = "0.22.2", features = ["geo-types"] }
 geom = { path = "../geom" }
 glow = "0.9.0"
 glutin = { version = "0.26.0", optional = true }