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

stop dependending directly on serde_derive

Browse Source
This commit is contained in:
Dustin Carlino 2020-05-19 15:06:32 -07:00
parent 90bc73580d
commit ddf6de5f59
68 changed files with 114 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
Cargo.lock generated
View File

@ -25,8 +25,7 @@ dependencies = [
"rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"rand_xorshift 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_xorshift 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
"stdweb 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)", "stdweb 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)",
"termion 1.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "termion 1.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
@ -178,7 +177,7 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -231,7 +230,7 @@ dependencies = [
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"regex-automata 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "regex-automata 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -305,7 +304,7 @@ version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
"url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -319,7 +318,7 @@ dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -354,7 +353,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
"num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -457,7 +456,7 @@ dependencies = [
"idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
"try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -595,7 +594,7 @@ dependencies = [
"csv-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "csv-core 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -688,7 +687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -820,8 +819,7 @@ dependencies = [
"instant 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "instant 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"lru 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "lru 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"lyon 0.15.6 (registry+https://github.com/rust-lang/crates.io-index)", "lyon 0.15.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
"simsearch 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "simsearch 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"stdweb 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)", "stdweb 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)",
"stretch 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "stretch 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -863,7 +861,7 @@ source = "git+https://github.com/easbar/fast_paths#cfb19807c0dae0b6a5034d62959a6
dependencies = [ dependencies = [
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"priority-queue 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "priority-queue 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1059,8 +1057,7 @@ dependencies = [
"rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"rand_xorshift 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_xorshift 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
"sim 0.1.0", "sim 0.1.0",
"walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"xmltree 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "xmltree 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1149,8 +1146,7 @@ dependencies = [
"instant 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "instant 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "ordered-float 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"polylabel 2.0.0 (git+https://github.com/urschrei/polylabel-rs)", "polylabel 2.0.0 (git+https://github.com/urschrei/polylabel-rs)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1299,8 +1295,7 @@ dependencies = [
"abstutil 0.1.0", "abstutil 0.1.0",
"geom 0.1.0", "geom 0.1.0",
"itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
"transitfeed 0.3.0 (git+https://github.com/dabreegster/transitfeed)", "transitfeed 0.3.0 (git+https://github.com/dabreegster/transitfeed)",
] ]
@ -1614,8 +1609,7 @@ dependencies = [
"geom 0.1.0", "geom 0.1.0",
"kml 0.1.0", "kml 0.1.0",
"map_model 0.1.0", "map_model 0.1.0",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
"sim 0.1.0", "sim 0.1.0",
] ]
@ -1728,8 +1722,7 @@ dependencies = [
"abstutil 0.1.0", "abstutil 0.1.0",
"geom 0.1.0", "geom 0.1.0",
"quick-xml 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", "quick-xml 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -1756,8 +1749,8 @@ dependencies = [
"petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", "regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
"term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1957,8 +1950,7 @@ dependencies = [
"nbez 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "nbez 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"petgraph 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "petgraph 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"seattle_traffic_signals 0.1.0 (git+https://github.com/dabreegster/seattle_traffic_signals)", "seattle_traffic_signals 0.1.0 (git+https://github.com/dabreegster/seattle_traffic_signals)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
"thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -2234,7 +2226,7 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -2761,7 +2753,7 @@ dependencies = [
"mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2797,7 +2789,7 @@ dependencies = [
"native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"pin-project-lite 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "pin-project-lite 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
"tokio 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2906,8 +2898,8 @@ version = "0.1.0"
source = "git+https://github.com/dabreegster/seattle_traffic_signals#7f049d91e60fe72a65fb0d04c5b23d2c8cd524a9" source = "git+https://github.com/dabreegster/seattle_traffic_signals#7f049d91e60fe72a65fb0d04c5b23d2c8cd524a9"
dependencies = [ dependencies = [
"include_dir 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "include_dir 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -2938,7 +2930,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -2953,15 +2945,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.106" version = "1.0.110"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.106" version = "1.0.110"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2976,7 +2968,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -2986,7 +2978,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -2997,7 +2989,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -3056,8 +3048,7 @@ dependencies = [
"rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
"rand_distr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_distr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rand_xorshift 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_xorshift 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -3138,7 +3129,7 @@ dependencies = [
"futures-executor-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "futures-executor-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
"stdweb-derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "stdweb-derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"stdweb-internal-macros 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "stdweb-internal-macros 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3153,8 +3144,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -3166,8 +3157,8 @@ dependencies = [
"base-x 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "base-x 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
"sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3217,7 +3208,7 @@ dependencies = [
"new_debug_unreachable 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "new_debug_unreachable 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
"precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -3594,7 +3585,7 @@ name = "toml"
version = "0.5.6" version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -3609,8 +3600,8 @@ source = "git+https://github.com/dabreegster/transitfeed#8a8d11e3602fb99b8ed5af0
dependencies = [ dependencies = [
"chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
"csv 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "csv 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"zip 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "zip 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -3832,7 +3823,7 @@ version = "0.2.62"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
"wasm-bindgen-macro 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-bindgen-macro 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -3970,8 +3961,8 @@ name = "webgl_stdweb"
version = "0.3.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [ dependencies = [
"serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)",
"stdweb 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)", "stdweb 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)",
"stdweb-derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "stdweb-derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
"webgl_generator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "webgl_generator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -4451,8 +4442,8 @@ dependencies = [
"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" "checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af"
"checksum serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)" = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399" "checksum serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)" = "99e7b308464d16b56eba9964e4972a3eee817760ab60d88c3f86e1fecb08204c"
"checksum serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)" = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" "checksum serde_derive 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)" = "818fbf6bfa9a42d3bfcaca148547aa00c7b915bec71d1757aa2d44ca68771984"
"checksum serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)" = "da07b57ee2623368351e9a0488bb0b261322a15a6e0ae53e243cbdc0f4208da9" "checksum serde_json 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)" = "da07b57ee2623368351e9a0488bb0b261322a15a6e0ae53e243cbdc0f4208da9"
"checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" "checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
"checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" "checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"

3
abstutil/Cargo.toml
View File

@ -11,8 +11,7 @@ num_cpus = "1.10.0"
rand = "0.7.0" rand = "0.7.0"
rand_xorshift = "0.2.0" rand_xorshift = "0.2.0"
scoped_threadpool = "0.1.9" scoped_threadpool = "0.1.9"
serde = "1.0.98" serde = "1.0.110"
serde_derive = "1.0.98"
serde_json = "1.0.40" serde_json = "1.0.40"
[target.'cfg(target_os = "linux")'.dependencies] [target.'cfg(target_os = "linux")'.dependencies]

2
abstutil/src/random.rs
View File

@ -1,7 +1,7 @@
use rand::distributions::{Distribution, WeightedIndex}; use rand::distributions::{Distribution, WeightedIndex};
use rand::{RngCore, SeedableRng}; use rand::{RngCore, SeedableRng};
use rand_xorshift::XorShiftRng; use rand_xorshift::XorShiftRng;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
// Need to explain this trick -- basically keeps consistency between two different simulations when // Need to explain this trick -- basically keeps consistency between two different simulations when
// each one might make slightly different sequences of calls to the RNG. // each one might make slightly different sequences of calls to the RNG.

3
ezgui/Cargo.toml
View File

@ -25,8 +25,7 @@ image = { version = "0.23.4", default-features = false, features=["png"] }
instant = "0.1.2" instant = "0.1.2"
lru = "0.4.3" lru = "0.4.3"
lyon = "0.15.6" lyon = "0.15.6"
serde = "1.0.98" serde = "1.0.110"
serde_derive = "1.0.98"
simsearch = "0.2.0" simsearch = "0.2.0"
stdweb = { version = "0.4.20", optional = true } stdweb = { version = "0.4.20", optional = true }
stretch = "0.3.2" stretch = "0.3.2"

2
ezgui/src/canvas.rs
View File

@ -2,7 +2,7 @@ use crate::assets::Assets;
use crate::{ScreenDims, ScreenPt, ScreenRectangle, UserInput}; use crate::{ScreenDims, ScreenPt, ScreenRectangle, UserInput};
use abstutil::Timer; use abstutil::Timer;
use geom::{Bounds, Pt2D}; use geom::{Bounds, Pt2D};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::cell::RefCell; use std::cell::RefCell;
// Click and release counts as a normal click, not a drag, if the distance between click and // Click and release counts as a normal click, not a drag, if the distance between click and

2
ezgui/src/color.rs
View File

@ -1,5 +1,5 @@
use geom::{Line, Pt2D}; use geom::{Line, Pt2D};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::fmt; use std::fmt;
#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)] #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]

2
ezgui/src/screen_geom.rs
View File

@ -1,6 +1,6 @@
use crate::Canvas; use crate::Canvas;
use geom::{trim_f64, Polygon, Pt2D}; use geom::{trim_f64, Polygon, Pt2D};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[derive(Debug, Clone, Copy, PartialEq)] #[derive(Debug, Clone, Copy, PartialEq)]
pub struct ScreenPt { pub struct ScreenPt {

3
game/Cargo.toml
View File

@ -27,8 +27,7 @@ petgraph = "0.5.0"
rand = "0.7.0" rand = "0.7.0"
rand_xorshift = "0.2.0" rand_xorshift = "0.2.0"
reqwest = { version = "0.10.4", optional = true, default-features=false, features=["blocking", "default-tls"] } reqwest = { version = "0.10.4", optional = true, default-features=false, features=["blocking", "default-tls"] }
serde = "1.0.98" serde = "1.0.110"
serde_derive = "1.0.98"
sim = { path = "../sim" } sim = { path = "../sim" }
xmltree = "0.10.0" xmltree = "0.10.0"

2
game/src/common/shortcuts.rs
View File

@ -4,7 +4,7 @@ use crate::game::{State, Transition, WizardState};
use abstutil::{Cloneable, Timer}; use abstutil::{Cloneable, Timer};
use ezgui::{Choice, EventCtx, Key, Wizard}; use ezgui::{Choice, EventCtx, Key, Wizard};
use geom::{LonLat, Pt2D}; use geom::{LonLat, Pt2D};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[derive(Clone, Serialize, Deserialize)] #[derive(Clone, Serialize, Deserialize)]
struct Shortcut { struct Shortcut {

3
geom/Cargo.toml
View File

@ -14,5 +14,4 @@ histogram = "0.6.9"
instant = "0.1.2" instant = "0.1.2"
ordered-float = { version = "1.0.1", features=["serde"] } ordered-float = { version = "1.0.1", features=["serde"] }
polylabel = { git = "https://github.com/urschrei/polylabel-rs" } polylabel = { git = "https://github.com/urschrei/polylabel-rs" }
serde = "1.0.98" serde = "1.0.110"
serde_derive = "1.0.98"

2
geom/src/angle.rs
View File

@ -1,4 +1,4 @@
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::fmt; use std::fmt;
// Stores in radians // Stores in radians

2
geom/src/bounds.rs
View File

@ -1,6 +1,6 @@
use crate::{LonLat, Polygon, Pt2D}; use crate::{LonLat, Polygon, Pt2D};
use aabb_quadtree::geom::{Point, Rect}; use aabb_quadtree::geom::{Point, Rect};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
pub struct Bounds { pub struct Bounds {

2
geom/src/circle.rs
View File

@ -1,5 +1,5 @@
use crate::{Angle, Bounds, Distance, Polygon, Pt2D, Ring}; use crate::{Angle, Bounds, Distance, Polygon, Pt2D, Ring};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::fmt; use std::fmt;
const TRIANGLES_PER_CIRCLE: usize = 60; const TRIANGLES_PER_CIRCLE: usize = 60;

2
geom/src/distance.rs
View File

@ -1,5 +1,5 @@
use crate::{trim_f64, Duration, Speed}; use crate::{trim_f64, Duration, Speed};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::{cmp, f64, fmt, ops}; use std::{cmp, f64, fmt, ops};
// In meters. Can be negative. // In meters. Can be negative.

2
geom/src/duration.rs
View File

@ -1,7 +1,7 @@
use crate::{trim_f64, Distance, Speed}; use crate::{trim_f64, Distance, Speed};
use abstutil::elapsed_seconds; use abstutil::elapsed_seconds;
use instant::Instant; use instant::Instant;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::{cmp, ops}; use std::{cmp, ops};
// In seconds. Can be negative. // In seconds. Can be negative.

2
geom/src/gps.rs
View File

@ -1,6 +1,6 @@
use crate::Distance; use crate::Distance;
use ordered_float::NotNan; use ordered_float::NotNan;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::fmt; use std::fmt;
use std::fs::File; use std::fs::File;
use std::io::{BufRead, BufReader, Error, ErrorKind}; use std::io::{BufRead, BufReader, Error, ErrorKind};

2
geom/src/line.rs
View File

@ -1,6 +1,6 @@
use crate::{Angle, Distance, PolyLine, Polygon, Pt2D, EPSILON_DIST}; use crate::{Angle, Distance, PolyLine, Polygon, Pt2D, EPSILON_DIST};
use geo::prelude::ClosestPoint; use geo::prelude::ClosestPoint;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::fmt; use std::fmt;
// Segment, technically. Should rename. // Segment, technically. Should rename.

2
geom/src/polygon.rs
View File

@ -2,7 +2,7 @@ use crate::{Angle, Bounds, Distance, HashablePt2D, Pt2D, Ring};
use geo::algorithm::convexhull::ConvexHull; use geo::algorithm::convexhull::ConvexHull;
use geo_booleanop::boolean::BooleanOp; use geo_booleanop::boolean::BooleanOp;
use geo_offset::Offset; use geo_offset::Offset;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::fmt; use std::fmt;
#[derive(Serialize, Deserialize, Clone, Debug)] #[derive(Serialize, Deserialize, Clone, Debug)]

2
geom/src/polyline.rs
View File

@ -4,7 +4,7 @@ use crate::{
use abstutil::Warn; use abstutil::Warn;
use geo::algorithm::simplify::Simplify; use geo::algorithm::simplify::Simplify;
use ordered_float::NotNan; use ordered_float::NotNan;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::HashSet; use std::collections::HashSet;
use std::fmt; use std::fmt;

2
geom/src/pt.rs
View File

@ -1,6 +1,6 @@
use crate::{trim_f64, Angle, Distance, GPSBounds, LonLat, EPSILON_DIST}; use crate::{trim_f64, Angle, Distance, GPSBounds, LonLat, EPSILON_DIST};
use ordered_float::NotNan; use ordered_float::NotNan;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::fmt; use std::fmt;
// This represents world-space in meters. // This represents world-space in meters.

2
geom/src/ring.rs
View File

@ -1,5 +1,5 @@
use crate::{Distance, Line, PolyLine, Polygon, Pt2D}; use crate::{Distance, Line, PolyLine, Polygon, Pt2D};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::HashSet; use std::collections::HashSet;
use std::fmt; use std::fmt;

2
geom/src/speed.rs
View File

@ -1,5 +1,5 @@
use crate::{trim_f64, Distance, Duration, EPSILON_DIST}; use crate::{trim_f64, Distance, Duration, EPSILON_DIST};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::{fmt, ops}; use std::{fmt, ops};
// In meters per second. Can be negative. // In meters per second. Can be negative.

2
geom/src/stats.rs
View File

@ -1,5 +1,5 @@
use crate::Duration; use crate::Duration;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::convert::TryFrom; use std::convert::TryFrom;
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]

2
geom/src/time.rs
View File

@ -1,5 +1,5 @@
use crate::{trim_f64, Duration}; use crate::{trim_f64, Duration};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::{cmp, ops}; use std::{cmp, ops};
// In seconds since midnight. Can't be negative. // In seconds since midnight. Can't be negative.

3
gtfs/Cargo.toml
View File

@ -8,6 +8,5 @@ edition = "2018"
abstutil = { path = "../abstutil" } abstutil = { path = "../abstutil" }
geom = { path = "../geom" } geom = { path = "../geom" }
itertools = "0.8.0" itertools = "0.8.0"
serde = "1.0.98" serde = "1.0.110"
serde_derive = "1.0.98"
transitfeed = { git = "https://github.com/dabreegster/transitfeed" } transitfeed = { git = "https://github.com/dabreegster/transitfeed" }

2
gtfs/src/lib.rs
View File

@ -1,6 +1,6 @@
use geom::LonLat; use geom::LonLat;
use itertools::Itertools; use itertools::Itertools;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeSet, HashMap}; use std::collections::{BTreeSet, HashMap};
use transitfeed::GTFSIterator; use transitfeed::GTFSIterator;

3
importer/Cargo.toml
View File

@ -16,6 +16,5 @@ geom = { path = "../geom" }
gdal = { version = "0.6.0", optional = true } gdal = { version = "0.6.0", optional = true }
kml = { path = "../kml" } kml = { path = "../kml" }
map_model = { path = "../map_model" } map_model = { path = "../map_model" }
serde = "1.0.98" serde = "1.0.110"
serde_derive = "1.0.98"
sim = { path = "../sim" } sim = { path = "../sim" }

2
importer/src/soundcast/popdat.rs
View File

@ -2,7 +2,7 @@ use abstutil::{prettyprint_usize, Counter, FileWithProgress, Timer};
use geom::{Distance, Duration, FindClosest, LonLat, Pt2D, Time}; use geom::{Distance, Duration, FindClosest, LonLat, Pt2D, Time};
use kml::{ExtraShape, ExtraShapes}; use kml::{ExtraShape, ExtraShapes};
use map_model::Map; use map_model::Map;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use sim::{OrigPersonID, TripMode}; use sim::{OrigPersonID, TripMode};
use std::collections::{BTreeMap, HashMap, HashSet}; use std::collections::{BTreeMap, HashMap, HashSet};

3
kml/Cargo.toml
View File

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

2
kml/src/lib.rs
View File

@ -2,7 +2,7 @@ use abstutil::{prettyprint_usize, FileWithProgress, Timer};
use geom::{GPSBounds, LonLat}; use geom::{GPSBounds, LonLat};
use quick_xml::events::Event; use quick_xml::events::Event;
use quick_xml::Reader; use quick_xml::Reader;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::BTreeMap; use std::collections::BTreeMap;
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]

3
map_model/Cargo.toml
View File

@ -12,7 +12,6 @@ geom = { path = "../geom" }
gtfs = { path = "../gtfs" } gtfs = { path = "../gtfs" }
nbez = "0.1.0" nbez = "0.1.0"
petgraph = "0.5.0" petgraph = "0.5.0"
serde = "1.0.89" serde = "1.0.110"
serde_derive = "1.0.98"
thread_local = "1.0.1" thread_local = "1.0.1"
seattle_traffic_signals = { git = "https://github.com/dabreegster/seattle_traffic_signals" } seattle_traffic_signals = { git = "https://github.com/dabreegster/seattle_traffic_signals" }

2
map_model/src/area.rs
View File

@ -1,5 +1,5 @@
use geom::Polygon; use geom::Polygon;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::fmt; use std::fmt;

2
map_model/src/building.rs
View File

@ -1,6 +1,6 @@
use crate::{LaneID, Position}; use crate::{LaneID, Position};
use geom::{Line, PolyLine, Polygon, Pt2D}; use geom::{Line, PolyLine, Polygon, Pt2D};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::BTreeSet; use std::collections::BTreeSet;
use std::fmt; use std::fmt;

2
map_model/src/bus_stop.rs
View File

@ -1,5 +1,5 @@
use crate::{LaneID, Position}; use crate::{LaneID, Position};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::fmt; use std::fmt;
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)] #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]

2
map_model/src/edits.rs
View File

@ -4,7 +4,7 @@ use crate::{
}; };
use abstutil::{deserialize_btreemap, retain_btreemap, retain_btreeset, serialize_btreemap, Timer}; use abstutil::{deserialize_btreemap, retain_btreemap, retain_btreeset, serialize_btreemap, Timer};
use geom::Speed; use geom::Speed;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet}; use std::collections::{BTreeMap, BTreeSet};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]

2
map_model/src/intersection.rs
View File

@ -1,7 +1,7 @@
use crate::raw::OriginalIntersection; use crate::raw::OriginalIntersection;
use crate::{DirectedRoadID, LaneID, Map, PathConstraints, Road, RoadID, TurnID}; use crate::{DirectedRoadID, LaneID, Map, PathConstraints, Road, RoadID, TurnID};
use geom::{Distance, Polygon}; use geom::{Distance, Polygon};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::BTreeSet; use std::collections::BTreeSet;
use std::fmt; use std::fmt;

2
map_model/src/lane.rs
View File

@ -4,7 +4,7 @@ use crate::{
TurnType, TurnType,
}; };
use geom::{Angle, Distance, Line, PolyLine, Pt2D}; use geom::{Angle, Distance, Line, PolyLine, Pt2D};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::BTreeSet; use std::collections::BTreeSet;
use std::fmt; use std::fmt;

2
map_model/src/make/initial/lane_specs.rs
View File

@ -1,5 +1,5 @@
use crate::{osm, LaneType}; use crate::{osm, LaneType};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::{fmt, iter}; use std::{fmt, iter};

2
map_model/src/map.rs
View File

@ -9,7 +9,7 @@ use crate::{
}; };
use abstutil::{deserialize_btreemap, serialize_btreemap, Error, Timer, Warn}; use abstutil::{deserialize_btreemap, serialize_btreemap, Error, Timer, Warn};
use geom::{Angle, Bounds, Distance, GPSBounds, Line, PolyLine, Polygon, Pt2D, Speed}; use geom::{Angle, Bounds, Distance, GPSBounds, Line, PolyLine, Polygon, Pt2D, Speed};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet, HashSet, VecDeque}; use std::collections::{BTreeMap, BTreeSet, HashSet, VecDeque};
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]

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

@ -3,7 +3,7 @@ use crate::pathfind::uber_turns::{IntersectionCluster, UberTurn};
use crate::{Lane, LaneID, Map, Path, PathConstraints, PathRequest, PathStep, Turn, TurnID}; use crate::{Lane, LaneID, Map, Path, PathConstraints, PathRequest, PathStep, Turn, TurnID};
use abstutil::MultiMap; use abstutil::MultiMap;
use fast_paths::{deserialize_32, serialize_32, FastGraph, InputGraph, PathCalculator}; use fast_paths::{deserialize_32, serialize_32, FastGraph, InputGraph, PathCalculator};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::cell::RefCell; use std::cell::RefCell;
use thread_local::ThreadLocal; use thread_local::ThreadLocal;

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

@ -12,7 +12,7 @@ use crate::{
}; };
use abstutil::Timer; use abstutil::Timer;
use geom::{Distance, PolyLine, EPSILON_DIST}; use geom::{Distance, PolyLine, EPSILON_DIST};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::VecDeque; use std::collections::VecDeque;
use std::fmt; use std::fmt;

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

@ -1,7 +1,7 @@
use crate::{IntersectionID, Map, TurnID}; use crate::{IntersectionID, Map, TurnID};
use geom::PolyLine; use geom::PolyLine;
use petgraph::graphmap::UnGraphMap; use petgraph::graphmap::UnGraphMap;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet}; use std::collections::{BTreeMap, BTreeSet};
// This only applies to VehiclePathfinder; walking through these intersections is nothing special. // This only applies to VehiclePathfinder; walking through these intersections is nothing special.

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

@ -5,7 +5,7 @@ use crate::{
}; };
use fast_paths::{deserialize_32, serialize_32, FastGraph, InputGraph, PathCalculator}; use fast_paths::{deserialize_32, serialize_32, FastGraph, InputGraph, PathCalculator};
use geom::{Distance, Speed}; use geom::{Distance, Speed};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::cell::RefCell; use std::cell::RefCell;
use thread_local::ThreadLocal; use thread_local::ThreadLocal;

2
map_model/src/raw.rs
View File

@ -3,7 +3,7 @@ use crate::{osm, AreaType, IntersectionType, RoadSpec};
use abstutil::{deserialize_btreemap, serialize_btreemap, Timer, Warn}; use abstutil::{deserialize_btreemap, serialize_btreemap, Timer, Warn};
use geom::{Angle, Distance, GPSBounds, Line, PolyLine, Polygon, Pt2D}; use geom::{Angle, Distance, GPSBounds, Line, PolyLine, Polygon, Pt2D};
use gtfs::Route; use gtfs::Route;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet}; use std::collections::{BTreeMap, BTreeSet};
use std::fmt; use std::fmt;

2
map_model/src/road.rs
View File

@ -2,7 +2,7 @@ use crate::raw::{OriginalRoad, RestrictionType};
use crate::{osm, BusStopID, IntersectionID, LaneID, LaneType, Map, PathConstraints}; use crate::{osm, BusStopID, IntersectionID, LaneID, LaneType, Map, PathConstraints};
use abstutil::{Error, Warn}; use abstutil::{Error, Warn};
use geom::{Distance, PolyLine, Polygon, Speed}; use geom::{Distance, PolyLine, Polygon, Speed};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, HashSet}; use std::collections::{BTreeMap, HashSet};
use std::fmt; use std::fmt;

2
map_model/src/stop_signs.rs
View File

@ -1,6 +1,6 @@
use crate::{IntersectionID, LaneID, Map, RoadID, TurnID, TurnPriority, TurnType}; use crate::{IntersectionID, LaneID, Map, RoadID, TurnID, TurnPriority, TurnType};
use abstutil::{deserialize_btreemap, serialize_btreemap}; use abstutil::{deserialize_btreemap, serialize_btreemap};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, HashMap}; use std::collections::{BTreeMap, HashMap};
// TODO These are old notes, they don't reflect current reality. But some of the ideas here should // TODO These are old notes, they don't reflect current reality. But some of the ideas here should

2
map_model/src/traffic_signals.rs
View File

@ -4,7 +4,7 @@ use crate::{
}; };
use abstutil::{deserialize_btreemap, retain_btreeset, serialize_btreemap, Timer}; use abstutil::{deserialize_btreemap, retain_btreeset, serialize_btreemap, Timer};
use geom::{Duration, Time}; use geom::{Duration, Time};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet}; use std::collections::{BTreeMap, BTreeSet};
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)] #[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]

2
map_model/src/traversable.rs
View File

@ -1,6 +1,6 @@
use crate::{BuildingID, LaneID, LaneType, Map, TurnID}; use crate::{BuildingID, LaneID, LaneType, Map, TurnID};
use geom::{Angle, Distance, PolyLine, Pt2D, Speed}; use geom::{Angle, Distance, PolyLine, Pt2D, Speed};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::fmt; use std::fmt;
#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)]

2
map_model/src/turn.rs
View File

@ -1,7 +1,7 @@
use crate::{DirectedRoadID, IntersectionID, LaneID, Map}; use crate::{DirectedRoadID, IntersectionID, LaneID, Map};
use abstutil::MultiMap; use abstutil::MultiMap;
use geom::{Angle, Distance, PolyLine, Pt2D}; use geom::{Angle, Distance, PolyLine, Pt2D};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet}; use std::collections::{BTreeMap, BTreeSet};
use std::fmt; use std::fmt;

5
sim/Cargo.toml
View File

@ -9,10 +9,9 @@ abstutil = { path = "../abstutil" }
derivative = "1.0.0" derivative = "1.0.0"
geom = { path = "../geom" } geom = { path = "../geom" }
instant = "0.1.2" instant = "0.1.2"
libm = "0.2.1"
map_model = { path = "../map_model" } map_model = { path = "../map_model" }
rand = "0.7.0" rand = "0.7.0"
rand_distr = "0.2.2" rand_distr = "0.2.2"
rand_xorshift = "0.2.0" rand_xorshift = "0.2.0"
serde = "1.0.98" serde = "1.0.110"
serde_derive = "1.0.98"
libm = "0.2.1"

2
sim/src/analytics.rs
View File

@ -5,7 +5,7 @@ use map_model::{
BusRouteID, BusStopID, IntersectionID, LaneID, Map, Path, PathRequest, RoadID, Traversable, BusRouteID, BusStopID, IntersectionID, LaneID, Map, Path, PathRequest, RoadID, Traversable,
TurnGroupID, TurnGroupID,
}; };
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, VecDeque}; use std::collections::{BTreeMap, VecDeque};
#[derive(Clone, Serialize, Deserialize)] #[derive(Clone, Serialize, Deserialize)]

2
sim/src/events.rs
View File

@ -5,7 +5,7 @@ use geom::Duration;
use map_model::{ use map_model::{
BuildingID, BusRouteID, BusStopID, IntersectionID, LaneID, Map, Path, PathRequest, Traversable, BuildingID, BusRouteID, BusStopID, IntersectionID, LaneID, Map, Path, PathRequest, Traversable,
}; };
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
// Many of these were created for a test framework that's been abandoned. They could be removed or // Many of these were created for a test framework that's been abandoned. They could be removed or
// have their API adjusted, but it's not urgent; publishing an event that's not used by Analytics // have their API adjusted, but it's not urgent; publishing an event that's not used by Analytics

2
sim/src/lib.rs
View File

@ -38,7 +38,7 @@ use map_model::{
BuildingID, BusStopID, DirectedRoadID, IntersectionID, LaneID, Map, Path, PathConstraints, BuildingID, BusStopID, DirectedRoadID, IntersectionID, LaneID, Map, Path, PathConstraints,
PathRequest, Position, PathRequest, Position,
}; };
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::fmt; use std::fmt;

2
sim/src/make/generator.rs
View File

@ -5,7 +5,7 @@ use map_model::{BuildingID, DirectedRoadID, Map, PathConstraints};
use rand::seq::SliceRandom; use rand::seq::SliceRandom;
use rand::Rng; use rand::Rng;
use rand_xorshift::XorShiftRng; use rand_xorshift::XorShiftRng;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::BTreeSet; use std::collections::BTreeSet;
// A way to generate Scenarios // A way to generate Scenarios

2
sim/src/make/scenario.rs
View File

@ -11,7 +11,7 @@ use map_model::{
use rand::seq::SliceRandom; use rand::seq::SliceRandom;
use rand::{Rng, SeedableRng}; use rand::{Rng, SeedableRng};
use rand_xorshift::XorShiftRng; use rand_xorshift::XorShiftRng;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet, HashSet, VecDeque}; use std::collections::{BTreeMap, BTreeSet, HashSet, VecDeque};
// How to start a simulation. // How to start a simulation.

2
sim/src/make/spawner.rs
View File

@ -7,7 +7,7 @@ use geom::{Duration, Time, EPSILON_DIST};
use map_model::{ use map_model::{
BuildingID, BusRouteID, BusStopID, IntersectionID, Map, PathConstraints, PathRequest, Position, BuildingID, BusRouteID, BusStopID, IntersectionID, Map, PathConstraints, PathRequest, Position,
}; };
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
// TODO Some of these fields are unused now that we separately pass TripEndpoint // TODO Some of these fields are unused now that we separately pass TripEndpoint
#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)] #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]

2
sim/src/mechanics/car.rs
View File

@ -4,7 +4,7 @@ use crate::{
}; };
use geom::{Distance, Duration, PolyLine, Time}; use geom::{Distance, Duration, PolyLine, Time};
use map_model::{Map, Traversable}; use map_model::{Map, Traversable};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::VecDeque; use std::collections::VecDeque;
#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)] #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]

2
sim/src/mechanics/driving.rs
View File

@ -9,7 +9,7 @@ use crate::{
use abstutil::{deserialize_btreemap, serialize_btreemap}; use abstutil::{deserialize_btreemap, serialize_btreemap};
use geom::{Distance, Duration, PolyLine, Time}; use geom::{Distance, Duration, PolyLine, Time};
use map_model::{LaneID, Map, Path, PathStep, Traversable}; use map_model::{LaneID, Map, Path, PathStep, Traversable};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, HashSet, VecDeque}; use std::collections::{BTreeMap, HashSet, VecDeque};
const TIME_TO_UNPARK: Duration = Duration::const_seconds(10.0); const TIME_TO_UNPARK: Duration = Duration::const_seconds(10.0);

2
sim/src/mechanics/intersection.rs
View File

@ -7,7 +7,7 @@ use map_model::{
ControlStopSign, ControlTrafficSignal, IntersectionID, LaneID, Map, RoadID, Traversable, ControlStopSign, ControlTrafficSignal, IntersectionID, LaneID, Map, RoadID, Traversable,
TurnID, TurnPriority, TurnType, TurnID, TurnPriority, TurnType,
}; };
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet, HashSet}; use std::collections::{BTreeMap, BTreeSet, HashSet};
const WAIT_AT_STOP_SIGN: Duration = Duration::const_seconds(0.5); const WAIT_AT_STOP_SIGN: Duration = Duration::const_seconds(0.5);

2
sim/src/mechanics/parking.rs
View File

@ -9,7 +9,7 @@ use map_model::{
BuildingID, Lane, LaneID, LaneType, Map, PathConstraints, PathStep, Position, Traversable, BuildingID, Lane, LaneID, LaneType, Map, PathConstraints, PathStep, Position, Traversable,
TurnID, TurnID,
}; };
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet, BinaryHeap, HashMap}; use std::collections::{BTreeMap, BTreeSet, BinaryHeap, HashMap};
#[derive(Serialize, Deserialize, PartialEq, Clone)] #[derive(Serialize, Deserialize, PartialEq, Clone)]

2
sim/src/mechanics/queue.rs
View File

@ -2,7 +2,7 @@ use crate::mechanics::car::{Car, CarState};
use crate::{CarID, FOLLOWING_DISTANCE}; use crate::{CarID, FOLLOWING_DISTANCE};
use geom::{Distance, Time}; use geom::{Distance, Time};
use map_model::{Map, Traversable}; use map_model::{Map, Traversable};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, BTreeSet, VecDeque}; use std::collections::{BTreeMap, BTreeSet, VecDeque};
#[derive(Serialize, Deserialize, PartialEq, Clone)] #[derive(Serialize, Deserialize, PartialEq, Clone)]

2
sim/src/mechanics/walking.rs
View File

@ -7,7 +7,7 @@ use crate::{
use abstutil::{deserialize_multimap, serialize_multimap, MultiMap}; use abstutil::{deserialize_multimap, serialize_multimap, MultiMap};
use geom::{Distance, Duration, Line, PolyLine, Speed, Time}; use geom::{Distance, Duration, Line, PolyLine, Speed, Time};
use map_model::{BuildingID, BusRouteID, Map, Path, PathStep, Traversable, SIDEWALK_THICKNESS}; use map_model::{BuildingID, BusRouteID, Map, Path, PathStep, Traversable, SIDEWALK_THICKNESS};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::BTreeMap; use std::collections::BTreeMap;
const TIME_TO_START_BIKING: Duration = Duration::const_seconds(30.0); const TIME_TO_START_BIKING: Duration = Duration::const_seconds(30.0);

2
sim/src/pandemic/pandemic.rs
View File

@ -4,7 +4,7 @@ use geom::{Duration, Time};
use map_model::{BuildingID, BusStopID}; use map_model::{BuildingID, BusStopID};
use rand::Rng; use rand::Rng;
use rand_xorshift::XorShiftRng; use rand_xorshift::XorShiftRng;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::BTreeMap; use std::collections::BTreeMap;
// TODO This does not model transmission by surfaces; only person-to-person. // TODO This does not model transmission by surfaces; only person-to-person.

2
sim/src/router.rs
View File

@ -7,7 +7,7 @@ use map_model::{
BuildingID, IntersectionID, Map, Path, PathConstraints, PathRequest, PathStep, Position, BuildingID, IntersectionID, Map, Path, PathConstraints, PathRequest, PathStep, Position,
Traversable, TurnID, Traversable, TurnID,
}; };
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::BTreeMap; use std::collections::BTreeMap;
#[derive(Serialize, Deserialize, Clone, Debug, PartialEq)] #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]

2
sim/src/scheduler.rs
View File

@ -4,7 +4,7 @@ use crate::{
use derivative::Derivative; use derivative::Derivative;
use geom::{Duration, Histogram, Time}; use geom::{Duration, Histogram, Time};
use map_model::{IntersectionID, Path, PathRequest}; use map_model::{IntersectionID, Path, PathRequest};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::cmp::Ordering; use std::cmp::Ordering;
use std::collections::btree_map::Entry; use std::collections::btree_map::Entry;
use std::collections::{BTreeMap, BinaryHeap}; use std::collections::{BTreeMap, BinaryHeap};

2
sim/src/sim.rs
View File

@ -15,7 +15,7 @@ use map_model::{
PathRequest, PathStep, Position, RoadID, Traversable, PathRequest, PathStep, Position, RoadID, Traversable,
}; };
use rand_xorshift::XorShiftRng; use rand_xorshift::XorShiftRng;
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, HashSet}; use std::collections::{BTreeMap, HashSet};
use std::panic; use std::panic;

2
sim/src/transit.rs
View File

@ -7,7 +7,7 @@ use geom::{Distance, Time};
use map_model::{ use map_model::{
BusRoute, BusRouteID, BusStopID, Map, Path, PathConstraints, PathRequest, Position, BusRoute, BusRouteID, BusStopID, Map, Path, PathConstraints, PathRequest, Position,
}; };
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::BTreeMap; use std::collections::BTreeMap;
// These index stops along a route, not stops along a single sidewalk. // These index stops along a route, not stops along a single sidewalk.

2
sim/src/trips.rs
View File

@ -10,7 +10,7 @@ use map_model::{
BuildingID, BusRouteID, BusStopID, IntersectionID, Map, Path, PathConstraints, PathRequest, BuildingID, BusRouteID, BusStopID, IntersectionID, Map, Path, PathConstraints, PathRequest,
Position, Position,
}; };
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::collections::{BTreeMap, VecDeque}; use std::collections::{BTreeMap, VecDeque};
#[derive(Serialize, Deserialize, PartialEq, Debug, Clone)] #[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]