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 most dependencies

Browse Source
This commit is contained in:
Dustin Carlino 2021-02-03 18:13:06 -08:00
parent 7855d26a6a
commit 73e405e382
28 changed files with 423 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

571
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

8
abstio/Cargo.toml
View File

@ -6,14 +6,14 @@ edition = "2018"
[dependencies]
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
anyhow = "1.0.38"
bincode = "1.3.1"
instant = "0.1.7"
lazy_static = "1.4.0"
log = "0.4.11"
serde = "1.0.116"
log = "0.4.14"
serde = "1.0.123"
serde_json = "1.0.61"
[target.'cfg(target_arch = "wasm32")'.dependencies]
include_dir = { git = "https://github.com/dabreegster/include_dir", branch = "union" }
web-sys = { version = "0.3.4", features=["Storage", "Window"] }
web-sys = { version = "0.3.47", features=["Storage", "Window"] }

10
abstutil/Cargo.toml
View File

@ -5,20 +5,20 @@ authors = ["Dustin Carlino <dabreegster@gmail.com>"]
edition = "2018"
[dependencies]
anyhow = "1.0.37"
anyhow = "1.0.38"
bincode = "1.3.1"
env_logger = { version = "0.8.2" }
instant = "0.1.7"
itertools = "0.10.0"
log = "0.4.11"
log = "0.4.14"
num_cpus = "1.13.0"
scoped_threadpool = "0.1.9"
serde = "1.0.116"
serde = "1.0.123"
serde_json = "1.0.61"
[target.'cfg(unix)'.dependencies]
termion = "1.5.1"
termion = "1.5.6"
[target.'cfg(target_arch = "wasm32")'.dependencies]
console_log = "0.2.0"
web-sys = { version = "0.3.4", features=["Location", "Window"] }
web-sys = { version = "0.3.47", features=["Location", "Window"] }

4
collisions/Cargo.toml
View File

@ -7,5 +7,5 @@ edition = "2018"
[dependencies]
geom = { path = "../geom" }
kml = { path = "../kml" }
log = "0.4.11"
serde = "1.0.116"
log = "0.4.14"
serde = "1.0.123"

8
convert_osm/Cargo.toml
View File

@ -7,11 +7,11 @@ edition = "2018"
[dependencies]
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
byteorder = "1.3.4"
anyhow = "1.0.38"
byteorder = "1.4.2"
geom = { path = "../geom" }
kml = { path = "../kml" }
log = "0.4.11"
log = "0.4.14"
map_model = { path = "../map_model" }
roxmltree = { version = "0.14.0", features=["std"] }
serde = "1.0.116"
serde = "1.0.123"

4
fifteen_min/Cargo.toml
View File

@ -17,9 +17,9 @@ abstutil = { path = "../abstutil" }
contour = "0.3.0"
geojson = "0.21.0"
geom = { path = "../geom" }
getrandom = { version = "0.2.0", optional = true }
getrandom = { version = "0.2.2", optional = true }
log = "0.4"
map_gui = { path = "../map_gui" }
map_model = { path = "../map_model" }
wasm-bindgen = { version = "0.2.68", optional = true }
wasm-bindgen = { version = "0.2.70", optional = true }
widgetry = { path = "../widgetry" }

16
game/Cargo.toml
View File

@ -18,33 +18,33 @@ wasm = ["getrandom/js", "map_gui/wasm", "wasm-bindgen", "widgetry/wasm-backend"]
aabb-quadtree = "0.1.0"
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
anyhow = "1.0.38"
built = { version = "0.4.3", optional = true, features=["chrono"] }
chrono = "0.4.15"
collisions = { path = "../collisions" }
colorous = "1.0.3"
contour = "0.3.0"
downcast-rs = "1.2.0"
enumset = "1.0.1"
enumset = "1.0.3"
geojson = "0.21.0"
geom = { path = "../geom" }
getrandom = { version = "0.2.0", optional = true }
getrandom = { version = "0.2.2", optional = true }
instant = "0.1.7"
kml = { path = "../kml" }
log = "0.4.11"
log = "0.4.14"
lttb = "0.2.0"
maplit = "1.0.2"
map_gui = { path = "../map_gui" }
map_model = { path = "../map_model" }
petname = "1.0.13"
petname = "1.1.0"
popdat = { path = "../popdat" }
rand = "0.8.1"
rand = "0.8.3"
rand_xorshift = "0.3.0"
serde = "1.0.116"
serde = "1.0.123"
serde_json = "1.0.61"
svg_face = "0.1.3"
sim = { path = "../sim" }
wasm-bindgen = { version = "0.2.68", optional = true }
wasm-bindgen = { version = "0.2.70", optional = true }
widgetry = { path = "../widgetry" }
[build-dependencies]

4
geom/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2018"
[dependencies]
aabb-quadtree = "0.1.0"
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
anyhow = "1.0.38"
earcutr = "0.1.1"
geo = "0.16.0"
geo-booleanop = "= 0.3.2"
@ -16,4 +16,4 @@ histogram = "0.6.9"
instant = "0.1.7"
ordered-float = { version = "2.0.0", features=["serde"] }
polylabel = "2.3.1"
serde = "1.0.116"
serde = "1.0.123"

8
headless/Cargo.toml
View File

@ -7,16 +7,16 @@ edition = "2018"
[dependencies]
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
anyhow = "1.0.38"
geojson = "0.21.0"
geom = { path = "../geom" }
hyper = "0.13.9"
lazy_static = "1.4.0"
log = "0.4.11"
log = "0.4.14"
map_model = { path = "../map_model" }
rand = "0.8.1"
rand = "0.8.3"
rand_xorshift = "0.3.0"
serde = "1.0.116"
serde = "1.0.123"
serde_json = "1.0.61"
sim = { path = "../sim" }
tokio = { version = "0.2.22", features = ["full"] }

10
importer/Cargo.toml
View File

@ -12,20 +12,20 @@ scenarios = ["gdal"]
aabb-quadtree = "0.1.0"
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
anyhow = "1.0.38"
collisions = { path = "../collisions" }
convert_osm = { path = "../convert_osm" }
csv = "1.1.4"
geo = "0.16.0"
geojson = "0.21.0"
geom = { path = "../geom" }
gdal = { version = "0.7.0", optional = true }
gdal = { version = "0.7.2", optional = true }
kml = { path = "../kml" }
log = "0.4.11"
log = "0.4.14"
map_model = { path = "../map_model" }
popdat = { path = "../popdat" }
rand = "0.8.1"
rand = "0.8.3"
rand_xorshift = "0.3.0"
serde = "1.0.116"
serde = "1.0.123"
serde_json = "1.0.61"
sim = { path = "../sim" }

6
kml/Cargo.toml
View File

@ -7,9 +7,9 @@ edition = "2018"
[dependencies]
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
anyhow = "1.0.38"
csv = "1.1.4"
geom = { path = "../geom" }
log = "0.4.11"
log = "0.4.14"
roxmltree = { version = "0.14.0", features=["std"] }
serde = "1.0.116"
serde = "1.0.123"

2
map_editor/Cargo.toml
View File

@ -13,7 +13,7 @@ aabb-quadtree = "0.1.0"
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
geom = { path = "../geom" }
log = "0.4.11"
log = "0.4.14"
map_gui = { path = "../map_gui" }
map_model = { path = "../map_model" }
widgetry = { path = "../widgetry" }

22
map_gui/Cargo.toml
View File

@ -16,29 +16,29 @@ release_s3 = []
aabb-quadtree = "0.1.0"
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
anyhow = "1.0.38"
colorous = "1.0.3"
contour = "0.3.0"
flate2 = "1.0.19"
futures = { version = "0.3.8" }
futures-channel = { version = "0.3.8"}
flate2 = "1.0.20"
futures = { version = "0.3.12" }
futures-channel = { version = "0.3.12"}
geojson = "0.21.0"
geom = { path = "../geom" }
instant = "0.1.7"
js-sys = { version = "0.3.45", optional = true }
log = "0.4.11"
js-sys = { version = "0.3.47", optional = true }
log = "0.4.14"
map_model = { path = "../map_model" }
reqwest = { version = "0.10.10", optional = true, default-features=false, features=["blocking", "rustls-tls"] }
serde = "1.0.116"
reqwest = { version = "0.11.0", optional = true, default-features=false, features=["blocking", "rustls-tls"] }
serde = "1.0.123"
sim = { path = "../sim" }
tokio = { version ="0.2", features=["rt-core"], optional = true }
wasm-bindgen = { version = "0.2.68", optional = true }
wasm-bindgen-futures = { version = "0.4.18", optional = true }
wasm-bindgen = { version = "0.2.70", optional = true }
wasm-bindgen-futures = { version = "0.4.20", optional = true }
webbrowser = "0.5.5"
widgetry = { path = "../widgetry" }
[dependencies.web-sys]
version = "0.3.4"
version = "0.3.47"
optional = true
features = [
"Headers",

12
map_model/Cargo.toml
View File

@ -7,16 +7,16 @@ edition = "2018"
[dependencies]
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
enumset = { version = "1.0.1", features=["serde"] }
anyhow = "1.0.38"
enumset = { version = "1.0.3", features=["serde"] }
fast_paths = { git = "https://github.com/easbar/fast_paths" }
geom = { path = "../geom" }
log = "0.4.11"
log = "0.4.14"
nbez = "0.1.0"
petgraph = "0.5.1"
rand = "0.8.1"
rand = "0.8.3"
rand_xorshift = "0.3.0"
serde = "1.0.116"
serde = "1.0.123"
serde_json = "1.0.61"
thread_local = "1.0.1"
thread_local = "1.1.2"
traffic_signal_data = { path = "../traffic_signal_data" }

2
map_model/src/pathfind/mod.rs
View File

@ -4,7 +4,7 @@ use std::collections::VecDeque;
use std::fmt;
use anyhow::Result;
use enumset::EnumSetType;
use enumset::{EnumSet, EnumSetType};
use serde::{Deserialize, Serialize};
use geom::{Distance, Duration, PolyLine, Speed, EPSILON_DIST};

4
osm_viewer/Cargo.toml
View File

@ -15,8 +15,8 @@ wasm = ["getrandom/js", "map_gui/wasm", "wasm-bindgen", "widgetry/wasm-backend"]
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
geom = { path = "../geom" }
getrandom = { version = "0.2.0", optional = true }
getrandom = { version = "0.2.2", optional = true }
map_gui = { path = "../map_gui" }
map_model = { path = "../map_model" }
wasm-bindgen = { version = "0.2.68", optional = true }
wasm-bindgen = { version = "0.2.70", optional = true }
widgetry = { path = "../widgetry" }

6
parking_mapper/Cargo.toml
View File

@ -10,11 +10,11 @@ default = ["map_gui/native", "reqwest", "widgetry/native-backend"]
[dependencies]
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
anyhow = "1.0.38"
geom = { path = "../geom" }
log = "0.4.11"
log = "0.4.14"
map_gui = { path = "../map_gui" }
map_model = { path = "../map_model" }
reqwest = { version = "0.10.10", optional = true, default-features=false, features=["blocking", "rustls-tls"] }
reqwest = { version = "0.11.0", optional = true, default-features=false, features=["blocking", "rustls-tls"] }
widgetry = { path = "../widgetry" }
xmltree = "0.10.1"

8
popdat/Cargo.toml
View File

@ -6,16 +6,16 @@ edition = "2018"
[dependencies]
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
anyhow = "1.0.38"
flatgeobuf = { version = "0.4" }
futures = "0.3.8"
futures = "0.3.12"
geo = "0.16.0"
geojson = { version = "0.21.0", features = ["geo-types"] }
geom = { path = "../geom" }
geozero-core = { version = "0.5.1" }
log = "0.4.11"
log = "0.4.14"
map_model = { path = "../map_model" }
rand = "0.8.1"
rand = "0.8.3"
rand_xorshift = "0.3.0"
geo-booleanop = "0.3.2"
serde_json = "1.0.61"

12
santa/Cargo.toml
View File

@ -14,16 +14,16 @@ wasm = ["getrandom/js", "map_gui/wasm", "wasm-bindgen", "widgetry/wasm-backend"]
[dependencies]
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
anyhow = "1.0.38"
geom = { path = "../geom" }
getrandom = { version = "0.2.0", optional = true }
getrandom = { version = "0.2.2", optional = true }
kml = { path = "../kml" }
log = "0.4.11"
log = "0.4.14"
map_gui = { path = "../map_gui" }
map_model = { path = "../map_model" }
rand = "0.8.1"
rand = "0.8.3"
rand_xorshift = "0.3.0"
rodio = { version = "0.13.0", default-features = false, features = ["vorbis"] }
serde = "1.0.116"
wasm-bindgen = { version = "0.2.68", optional = true }
serde = "1.0.123"
wasm-bindgen = { version = "0.2.70", optional = true }
widgetry = { path = "../widgetry" }

10
sim/Cargo.toml
View File

@ -7,19 +7,19 @@ edition = "2018"
[dependencies]
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
anyhow = "1.0.38"
ctrlc = { version = "3.1.7", optional = true }
downcast-rs = "1.2.0"
enum_dispatch = "0.3.3"
enum_dispatch = "0.3.5"
geom = { path = "../geom" }
instant = "0.1.7"
libm = "0.2.1"
log = "0.4.11"
log = "0.4.14"
map_model = { path = "../map_model" }
rand = "0.8.1"
rand = "0.8.3"
rand_distr = "0.4.0"
rand_xorshift = "0.3.0"
serde = "1.0.116"
serde = "1.0.123"
[[bin]]
name = "run_scenario"

6
sumo/Cargo.toml
View File

@ -7,8 +7,8 @@ edition = "2018"
[dependencies]
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
anyhow = "1.0.38"
geom = { path = "../geom" }
map_model = { path = "../map_model" }
quick-xml = { version = "0.20.0", features=["serialize"] }
serde = "1.0.116"
quick-xml = { version = "0.21.0", features=["serialize"] }
serde = "1.0.123"

4
tests/Cargo.toml
View File

@ -7,9 +7,9 @@ edition = "2018"
[dependencies]
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
anyhow = "1.0.38"
convert_osm = { path = "../convert_osm" }
geom = { path = "../geom" }
map_model = { path = "../map_model" }
rand = "0.8.1"
rand = "0.8.3"
sim = { path = "../sim" }

4
traffic_seitan/Cargo.toml
View File

@ -7,8 +7,8 @@ edition = "2018"
[dependencies]
abstutil = { path = "../abstutil" }
geom = { path = "../geom" }
log = "0.4.11"
log = "0.4.14"
map_model = { path = "../map_model" }
rand = "0.8.1"
rand = "0.8.3"
rand_xorshift = "0.3.0"
sim = { path = "../sim" }

3
traffic_signal_data/Cargo.toml
View File

@ -6,6 +6,5 @@ edition = "2018"
[dependencies]
include_dir = { git = "https://github.com/dabreegster/include_dir", branch = "union" }
serde = "1.0.89"
serde_derive = "1.0.98"
serde = "1.0.123"
serde_json = "1.0.61"

2
traffic_signal_data/src/lib.rs
View File

@ -1,7 +1,7 @@
//! A representation of traffic signal configuration that references OpenStreetMap IDs and is
//! hopefully robust to minor edits over time.
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet};
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]

6
updater/Cargo.toml
View File

@ -7,10 +7,10 @@ edition = "2018"
[dependencies]
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
flate2 = "1.0.19"
anyhow = "1.0.38"
flate2 = "1.0.20"
geom = { path = "../geom" }
md5 = "0.7.0"
reqwest = { version = "0.10.10", default-features=false, features=["rustls-tls"] }
reqwest = { version = "0.11.0", default-features=false, features=["rustls-tls"] }
tokio = { version = "0.2.22", features = ["full"] }
walkdir = "2.3.1"

16
widgetry/Cargo.toml
View File

@ -10,24 +10,24 @@ wasm-backend = ["glow/web-sys", "instant/wasm-bindgen", "usvg/text", "wasm-bindg
[dependencies]
abstutil = { path = "../abstutil" }
anyhow = "1.0.37"
anyhow = "1.0.38"
# backtrace = "0.3.40"
downcast-rs = "1.2.0"
geojson = "0.21.0"
geom = { path = "../geom" }
glow = { version = "0.7.1", optional = true, default-features=false }
glow = { version = "0.7.2", optional = true, default-features=false }
glutin = { version = "0.26.0", optional = true }
htmlescape = "0.3.1"
image = { version = "0.23.12", default-features = false, features=["png"] }
instant = "0.1.7"
log = "0.4.11"
log = "0.4.14"
lru = "0.6.3"
lyon = "0.16.2"
serde = "1.0.116"
serde = "1.0.123"
serde_json = "1.0.61"
stretch = "0.3.2"
ttf-parser = "0.9.0"
usvg = { version = "0.13.0", default-features=false }
wasm-bindgen = { version = "0.2.68", optional = true }
web-sys = { version = "0.3.45", optional = true }
ttf-parser = "0.10.1"
usvg = { version = "0.13.1", default-features=false }
wasm-bindgen = { version = "0.2.70", optional = true }
web-sys = { version = "0.3.47", optional = true }
winit = "0.24.0"

8
widgetry_demo/Cargo.toml
View File

@ -15,10 +15,10 @@ wasm = ["getrandom/js", "wasm-bindgen", "widgetry/wasm-backend"]
abstio = { path = "../abstio" }
abstutil = { path = "../abstutil" }
geom = { path = "../geom" }
getrandom = { version = "0.2.0", optional = true }
log = "0.4.11"
rand = "0.8.1"
getrandom = { version = "0.2.2", optional = true }
log = "0.4.14"
rand = "0.8.3"
rand_xorshift = "0.3.0"
svg_face = "0.1.3"
wasm-bindgen = { version = "0.2.68", optional = true }
wasm-bindgen = { version = "0.2.70", optional = true }
widgetry = { path = "../widgetry" }