Upgrade to rust 1.56 and cutover to rust edition 2021

XioNoX · Oct 21, 2021 · 9f86365 · 9f86365
1 parent 49b2e67
commit 9f86365
Show file tree

Hide file tree

Showing 28 changed files with 29 additions and 30 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
 
  - uses: hecrj/setup-rust-action@v1
  with:
- rust-version: 1.54.0
+ rust-version: 1.56.0
 
  - name: Cache build
  uses: actions/cache@v2

diff --git a/abstio/Cargo.toml b/abstio/Cargo.toml
@@ -2,7 +2,7 @@
 name = "abstio"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 abstutil = { path = "../abstutil" }

diff --git a/abstutil/Cargo.toml b/abstutil/Cargo.toml
@@ -2,7 +2,7 @@
 name = "abstutil"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 anyhow = "1.0.38"

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cli"
 version = "0.1.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 aabb-quadtree = "0.1.0"

diff --git a/collisions/Cargo.toml b/collisions/Cargo.toml
@@ -2,7 +2,7 @@
 name = "collisions"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 geom = { path = "../geom" }

diff --git a/convert_osm/Cargo.toml b/convert_osm/Cargo.toml
@@ -2,7 +2,7 @@
 name = "convert_osm"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 abstio = { path = "../abstio" }

diff --git a/fifteen_min/Cargo.toml b/fifteen_min/Cargo.toml
@@ -2,7 +2,7 @@
 name = "fifteen_min"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]

diff --git a/game/Cargo.toml b/game/Cargo.toml
@@ -2,7 +2,7 @@
 name = "game"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 description = "A traffic simulation game based on OpenStreetMap"
 repository = "https://github.com/a-b-street/abstreet"
 license = "Apache-2.0"

diff --git a/geom/Cargo.toml b/geom/Cargo.toml
@@ -2,7 +2,7 @@
 name = "geom"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 aabb-quadtree = "0.1.0"

diff --git a/headless/Cargo.toml b/headless/Cargo.toml
@@ -2,7 +2,7 @@
 name = "headless"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 abstio = { path = "../abstio" }

diff --git a/importer/Cargo.toml b/importer/Cargo.toml
@@ -2,7 +2,7 @@
 name = "importer"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 default = []

diff --git a/kml/Cargo.toml b/kml/Cargo.toml
@@ -2,7 +2,7 @@
 name = "kml"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 abstio = { path = "../abstio" }

diff --git a/map_editor/Cargo.toml b/map_editor/Cargo.toml
@@ -2,7 +2,7 @@
 name = "map_editor"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]

diff --git a/map_gui/Cargo.toml b/map_gui/Cargo.toml
@@ -2,7 +2,7 @@
 name = "map_gui"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 native = ["clipboard", "subprocess", "tokio", "widgetry/native-backend"]

diff --git a/map_gui/src/tools/city_picker.rs b/map_gui/src/tools/city_picker.rs
@@ -373,7 +373,7 @@ impl<A: AppLike + 'static> CitiesInCountryPicker<A> {
  .small_heading()
  .into_widget(ctx)
  .margin_right(20)];
- row.extend(buttons.drain(..));
+ row.append(&mut buttons);
  col.push(
  Widget::custom_row(row).flex_wrap_no_inner_spacing(ctx, Percent::int(70)),
  );
@@ -396,7 +396,7 @@ impl<A: AppLike + 'static> CitiesInCountryPicker<A> {
  .small_heading()
  .into_widget(ctx)
  .margin_right(20)];
- row.extend(buttons.drain(..));
+ row.append(&mut buttons);
  col.push(Widget::custom_row(row).flex_wrap_no_inner_spacing(ctx, Percent::int(70)));
  }
 

diff --git a/map_model/Cargo.toml b/map_model/Cargo.toml
@@ -2,7 +2,7 @@
 name = "map_model"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 abstio = { path = "../abstio" }

diff --git a/osm_viewer/Cargo.toml b/osm_viewer/Cargo.toml
@@ -2,7 +2,7 @@
 name = "osm_viewer"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]

diff --git a/parking_mapper/Cargo.toml b/parking_mapper/Cargo.toml
@@ -2,7 +2,7 @@
 name = "parking_mapper"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 default = ["map_gui/native", "reqwest", "widgetry/native-backend"]

diff --git a/popdat/Cargo.toml b/popdat/Cargo.toml
@@ -2,7 +2,7 @@
 name = "popdat"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 abstutil = { path = "../abstutil" }

diff --git a/santa/Cargo.toml b/santa/Cargo.toml
@@ -2,7 +2,7 @@
 name = "santa"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]

diff --git a/sim/Cargo.toml b/sim/Cargo.toml
@@ -2,7 +2,7 @@
 name = "sim"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 abstio = { path = "../abstio" }

diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -2,7 +2,7 @@
 name = "tests"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 abstio = { path = "../abstio" }

diff --git a/traffic_seitan/Cargo.toml b/traffic_seitan/Cargo.toml
@@ -2,7 +2,7 @@
 name = "traffic_seitan"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 abstutil = { path = "../abstutil" }

diff --git a/traffic_signal_data/Cargo.toml b/traffic_signal_data/Cargo.toml
@@ -2,7 +2,7 @@
 name = "traffic_signal_data"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 include_dir = { git = "https://github.com/dabreegster/include_dir", branch = "union" }

diff --git a/updater/Cargo.toml b/updater/Cargo.toml
@@ -2,7 +2,7 @@
 name = "updater"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 abstio = { path = "../abstio" }

diff --git a/widgetry/Cargo.toml b/widgetry/Cargo.toml
@@ -2,7 +2,7 @@
 name = "widgetry"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [features]
 native-backend = ["glutin", "usvg/system-fonts", "usvg/text"]

diff --git a/widgetry/src/widgets/mod.rs b/widgetry/src/widgets/mod.rs
@@ -565,8 +565,8 @@ impl Widget {
 
  // Populate a flattened list of Nodes, matching the traversal order
  fn get_flexbox(&self, parent: Node, stretch: &mut Stretch, nodes: &mut Vec<Node>) {
+ let mut style = self.layout.style;
  if let Some(container) = self.widget.downcast_ref::<Container>() {
- let mut style = self.layout.style;
  style.flex_direction = if container.is_row {
  FlexDirection::Row
  } else {
@@ -579,7 +579,6 @@ impl Widget {
  }
  stretch.add_child(parent, node).unwrap();
  } else {
- let mut style = self.layout.style;
  style.size = Size {
  width: Dimension::Points(self.widget.get_dims().width as f32),
  height: Dimension::Points(self.widget.get_dims().height as f32),

diff --git a/widgetry_demo/Cargo.toml b/widgetry_demo/Cargo.toml
@@ -2,7 +2,7 @@
 name = "widgetry_demo"
 version = "0.1.0"
 authors = ["Dustin Carlino <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]