Upgrade to edition 2018

whatisaphone · Dec 6, 2018 · 705255f · 705255f
1 parent 7cd446c
commit 705255f
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 4 deletions.
diff --git a/brain-test-data/Cargo.toml b/brain-test-data/Cargo.toml
@@ -2,6 +2,7 @@
 name = "brain-test-data"
 version = "0.1.0"
 authors = ["John Simon <john@whatisaph.one>"]
+edition = "2018"
 
 [dependencies]
 lazy_static = "1.1.0"

diff --git a/brain-test-data/build.rs b/brain-test-data/build.rs
@@ -16,7 +16,7 @@ fn main() {
     let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
     let mut out = File::create(out_dir.join("recordings.rs")).unwrap();
 
-    writeln!(out, "use models::OneVOneScenario;").unwrap();
+    writeln!(out, "use crate::models::OneVOneScenario;").unwrap();
     writeln!(out).unwrap();
 
     for entry in csv_dir.read_dir().unwrap().map(Result::unwrap) {

diff --git a/brain/Cargo.toml b/brain/Cargo.toml
@@ -2,6 +2,7 @@
 name = "brain"
 version = "0.1.0"
 authors = ["John Simon <john@whatisaph.one>"]
+edition = "2018"
 
 [dependencies]
 crossbeam-channel = "0.2.6"

diff --git a/brain/src/behavior/higher_order.rs b/brain/src/behavior/higher_order.rs
@@ -165,7 +165,7 @@ impl Behavior for Chain {
         ));
 
         let action = {
-            let mut front = match self.children.front_mut() {
+            let front = match self.children.front_mut() {
                 None => return Action::Return,
                 Some(b) => b,
             };

diff --git a/brain/src/routing/behavior.rs b/brain/src/routing/behavior.rs
@@ -64,7 +64,7 @@ impl FollowRoute {
 
         let mut log = Vec::new();
         let plan = {
-            let mut context = PlanningContext {
+            let context = PlanningContext {
                 game: &ctx.game,
                 start: ctx.me().into(),
                 ball_prediction: ctx.scenario.ball_prediction(),

diff --git a/brain/src/routing/models.rs b/brain/src/routing/models.rs
@@ -239,7 +239,7 @@ impl RoutePlan {
 
         match plan.next {
             Some(planner) => {
-                let mut ctx = PlanningContext {
+                let ctx = PlanningContext {
                     game: ctx.game,
                     start: state,
                     ball_prediction: &ctx.ball_prediction.hacky_expensive_slice(duration),

diff --git a/collect/Cargo.toml b/collect/Cargo.toml
@@ -2,6 +2,7 @@
 name = "collect"
 version = "0.1.0"
 authors = ["John Simon <john@whatisaph.one>"]
+edition = "2018"
 
 [dependencies]
 csv = "1.0.2"

diff --git a/common/Cargo.toml b/common/Cargo.toml
@@ -2,6 +2,7 @@
 name = "common"
 version = "0.1.0"
 authors = ["John Simon <john@whatisaph.one>"]
+edition = "2018"
 
 [dependencies]
 lazy_static = "1.1.0"

diff --git a/dom/Cargo.toml b/dom/Cargo.toml
@@ -2,6 +2,7 @@
 name = "dom"
 version = "0.1.0"
 authors = ["John Simon <john@whatisaph.one>"]
+edition = "2018"
 
 [dependencies]
 nalgebra = "0.16.0"

diff --git a/oven/Cargo.toml b/oven/Cargo.toml
@@ -2,6 +2,7 @@
 name = "oven"
 version = "0.1.0"
 authors = ["John Simon <john@whatisaph.one>"]
+edition = "2018"
 
 [dependencies]
 lazy_static = "1.1.0"

diff --git a/play/Cargo.toml b/play/Cargo.toml
@@ -2,6 +2,7 @@
 name = "play"
 version = "0.1.0"
 authors = ["John Simon <john@whatisaph.one>"]
+edition = "2018"
 
 [dependencies]
 chrono = "0.4.6"

diff --git a/simulate/Cargo.toml b/simulate/Cargo.toml
@@ -2,6 +2,7 @@
 name = "simulate"
 version = "0.1.0"
 authors = ["John Simon <john@whatisaph.one>"]
+edition = "2018"
 
 [dependencies]
 lazy_static = "1.1.0"