From ddf6de5f592c6d82203d3d361d2e6c228079e851 Mon Sep 17 00:00:00 2001 From: Dustin Carlino Date: Tue, 19 May 2020 15:06:32 -0700 Subject: [PATCH] stop dependending directly on serde_derive --- Cargo.lock | 101 +++++++++++------------ abstutil/Cargo.toml | 3 +- abstutil/src/random.rs | 2 +- ezgui/Cargo.toml | 3 +- ezgui/src/canvas.rs | 2 +- ezgui/src/color.rs | 2 +- ezgui/src/screen_geom.rs | 2 +- game/Cargo.toml | 3 +- game/src/common/shortcuts.rs | 2 +- geom/Cargo.toml | 3 +- geom/src/angle.rs | 2 +- geom/src/bounds.rs | 2 +- geom/src/circle.rs | 2 +- geom/src/distance.rs | 2 +- geom/src/duration.rs | 2 +- geom/src/gps.rs | 2 +- geom/src/line.rs | 2 +- geom/src/polygon.rs | 2 +- geom/src/polyline.rs | 2 +- geom/src/pt.rs | 2 +- geom/src/ring.rs | 2 +- geom/src/speed.rs | 2 +- geom/src/stats.rs | 2 +- geom/src/time.rs | 2 +- gtfs/Cargo.toml | 3 +- gtfs/src/lib.rs | 2 +- importer/Cargo.toml | 3 +- importer/src/soundcast/popdat.rs | 2 +- kml/Cargo.toml | 3 +- kml/src/lib.rs | 2 +- map_model/Cargo.toml | 3 +- map_model/src/area.rs | 2 +- map_model/src/building.rs | 2 +- map_model/src/bus_stop.rs | 2 +- map_model/src/edits.rs | 2 +- map_model/src/intersection.rs | 2 +- map_model/src/lane.rs | 2 +- map_model/src/make/initial/lane_specs.rs | 2 +- map_model/src/map.rs | 2 +- map_model/src/pathfind/driving.rs | 2 +- map_model/src/pathfind/mod.rs | 2 +- map_model/src/pathfind/uber_turns.rs | 2 +- map_model/src/pathfind/walking.rs | 2 +- map_model/src/raw.rs | 2 +- map_model/src/road.rs | 2 +- map_model/src/stop_signs.rs | 2 +- map_model/src/traffic_signals.rs | 2 +- map_model/src/traversable.rs | 2 +- map_model/src/turn.rs | 2 +- sim/Cargo.toml | 5 +- sim/src/analytics.rs | 2 +- sim/src/events.rs | 2 +- sim/src/lib.rs | 2 +- sim/src/make/generator.rs | 2 +- sim/src/make/scenario.rs | 2 +- sim/src/make/spawner.rs | 2 +- sim/src/mechanics/car.rs | 2 +- sim/src/mechanics/driving.rs | 2 +- sim/src/mechanics/intersection.rs | 2 +- sim/src/mechanics/parking.rs | 2 +- sim/src/mechanics/queue.rs | 2 +- sim/src/mechanics/walking.rs | 2 +- sim/src/pandemic/pandemic.rs | 2 +- sim/src/router.rs | 2 +- sim/src/scheduler.rs | 2 +- sim/src/sim.rs | 2 +- sim/src/transit.rs | 2 +- sim/src/trips.rs | 2 +- 68 files changed, 114 insertions(+), 132 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index feb3c43540..99daf84018 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,8 +25,7 @@ dependencies = [ "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)", "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_derive 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)", "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)", @@ -178,7 +177,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "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]] @@ -231,7 +230,7 @@ dependencies = [ "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)", "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]] @@ -305,7 +304,7 @@ version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "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)", "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)", "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)", - "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)", "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)", @@ -354,7 +353,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "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)", - "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)", ] @@ -457,7 +456,7 @@ dependencies = [ "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)", "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)", "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)", @@ -595,7 +594,7 @@ dependencies = [ "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)", "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]] @@ -688,7 +687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "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)", - "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)", ] @@ -820,8 +819,7 @@ dependencies = [ "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)", "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_derive 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)", "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)", "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 = [ "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)", - "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]] @@ -1059,8 +1057,7 @@ dependencies = [ "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)", "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_derive 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)", "sim 0.1.0", "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)", @@ -1149,8 +1146,7 @@ dependencies = [ "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)", "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_derive 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]] @@ -1299,8 +1295,7 @@ dependencies = [ "abstutil 0.1.0", "geom 0.1.0", "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_derive 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)", "transitfeed 0.3.0 (git+https://github.com/dabreegster/transitfeed)", ] @@ -1614,8 +1609,7 @@ dependencies = [ "geom 0.1.0", "kml 0.1.0", "map_model 0.1.0", - "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 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)", "sim 0.1.0", ] @@ -1728,8 +1722,7 @@ dependencies = [ "abstutil 0.1.0", "geom 0.1.0", "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_derive 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]] @@ -1756,8 +1749,8 @@ dependencies = [ "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-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_derive 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.110 (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)", "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)", "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)", - "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 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)", "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" dependencies = [ "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]] @@ -2761,7 +2753,7 @@ dependencies = [ "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)", "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_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)", @@ -2797,7 +2789,7 @@ dependencies = [ "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)", "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)", "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)", @@ -2906,8 +2898,8 @@ version = "0.1.0" source = "git+https://github.com/dabreegster/seattle_traffic_signals#7f049d91e60fe72a65fb0d04c5b23d2c8cd524a9" dependencies = [ "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_derive 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.110 (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" dependencies = [ "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]] @@ -2953,15 +2945,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.106" +version = "1.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" 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]] name = "serde_derive" -version = "1.0.106" +version = "1.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "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 = [ "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)", - "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]] @@ -2986,7 +2978,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "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)", - "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)", ] @@ -2997,7 +2989,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "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)", - "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)", ] @@ -3056,8 +3048,7 @@ dependencies = [ "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_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_derive 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]] @@ -3138,7 +3129,7 @@ dependencies = [ "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)", "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)", "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)", @@ -3153,8 +3144,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "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)", - "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 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.110 (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)", "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)", - "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 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.110 (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)", "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)", "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)", - "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_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3594,7 +3585,7 @@ name = "toml" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" 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]] @@ -3609,8 +3600,8 @@ source = "git+https://github.com/dabreegster/transitfeed#8a8d11e3602fb99b8ed5af0 dependencies = [ "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)", - "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 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.110 (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)", ] @@ -3832,7 +3823,7 @@ version = "0.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "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)", "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" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 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.110 (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)", "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-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 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)" = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399" -"checksum serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)" = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" +"checksum serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)" = "99e7b308464d16b56eba9964e4972a3eee817760ab60d88c3f86e1fecb08204c" +"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_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" diff --git a/abstutil/Cargo.toml b/abstutil/Cargo.toml index 9ed04bb8a7..ddcaa1cc16 100644 --- a/abstutil/Cargo.toml +++ b/abstutil/Cargo.toml @@ -11,8 +11,7 @@ num_cpus = "1.10.0" rand = "0.7.0" rand_xorshift = "0.2.0" scoped_threadpool = "0.1.9" -serde = "1.0.98" -serde_derive = "1.0.98" +serde = "1.0.110" serde_json = "1.0.40" [target.'cfg(target_os = "linux")'.dependencies] diff --git a/abstutil/src/random.rs b/abstutil/src/random.rs index a24648bf20..ea280de940 100644 --- a/abstutil/src/random.rs +++ b/abstutil/src/random.rs @@ -1,7 +1,7 @@ use rand::distributions::{Distribution, WeightedIndex}; use rand::{RngCore, SeedableRng}; 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 // each one might make slightly different sequences of calls to the RNG. diff --git a/ezgui/Cargo.toml b/ezgui/Cargo.toml index 099255c6b9..9d834f4a9c 100644 --- a/ezgui/Cargo.toml +++ b/ezgui/Cargo.toml @@ -25,8 +25,7 @@ image = { version = "0.23.4", default-features = false, features=["png"] } instant = "0.1.2" lru = "0.4.3" lyon = "0.15.6" -serde = "1.0.98" -serde_derive = "1.0.98" +serde = "1.0.110" simsearch = "0.2.0" stdweb = { version = "0.4.20", optional = true } stretch = "0.3.2" diff --git a/ezgui/src/canvas.rs b/ezgui/src/canvas.rs index eb9259c817..0ebdf1959b 100644 --- a/ezgui/src/canvas.rs +++ b/ezgui/src/canvas.rs @@ -2,7 +2,7 @@ use crate::assets::Assets; use crate::{ScreenDims, ScreenPt, ScreenRectangle, UserInput}; use abstutil::Timer; use geom::{Bounds, Pt2D}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::cell::RefCell; // Click and release counts as a normal click, not a drag, if the distance between click and diff --git a/ezgui/src/color.rs b/ezgui/src/color.rs index 91b004d86a..595167d7a4 100644 --- a/ezgui/src/color.rs +++ b/ezgui/src/color.rs @@ -1,5 +1,5 @@ use geom::{Line, Pt2D}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::fmt; #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)] diff --git a/ezgui/src/screen_geom.rs b/ezgui/src/screen_geom.rs index bcb00a761b..3a88e137d1 100644 --- a/ezgui/src/screen_geom.rs +++ b/ezgui/src/screen_geom.rs @@ -1,6 +1,6 @@ use crate::Canvas; use geom::{trim_f64, Polygon, Pt2D}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Copy, PartialEq)] pub struct ScreenPt { diff --git a/game/Cargo.toml b/game/Cargo.toml index 3438a62827..2ea9487d9a 100644 --- a/game/Cargo.toml +++ b/game/Cargo.toml @@ -27,8 +27,7 @@ petgraph = "0.5.0" rand = "0.7.0" rand_xorshift = "0.2.0" reqwest = { version = "0.10.4", optional = true, default-features=false, features=["blocking", "default-tls"] } -serde = "1.0.98" -serde_derive = "1.0.98" +serde = "1.0.110" sim = { path = "../sim" } xmltree = "0.10.0" diff --git a/game/src/common/shortcuts.rs b/game/src/common/shortcuts.rs index 0324a0832f..f8c6339ce4 100644 --- a/game/src/common/shortcuts.rs +++ b/game/src/common/shortcuts.rs @@ -4,7 +4,7 @@ use crate::game::{State, Transition, WizardState}; use abstutil::{Cloneable, Timer}; use ezgui::{Choice, EventCtx, Key, Wizard}; use geom::{LonLat, Pt2D}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; #[derive(Clone, Serialize, Deserialize)] struct Shortcut { diff --git a/geom/Cargo.toml b/geom/Cargo.toml index da7bf69c85..6178716520 100644 --- a/geom/Cargo.toml +++ b/geom/Cargo.toml @@ -14,5 +14,4 @@ histogram = "0.6.9" instant = "0.1.2" ordered-float = { version = "1.0.1", features=["serde"] } polylabel = { git = "https://github.com/urschrei/polylabel-rs" } -serde = "1.0.98" -serde_derive = "1.0.98" +serde = "1.0.110" diff --git a/geom/src/angle.rs b/geom/src/angle.rs index d885449fc0..1c1866a00e 100644 --- a/geom/src/angle.rs +++ b/geom/src/angle.rs @@ -1,4 +1,4 @@ -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::fmt; // Stores in radians diff --git a/geom/src/bounds.rs b/geom/src/bounds.rs index f7356093b7..cd7ca18461 100644 --- a/geom/src/bounds.rs +++ b/geom/src/bounds.rs @@ -1,6 +1,6 @@ use crate::{LonLat, Polygon, Pt2D}; use aabb_quadtree::geom::{Point, Rect}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, Serialize, Deserialize)] pub struct Bounds { diff --git a/geom/src/circle.rs b/geom/src/circle.rs index c57022c73c..fa28cbd725 100644 --- a/geom/src/circle.rs +++ b/geom/src/circle.rs @@ -1,5 +1,5 @@ use crate::{Angle, Bounds, Distance, Polygon, Pt2D, Ring}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::fmt; const TRIANGLES_PER_CIRCLE: usize = 60; diff --git a/geom/src/distance.rs b/geom/src/distance.rs index c8b7da8d1d..cac68bd3f9 100644 --- a/geom/src/distance.rs +++ b/geom/src/distance.rs @@ -1,5 +1,5 @@ use crate::{trim_f64, Duration, Speed}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::{cmp, f64, fmt, ops}; // In meters. Can be negative. diff --git a/geom/src/duration.rs b/geom/src/duration.rs index e9e698c8ec..e1cab19677 100644 --- a/geom/src/duration.rs +++ b/geom/src/duration.rs @@ -1,7 +1,7 @@ use crate::{trim_f64, Distance, Speed}; use abstutil::elapsed_seconds; use instant::Instant; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::{cmp, ops}; // In seconds. Can be negative. diff --git a/geom/src/gps.rs b/geom/src/gps.rs index 3b3cd7e2b9..cd8a9487cf 100644 --- a/geom/src/gps.rs +++ b/geom/src/gps.rs @@ -1,6 +1,6 @@ use crate::Distance; use ordered_float::NotNan; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::fmt; use std::fs::File; use std::io::{BufRead, BufReader, Error, ErrorKind}; diff --git a/geom/src/line.rs b/geom/src/line.rs index 0459dcec1e..6671f1909e 100644 --- a/geom/src/line.rs +++ b/geom/src/line.rs @@ -1,6 +1,6 @@ use crate::{Angle, Distance, PolyLine, Polygon, Pt2D, EPSILON_DIST}; use geo::prelude::ClosestPoint; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::fmt; // Segment, technically. Should rename. diff --git a/geom/src/polygon.rs b/geom/src/polygon.rs index 4ced688f9e..ba0f435cb2 100644 --- a/geom/src/polygon.rs +++ b/geom/src/polygon.rs @@ -2,7 +2,7 @@ use crate::{Angle, Bounds, Distance, HashablePt2D, Pt2D, Ring}; use geo::algorithm::convexhull::ConvexHull; use geo_booleanop::boolean::BooleanOp; use geo_offset::Offset; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::fmt; #[derive(Serialize, Deserialize, Clone, Debug)] diff --git a/geom/src/polyline.rs b/geom/src/polyline.rs index 51ea437a48..73357bcbb6 100644 --- a/geom/src/polyline.rs +++ b/geom/src/polyline.rs @@ -4,7 +4,7 @@ use crate::{ use abstutil::Warn; use geo::algorithm::simplify::Simplify; use ordered_float::NotNan; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::HashSet; use std::fmt; diff --git a/geom/src/pt.rs b/geom/src/pt.rs index 09d617a0f5..b739c1580a 100644 --- a/geom/src/pt.rs +++ b/geom/src/pt.rs @@ -1,6 +1,6 @@ use crate::{trim_f64, Angle, Distance, GPSBounds, LonLat, EPSILON_DIST}; use ordered_float::NotNan; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::fmt; // This represents world-space in meters. diff --git a/geom/src/ring.rs b/geom/src/ring.rs index 9d4b751185..6b8306afcc 100644 --- a/geom/src/ring.rs +++ b/geom/src/ring.rs @@ -1,5 +1,5 @@ use crate::{Distance, Line, PolyLine, Polygon, Pt2D}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::HashSet; use std::fmt; diff --git a/geom/src/speed.rs b/geom/src/speed.rs index f6ee64488d..fcb0e6b33a 100644 --- a/geom/src/speed.rs +++ b/geom/src/speed.rs @@ -1,5 +1,5 @@ use crate::{trim_f64, Distance, Duration, EPSILON_DIST}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::{fmt, ops}; // In meters per second. Can be negative. diff --git a/geom/src/stats.rs b/geom/src/stats.rs index d848f35062..5bfe78ebe5 100644 --- a/geom/src/stats.rs +++ b/geom/src/stats.rs @@ -1,5 +1,5 @@ use crate::Duration; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::convert::TryFrom; #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)] diff --git a/geom/src/time.rs b/geom/src/time.rs index 5cbcd74f0b..85cb9e6aff 100644 --- a/geom/src/time.rs +++ b/geom/src/time.rs @@ -1,5 +1,5 @@ use crate::{trim_f64, Duration}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::{cmp, ops}; // In seconds since midnight. Can't be negative. diff --git a/gtfs/Cargo.toml b/gtfs/Cargo.toml index 9890806e3d..8f41db4226 100644 --- a/gtfs/Cargo.toml +++ b/gtfs/Cargo.toml @@ -8,6 +8,5 @@ edition = "2018" abstutil = { path = "../abstutil" } geom = { path = "../geom" } itertools = "0.8.0" -serde = "1.0.98" -serde_derive = "1.0.98" +serde = "1.0.110" transitfeed = { git = "https://github.com/dabreegster/transitfeed" } diff --git a/gtfs/src/lib.rs b/gtfs/src/lib.rs index 2a3b07d11f..51a2201cc8 100644 --- a/gtfs/src/lib.rs +++ b/gtfs/src/lib.rs @@ -1,6 +1,6 @@ use geom::LonLat; use itertools::Itertools; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeSet, HashMap}; use transitfeed::GTFSIterator; diff --git a/importer/Cargo.toml b/importer/Cargo.toml index b78421f94f..129b6c0edd 100644 --- a/importer/Cargo.toml +++ b/importer/Cargo.toml @@ -16,6 +16,5 @@ geom = { path = "../geom" } gdal = { version = "0.6.0", optional = true } kml = { path = "../kml" } map_model = { path = "../map_model" } -serde = "1.0.98" -serde_derive = "1.0.98" +serde = "1.0.110" sim = { path = "../sim" } diff --git a/importer/src/soundcast/popdat.rs b/importer/src/soundcast/popdat.rs index beb354f99b..82ebe22ae5 100644 --- a/importer/src/soundcast/popdat.rs +++ b/importer/src/soundcast/popdat.rs @@ -2,7 +2,7 @@ use abstutil::{prettyprint_usize, Counter, FileWithProgress, Timer}; use geom::{Distance, Duration, FindClosest, LonLat, Pt2D, Time}; use kml::{ExtraShape, ExtraShapes}; use map_model::Map; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use sim::{OrigPersonID, TripMode}; use std::collections::{BTreeMap, HashMap, HashSet}; diff --git a/kml/Cargo.toml b/kml/Cargo.toml index 53c9b690d9..400ec22ce6 100644 --- a/kml/Cargo.toml +++ b/kml/Cargo.toml @@ -8,5 +8,4 @@ edition = "2018" abstutil = { path = "../abstutil" } geom = { path = "../geom" } quick-xml = "0.18.1" -serde = "1.0.98" -serde_derive = "1.0.98" +serde = "1.0.110" diff --git a/kml/src/lib.rs b/kml/src/lib.rs index 4be5629c2f..3caa4b53e9 100644 --- a/kml/src/lib.rs +++ b/kml/src/lib.rs @@ -2,7 +2,7 @@ use abstutil::{prettyprint_usize, FileWithProgress, Timer}; use geom::{GPSBounds, LonLat}; use quick_xml::events::Event; use quick_xml::Reader; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::BTreeMap; #[derive(Serialize, Deserialize)] diff --git a/map_model/Cargo.toml b/map_model/Cargo.toml index a406234459..7c9ad30688 100644 --- a/map_model/Cargo.toml +++ b/map_model/Cargo.toml @@ -12,7 +12,6 @@ geom = { path = "../geom" } gtfs = { path = "../gtfs" } nbez = "0.1.0" petgraph = "0.5.0" -serde = "1.0.89" -serde_derive = "1.0.98" +serde = "1.0.110" thread_local = "1.0.1" seattle_traffic_signals = { git = "https://github.com/dabreegster/seattle_traffic_signals" } diff --git a/map_model/src/area.rs b/map_model/src/area.rs index 27c874ae59..0c046e0437 100644 --- a/map_model/src/area.rs +++ b/map_model/src/area.rs @@ -1,5 +1,5 @@ use geom::Polygon; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::BTreeMap; use std::fmt; diff --git a/map_model/src/building.rs b/map_model/src/building.rs index 7a80a45ece..93cad26db6 100644 --- a/map_model/src/building.rs +++ b/map_model/src/building.rs @@ -1,6 +1,6 @@ use crate::{LaneID, Position}; use geom::{Line, PolyLine, Polygon, Pt2D}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::BTreeSet; use std::fmt; diff --git a/map_model/src/bus_stop.rs b/map_model/src/bus_stop.rs index 9647490ce6..148308cb16 100644 --- a/map_model/src/bus_stop.rs +++ b/map_model/src/bus_stop.rs @@ -1,5 +1,5 @@ use crate::{LaneID, Position}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::fmt; #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)] diff --git a/map_model/src/edits.rs b/map_model/src/edits.rs index 3ff4478b39..f80e8b57e9 100644 --- a/map_model/src/edits.rs +++ b/map_model/src/edits.rs @@ -4,7 +4,7 @@ use crate::{ }; use abstutil::{deserialize_btreemap, retain_btreemap, retain_btreeset, serialize_btreemap, Timer}; use geom::Speed; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, BTreeSet}; #[derive(Debug, Clone)] diff --git a/map_model/src/intersection.rs b/map_model/src/intersection.rs index 89b89bfd11..b89407a49d 100644 --- a/map_model/src/intersection.rs +++ b/map_model/src/intersection.rs @@ -1,7 +1,7 @@ use crate::raw::OriginalIntersection; use crate::{DirectedRoadID, LaneID, Map, PathConstraints, Road, RoadID, TurnID}; use geom::{Distance, Polygon}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::BTreeSet; use std::fmt; diff --git a/map_model/src/lane.rs b/map_model/src/lane.rs index 64b7d645b7..fe736abed4 100644 --- a/map_model/src/lane.rs +++ b/map_model/src/lane.rs @@ -4,7 +4,7 @@ use crate::{ TurnType, }; use geom::{Angle, Distance, Line, PolyLine, Pt2D}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::BTreeSet; use std::fmt; diff --git a/map_model/src/make/initial/lane_specs.rs b/map_model/src/make/initial/lane_specs.rs index 833b64c013..5f13c46f87 100644 --- a/map_model/src/make/initial/lane_specs.rs +++ b/map_model/src/make/initial/lane_specs.rs @@ -1,5 +1,5 @@ use crate::{osm, LaneType}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::BTreeMap; use std::{fmt, iter}; diff --git a/map_model/src/map.rs b/map_model/src/map.rs index ca56ed4f79..23a6afee79 100644 --- a/map_model/src/map.rs +++ b/map_model/src/map.rs @@ -9,7 +9,7 @@ use crate::{ }; use abstutil::{deserialize_btreemap, serialize_btreemap, Error, Timer, Warn}; 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}; #[derive(Serialize, Deserialize)] diff --git a/map_model/src/pathfind/driving.rs b/map_model/src/pathfind/driving.rs index 00f145fba3..1d1f6dd945 100644 --- a/map_model/src/pathfind/driving.rs +++ b/map_model/src/pathfind/driving.rs @@ -3,7 +3,7 @@ use crate::pathfind::uber_turns::{IntersectionCluster, UberTurn}; use crate::{Lane, LaneID, Map, Path, PathConstraints, PathRequest, PathStep, Turn, TurnID}; use abstutil::MultiMap; use fast_paths::{deserialize_32, serialize_32, FastGraph, InputGraph, PathCalculator}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::cell::RefCell; use thread_local::ThreadLocal; diff --git a/map_model/src/pathfind/mod.rs b/map_model/src/pathfind/mod.rs index 913e2a1332..29d8f20f86 100644 --- a/map_model/src/pathfind/mod.rs +++ b/map_model/src/pathfind/mod.rs @@ -12,7 +12,7 @@ use crate::{ }; use abstutil::Timer; use geom::{Distance, PolyLine, EPSILON_DIST}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::VecDeque; use std::fmt; diff --git a/map_model/src/pathfind/uber_turns.rs b/map_model/src/pathfind/uber_turns.rs index 03a0a6c578..5601370587 100644 --- a/map_model/src/pathfind/uber_turns.rs +++ b/map_model/src/pathfind/uber_turns.rs @@ -1,7 +1,7 @@ use crate::{IntersectionID, Map, TurnID}; use geom::PolyLine; use petgraph::graphmap::UnGraphMap; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, BTreeSet}; // This only applies to VehiclePathfinder; walking through these intersections is nothing special. diff --git a/map_model/src/pathfind/walking.rs b/map_model/src/pathfind/walking.rs index 33409327b1..75487e9376 100644 --- a/map_model/src/pathfind/walking.rs +++ b/map_model/src/pathfind/walking.rs @@ -5,7 +5,7 @@ use crate::{ }; use fast_paths::{deserialize_32, serialize_32, FastGraph, InputGraph, PathCalculator}; use geom::{Distance, Speed}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::cell::RefCell; use thread_local::ThreadLocal; diff --git a/map_model/src/raw.rs b/map_model/src/raw.rs index 7c14118e22..68bdff99a3 100644 --- a/map_model/src/raw.rs +++ b/map_model/src/raw.rs @@ -3,7 +3,7 @@ use crate::{osm, AreaType, IntersectionType, RoadSpec}; use abstutil::{deserialize_btreemap, serialize_btreemap, Timer, Warn}; use geom::{Angle, Distance, GPSBounds, Line, PolyLine, Polygon, Pt2D}; use gtfs::Route; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, BTreeSet}; use std::fmt; diff --git a/map_model/src/road.rs b/map_model/src/road.rs index 907cf390e4..8ad3cf7207 100644 --- a/map_model/src/road.rs +++ b/map_model/src/road.rs @@ -2,7 +2,7 @@ use crate::raw::{OriginalRoad, RestrictionType}; use crate::{osm, BusStopID, IntersectionID, LaneID, LaneType, Map, PathConstraints}; use abstutil::{Error, Warn}; use geom::{Distance, PolyLine, Polygon, Speed}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, HashSet}; use std::fmt; diff --git a/map_model/src/stop_signs.rs b/map_model/src/stop_signs.rs index f861b11c76..ac7aaf3b9e 100644 --- a/map_model/src/stop_signs.rs +++ b/map_model/src/stop_signs.rs @@ -1,6 +1,6 @@ use crate::{IntersectionID, LaneID, Map, RoadID, TurnID, TurnPriority, TurnType}; use abstutil::{deserialize_btreemap, serialize_btreemap}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, HashMap}; // TODO These are old notes, they don't reflect current reality. But some of the ideas here should diff --git a/map_model/src/traffic_signals.rs b/map_model/src/traffic_signals.rs index 61327bad62..ffe355cf18 100644 --- a/map_model/src/traffic_signals.rs +++ b/map_model/src/traffic_signals.rs @@ -4,7 +4,7 @@ use crate::{ }; use abstutil::{deserialize_btreemap, retain_btreeset, serialize_btreemap, Timer}; use geom::{Duration, Time}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, BTreeSet}; #[derive(Debug, Serialize, Deserialize, Clone, PartialEq)] diff --git a/map_model/src/traversable.rs b/map_model/src/traversable.rs index 7a5179c804..df52262825 100644 --- a/map_model/src/traversable.rs +++ b/map_model/src/traversable.rs @@ -1,6 +1,6 @@ use crate::{BuildingID, LaneID, LaneType, Map, TurnID}; use geom::{Angle, Distance, PolyLine, Pt2D, Speed}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::fmt; #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize)] diff --git a/map_model/src/turn.rs b/map_model/src/turn.rs index bb2c606ab9..cd63da711d 100644 --- a/map_model/src/turn.rs +++ b/map_model/src/turn.rs @@ -1,7 +1,7 @@ use crate::{DirectedRoadID, IntersectionID, LaneID, Map}; use abstutil::MultiMap; use geom::{Angle, Distance, PolyLine, Pt2D}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, BTreeSet}; use std::fmt; diff --git a/sim/Cargo.toml b/sim/Cargo.toml index e7e26f5a4c..15b0cdfced 100644 --- a/sim/Cargo.toml +++ b/sim/Cargo.toml @@ -9,10 +9,9 @@ abstutil = { path = "../abstutil" } derivative = "1.0.0" geom = { path = "../geom" } instant = "0.1.2" +libm = "0.2.1" map_model = { path = "../map_model" } rand = "0.7.0" rand_distr = "0.2.2" rand_xorshift = "0.2.0" -serde = "1.0.98" -serde_derive = "1.0.98" -libm = "0.2.1" +serde = "1.0.110" diff --git a/sim/src/analytics.rs b/sim/src/analytics.rs index f207af1ea3..bf7bffff2b 100644 --- a/sim/src/analytics.rs +++ b/sim/src/analytics.rs @@ -5,7 +5,7 @@ use map_model::{ BusRouteID, BusStopID, IntersectionID, LaneID, Map, Path, PathRequest, RoadID, Traversable, TurnGroupID, }; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, VecDeque}; #[derive(Clone, Serialize, Deserialize)] diff --git a/sim/src/events.rs b/sim/src/events.rs index 8629ceb3ee..59ddb38178 100644 --- a/sim/src/events.rs +++ b/sim/src/events.rs @@ -5,7 +5,7 @@ use geom::Duration; use map_model::{ 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 // have their API adjusted, but it's not urgent; publishing an event that's not used by Analytics diff --git a/sim/src/lib.rs b/sim/src/lib.rs index ba467555d0..a2a788b847 100644 --- a/sim/src/lib.rs +++ b/sim/src/lib.rs @@ -38,7 +38,7 @@ use map_model::{ BuildingID, BusStopID, DirectedRoadID, IntersectionID, LaneID, Map, Path, PathConstraints, PathRequest, Position, }; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::BTreeMap; use std::fmt; diff --git a/sim/src/make/generator.rs b/sim/src/make/generator.rs index 849c5660a2..41453b21a1 100644 --- a/sim/src/make/generator.rs +++ b/sim/src/make/generator.rs @@ -5,7 +5,7 @@ use map_model::{BuildingID, DirectedRoadID, Map, PathConstraints}; use rand::seq::SliceRandom; use rand::Rng; use rand_xorshift::XorShiftRng; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::BTreeSet; // A way to generate Scenarios diff --git a/sim/src/make/scenario.rs b/sim/src/make/scenario.rs index 8c4264a2e1..77f0ef162c 100644 --- a/sim/src/make/scenario.rs +++ b/sim/src/make/scenario.rs @@ -11,7 +11,7 @@ use map_model::{ use rand::seq::SliceRandom; use rand::{Rng, SeedableRng}; use rand_xorshift::XorShiftRng; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, BTreeSet, HashSet, VecDeque}; // How to start a simulation. diff --git a/sim/src/make/spawner.rs b/sim/src/make/spawner.rs index c6f055bf00..ccf308cd92 100644 --- a/sim/src/make/spawner.rs +++ b/sim/src/make/spawner.rs @@ -7,7 +7,7 @@ use geom::{Duration, Time, EPSILON_DIST}; use map_model::{ 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 #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)] diff --git a/sim/src/mechanics/car.rs b/sim/src/mechanics/car.rs index a98d23cee8..9b29840957 100644 --- a/sim/src/mechanics/car.rs +++ b/sim/src/mechanics/car.rs @@ -4,7 +4,7 @@ use crate::{ }; use geom::{Distance, Duration, PolyLine, Time}; use map_model::{Map, Traversable}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::VecDeque; #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)] diff --git a/sim/src/mechanics/driving.rs b/sim/src/mechanics/driving.rs index 0224e96185..f22770a80c 100644 --- a/sim/src/mechanics/driving.rs +++ b/sim/src/mechanics/driving.rs @@ -9,7 +9,7 @@ use crate::{ use abstutil::{deserialize_btreemap, serialize_btreemap}; use geom::{Distance, Duration, PolyLine, Time}; use map_model::{LaneID, Map, Path, PathStep, Traversable}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, HashSet, VecDeque}; const TIME_TO_UNPARK: Duration = Duration::const_seconds(10.0); diff --git a/sim/src/mechanics/intersection.rs b/sim/src/mechanics/intersection.rs index bedbb66944..161a982dfb 100644 --- a/sim/src/mechanics/intersection.rs +++ b/sim/src/mechanics/intersection.rs @@ -7,7 +7,7 @@ use map_model::{ ControlStopSign, ControlTrafficSignal, IntersectionID, LaneID, Map, RoadID, Traversable, TurnID, TurnPriority, TurnType, }; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, BTreeSet, HashSet}; const WAIT_AT_STOP_SIGN: Duration = Duration::const_seconds(0.5); diff --git a/sim/src/mechanics/parking.rs b/sim/src/mechanics/parking.rs index 503cc89919..d6972a027e 100644 --- a/sim/src/mechanics/parking.rs +++ b/sim/src/mechanics/parking.rs @@ -9,7 +9,7 @@ use map_model::{ BuildingID, Lane, LaneID, LaneType, Map, PathConstraints, PathStep, Position, Traversable, TurnID, }; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, BTreeSet, BinaryHeap, HashMap}; #[derive(Serialize, Deserialize, PartialEq, Clone)] diff --git a/sim/src/mechanics/queue.rs b/sim/src/mechanics/queue.rs index c39a9f4739..406073e6ea 100644 --- a/sim/src/mechanics/queue.rs +++ b/sim/src/mechanics/queue.rs @@ -2,7 +2,7 @@ use crate::mechanics::car::{Car, CarState}; use crate::{CarID, FOLLOWING_DISTANCE}; use geom::{Distance, Time}; use map_model::{Map, Traversable}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, BTreeSet, VecDeque}; #[derive(Serialize, Deserialize, PartialEq, Clone)] diff --git a/sim/src/mechanics/walking.rs b/sim/src/mechanics/walking.rs index 139ced6bd7..239868b600 100644 --- a/sim/src/mechanics/walking.rs +++ b/sim/src/mechanics/walking.rs @@ -7,7 +7,7 @@ use crate::{ use abstutil::{deserialize_multimap, serialize_multimap, MultiMap}; use geom::{Distance, Duration, Line, PolyLine, Speed, Time}; use map_model::{BuildingID, BusRouteID, Map, Path, PathStep, Traversable, SIDEWALK_THICKNESS}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::BTreeMap; const TIME_TO_START_BIKING: Duration = Duration::const_seconds(30.0); diff --git a/sim/src/pandemic/pandemic.rs b/sim/src/pandemic/pandemic.rs index e8a8188d16..8ff49bebd6 100644 --- a/sim/src/pandemic/pandemic.rs +++ b/sim/src/pandemic/pandemic.rs @@ -4,7 +4,7 @@ use geom::{Duration, Time}; use map_model::{BuildingID, BusStopID}; use rand::Rng; use rand_xorshift::XorShiftRng; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::BTreeMap; // TODO This does not model transmission by surfaces; only person-to-person. diff --git a/sim/src/router.rs b/sim/src/router.rs index 53a10eae9d..714f016597 100644 --- a/sim/src/router.rs +++ b/sim/src/router.rs @@ -7,7 +7,7 @@ use map_model::{ BuildingID, IntersectionID, Map, Path, PathConstraints, PathRequest, PathStep, Position, Traversable, TurnID, }; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::BTreeMap; #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)] diff --git a/sim/src/scheduler.rs b/sim/src/scheduler.rs index ea93b86de3..b5d87b8a97 100644 --- a/sim/src/scheduler.rs +++ b/sim/src/scheduler.rs @@ -4,7 +4,7 @@ use crate::{ use derivative::Derivative; use geom::{Duration, Histogram, Time}; use map_model::{IntersectionID, Path, PathRequest}; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::cmp::Ordering; use std::collections::btree_map::Entry; use std::collections::{BTreeMap, BinaryHeap}; diff --git a/sim/src/sim.rs b/sim/src/sim.rs index a6389304a6..cebcc8d5df 100644 --- a/sim/src/sim.rs +++ b/sim/src/sim.rs @@ -15,7 +15,7 @@ use map_model::{ PathRequest, PathStep, Position, RoadID, Traversable, }; use rand_xorshift::XorShiftRng; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, HashSet}; use std::panic; diff --git a/sim/src/transit.rs b/sim/src/transit.rs index 151516b062..c2a7675210 100644 --- a/sim/src/transit.rs +++ b/sim/src/transit.rs @@ -7,7 +7,7 @@ use geom::{Distance, Time}; use map_model::{ BusRoute, BusRouteID, BusStopID, Map, Path, PathConstraints, PathRequest, Position, }; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::BTreeMap; // These index stops along a route, not stops along a single sidewalk. diff --git a/sim/src/trips.rs b/sim/src/trips.rs index f7c54b1898..a2f5692201 100644 --- a/sim/src/trips.rs +++ b/sim/src/trips.rs @@ -10,7 +10,7 @@ use map_model::{ BuildingID, BusRouteID, BusStopID, IntersectionID, Map, Path, PathConstraints, PathRequest, Position, }; -use serde_derive::{Deserialize, Serialize}; +use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, VecDeque}; #[derive(Serialize, Deserialize, PartialEq, Debug, Clone)]