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

Upgrade most dependencies

Browse Source
This commit is contained in:
Dustin Carlino 2020-09-24 09:36:26 -07:00
parent 566f6a9e13
commit 597ef473f2
15 changed files with 535 additions and 480 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

903
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

16
abstutil/Cargo.toml
View File

@ -8,22 +8,22 @@ edition = "2018"
profiler = ["cpuprofiler"]
[dependencies]
bincode = "1.1.2"
cpuprofiler = { version = "0.0.3", optional = true }
instant = "0.1.2"
bincode = "1.3.1"
cpuprofiler = { version = "0.0.4", optional = true }
instant = "0.1.7"
itertools = "0.9.0"
lazy_static = "1.4.0"
log = { version = "0.4", features=["std"] }
num_cpus = "1.10.0"
log = { version = "0.4.11", features=["std"] }
num_cpus = "1.13.0"
rand = "0.7.0"
rand_xorshift = "0.2.0"
scoped_threadpool = "0.1.9"
serde = "1.0.110"
serde_json = "1.0.40"
serde = "1.0.116"
serde_json = "1.0.57"
[target.'cfg(unix)'.dependencies]
termion = "1.5.1"
[target.'cfg(target_arch = "wasm32")'.dependencies]
include_dir = "0.5.0"
include_dir = "0.6.0"
stdweb = "0.4.20"

22
game/Cargo.toml
View File

@ -13,15 +13,15 @@ wasm = ["widgetry/wasm-backend"]
[dependencies]
aabb-quadtree = "0.1.0"
abstutil = { path = "../abstutil" }
built = { version = "0.4.2", optional = true, features=["chrono"] }
chrono = "0.4.10"
colorous = "1.0.1"
built = { version = "0.4.3", optional = true, features=["chrono"] }
chrono = "0.4.15"
colorous = "1.0.3"
contour = "0.2.0"
downcast-rs = "1.1.1"
enumset = "1.0.0"
downcast-rs = "1.2.0"
enumset = "1.0.1"
geojson = "0.19.0"
geom = { path = "../geom" }
instant = "0.1.2"
instant = "0.1.7"
kml = { path = "../kml" }
lttb = "0.2.0"
maplit = "1.0.2"
@ -29,14 +29,14 @@ map_model = { path = "../map_model" }
petname = "1.0.12"
rand = "0.7.0"
rand_xorshift = "0.2.0"
reqwest = { version = "0.10.6", optional = true, default-features=false, features=["blocking", "rustls-tls"] }
serde = "1.0.110"
serde_json = "1.0.40"
reqwest = { version = "0.10.8", optional = true, default-features=false, features=["blocking", "rustls-tls"] }
serde = "1.0.116"
serde_json = "1.0.57"
svg_face = "0.1.2"
sim = { path = "../sim" }
webbrowser = { version = "0.5.2", optional = true }
webbrowser = { version = "0.5.5", optional = true }
widgetry = { path = "../widgetry", default-features=false }
xmltree = "0.10.0"
xmltree = "0.10.1"
[build-dependencies]
built = "0.4.2"

12
geom/Cargo.toml
View File

@ -8,10 +8,10 @@ edition = "2018"
aabb-quadtree = "0.1.0"
abstutil = { path = "../abstutil" }
earcutr = { git = "https://github.com/dabreegster/earcutr", branch = "patch-1" }
geo = "0.13.0"
geo-booleanop = "0.3.0"
geo = "0.14.2"
geo-booleanop = "0.3.2"
histogram = "0.6.9"
instant = "0.1.2"
ordered-float = { version = "1.0.1", features=["serde"] }
polylabel = "2.2.0"
serde = "1.0.110"
instant = "0.1.7"
ordered-float = { version = "2.0.0", features=["serde"] }
polylabel = "2.3.1"
serde = "1.0.116"

1
geom/src/find_closest.rs
View File

@ -1,7 +1,6 @@
use crate::{Bounds, Distance, Pt2D};
use aabb_quadtree::geom::{Point, Rect};
use aabb_quadtree::QuadTree;
use geo;
use geo::algorithm::contains::Contains;
use geo::prelude::{ClosestPoint, EuclideanDistance};
use std::collections::BTreeMap;

2
geom/src/polygon.rs
View File

@ -326,7 +326,7 @@ impl Polygon {
// Usually m^2, unless the polygon is in screen-space
pub fn area(&self) -> f64 {
// Polygon orientation messes this up sometimes
to_geo(&self.points()).area().abs()
to_geo(&self.points()).unsigned_area()
}
// Doesn't handle multiple crossings in and out.

6
headless/Cargo.toml
View File

@ -7,10 +7,10 @@ edition = "2018"
[dependencies]
abstutil = { path = "../abstutil" }
geom = { path = "../geom" }
hyper = "0.13.7"
hyper = "0.13.8"
lazy_static = "1.4.0"
map_model = { path = "../map_model" }
serde = "1.0.110"
serde = "1.0.116"
sim = { path = "../sim" }
tokio = { version = "0.2", features = ["full"] }
tokio = { version = "0.2.22", features = ["full"] }
url = "2.1.1"

4
importer/Cargo.toml
View File

@ -19,6 +19,6 @@ kml = { path = "../kml" }
map_model = { path = "../map_model" }
rand = "0.7.0"
rand_xorshift = "0.2.0"
serde = "1.0.110"
serde_json = "1.0.40"
serde = "1.0.116"
serde_json = "1.0.57"
sim = { path = "../sim" }

2
kml/Cargo.toml
View File

@ -8,4 +8,4 @@ edition = "2018"
abstutil = { path = "../abstutil" }
geom = { path = "../geom" }
quick-xml = "0.18.1"
serde = "1.0.110"
serde = "1.0.116"

6
map_model/Cargo.toml
View File

@ -7,14 +7,14 @@ edition = "2018"
[dependencies]
aabb-quadtree = "0.1.0"
abstutil = { path = "../abstutil" }
enumset = { version = "1.0.0", features=["serde"] }
enumset = { version = "1.0.1", features=["serde"] }
fast_paths = { git = "https://github.com/easbar/fast_paths" }
geom = { path = "../geom" }
nbez = "0.1.0"
petgraph = "0.5.0"
petgraph = "0.5.1"
rand = "0.7.0"
rand_xorshift = "0.2.0"
serde = "1.0.110"
serde = "1.0.116"
thread_local = "1.0.1"
seattle_traffic_signals = { git = "https://github.com/dabreegster/seattle_traffic_signals" }
serde_json = "1.0.40"

10
sim/Cargo.toml
View File

@ -6,14 +6,14 @@ edition = "2018"
[dependencies]
abstutil = { path = "../abstutil" }
downcast-rs = "1.1.1"
downcast-rs = "1.2.0"
enum_dispatch = "0.3.3"
geom = { path = "../geom" }
instant = "0.1.2"
instant = "0.1.7"
libm = "0.2.1"
log = "0.4"
log = "0.4.11"
map_model = { path = "../map_model" }
rand = "0.7.0"
rand_distr = "0.2.2"
rand_distr = "0.3.0"
rand_xorshift = "0.2.0"
serde = "1.0.110"
serde = "1.0.116"

6
updater/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2018"
[dependencies]
md5 = "0.7.0"
reqwest = { version = "0.10.6", default-features=false, features=["rustls-tls"] }
tokio = { version = "0.2", features = ["full"] }
reqwest = { version = "0.10.8", default-features=false, features=["rustls-tls"] }
tokio = { version = "0.2.22", features = ["full"] }
walkdir = "2.3.1"
zip = "0.5.5"
zip = "0.5.8"

18
widgetry/Cargo.toml
View File

@ -12,20 +12,20 @@ wasm-backend = ["glow/stdweb", "instant/stdweb", "stdweb", "usvg/text", "usvg/te
[dependencies]
abstutil = { path = "../abstutil" }
# backtrace = "0.3.40"
downcast-rs = "1.1.1"
downcast-rs = "1.2.0"
geom = { path = "../geom" }
glow = { version = "0.5.0", optional = true, default-features=false }
glow = { version = "0.6.0", optional = true, default-features=false }
glutin = { version = "0.24.1", optional = true }
htmlescape = "0.3.1"
image = { version = "0.23.4", default-features = false, features=["png"] }
instant = "0.1.2"
log = "0.4"
lru = "0.4.3"
lyon = "0.15.8"
serde = "1.0.110"
image = { version = "0.23.9", default-features = false, features=["png"] }
instant = "0.1.7"
log = "0.4.11"
lru = "0.6.0"
lyon = "0.16.0"
serde = "1.0.116"
stdweb = { version = "0.4.20", optional = true }
stretch = "0.3.2"
ttf-parser = "0.6.1"
ttf-parser = "0.8.2"
usvg = { git = "https://github.com/dabreegster/resvg/", branch = "wasm", default-features=false }
webgl_stdweb = { version = "0.3", optional = true }
winit = "0.22.2"

2
widgetry/src/assets.rs
View File

@ -96,7 +96,7 @@ impl Assets {
.text_opts
.fontdb
.with_face_data(self.font_to_id[&font], |data, face_index| {
let font = ttf_parser::Font::from_data(data, face_index).unwrap();
let font = ttf_parser::Face::from_slice(data, face_index).unwrap();
let units_per_em = font.units_per_em().unwrap();
let ascent = font.ascender();
let descent = font.descender();

5
widgetry/src/backend_glow_native.rs
View File

@ -17,8 +17,9 @@ pub fn setup(window_title: &str) -> (PrerenderInnards, winit::event_loop::EventL
.build_windowed(window, &event_loop)
.unwrap();
let windowed_context = unsafe { context.make_current().unwrap() };
let gl =
glow::Context::from_loader_function(|s| windowed_context.get_proc_address(s) as *const _);
let gl = unsafe {
glow::Context::from_loader_function(|s| windowed_context.get_proc_address(s) as *const _)
};
let program = unsafe { gl.create_program().expect("Cannot create program") };
unsafe {