From c76738a678313c347089dcab3f778977abc41136 Mon Sep 17 00:00:00 2001
From: Dustin Carlino <dabreegster@gmail.com>
Date: Sun, 9 Jun 2019 14:08:47 -0700
Subject: [PATCH] upgraded to rustc 1.35, fixing a few cases of
 https://github.com/rust-lang/rust/issues/59159

---
 map_model/src/make/initial/merge.rs | 3 ++-
 sim/src/make/scenario.rs            | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/map_model/src/make/initial/merge.rs b/map_model/src/make/initial/merge.rs
index 339518b5a3..dd1410dc6c 100644
--- a/map_model/src/make/initial/merge.rs
+++ b/map_model/src/make/initial/merge.rs
@@ -36,7 +36,8 @@ pub fn short_roads(map: &mut InitialMap, timer: &mut Timer) {
                 .values()
                 .find(|r| r.trimmed_center_pts.length() < Distance::meters(5.0))
             {
-                look_at.insert(merge(map, r.id, timer));
+                let id = r.id;
+                look_at.insert(merge(map, id, timer));
             } else {
                 break;
             }
diff --git a/sim/src/make/scenario.rs b/sim/src/make/scenario.rs
index 23336e66ce..67bedd28e5 100644
--- a/sim/src/make/scenario.rs
+++ b/sim/src/make/scenario.rs
@@ -351,11 +351,12 @@ impl SpawnOverTime {
                 timer,
             ) {
                 reserved_cars.insert(parked_car.vehicle.id);
+                let spot = parked_car.spot;
                 sim.schedule_trip(
                     spawn_time,
                     TripSpec::UsingParkedCar {
                         start: SidewalkSpot::building(from_bldg, map),
-                        spot: parked_car.spot,
+                        spot,
                         goal,
                         ped_speed: Scenario::rand_ped_speed(rng),
                     },