a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-27 15:03:20 +03:00
Code Issues Projects Releases Wiki Activity

Upgrade all geo dependencies! No behavioral difference

Browse Source
This commit is contained in:
Dustin Carlino 2022-02-22 16:45:49 +00:00
parent ca5166107b
commit d141a2a810
12 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Cargo.lock generated
View File

@ -323,9 +323,9 @@ dependencies = [
[[package]]
name = "cbindgen"
version = "0.19.0"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38728c31b994e4b849cf59feefb4a8bf26acd299ee0b92c9fb35bd14ad4b8dfa"
checksum = "51e3973b165dc0f435831a9e426de67e894de532754ff7a3f307c03ee5dec7dc"
dependencies = [
"clap",
"heck",
@ -1373,8 +1373,9 @@ dependencies = [
[[package]]
name = "geo"
version = "0.18.0"
source = "git+https://github.com/georust/geo#2ebbc7f8a8774d9a4a68e9a1b40bcdd22b02fac9"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61faf6a68f9432b5287c393268e86a07e4dfed79e6e0962b0e6e59b2f70c77d8"
dependencies = [
"geo-types",
"geographiclib-rs",
@ -1397,8 +1398,9 @@ dependencies = [
[[package]]
name = "geo-types"
version = "0.7.2"
source = "git+https://github.com/georust/geo#2ebbc7f8a8774d9a4a68e9a1b40bcdd22b02fac9"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "658ffd4025e593f0b64e8fa7a1afc4082e4471ac823034b9d4e338edc9adc6fb"
dependencies = [
"approx",
"num-traits",
@ -2974,7 +2976,7 @@ dependencies = [
[[package]]
name = "polylabel"
version = "2.4.0"
source = "git+https://github.com/urschrei/polylabel-rs#d86089e93af18517651e866a53a79461bda331b7"
source = "git+https://github.com/urschrei/polylabel-rs#4ac85aaa652825784186ee8344a0d9a6c446be16"
dependencies = [
"cbindgen",
"geo",

7
Cargo.toml
View File

@ -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" }

2
apps/fifteen_min/Cargo.toml
View File

@ -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"

4
apps/game/Cargo.toml
View File

@ -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"

4
apps/ltn/Cargo.toml
View File

@ -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 }

4
cli/Cargo.toml
View File

@ -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"

4
geom/Cargo.toml
View File

@ -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]

2
headless/Cargo.toml
View File

@ -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"

4
importer/Cargo.toml
View File

@ -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" }

2
map_gui/Cargo.toml
View File

@ -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"

4
popdat/Cargo.toml
View File

@ -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"

2
widgetry/Cargo.toml
View File

@ -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 }