Upgrade to rust 1.39.0 (#6939) (#6960)

automerge
2019-11-14 12:55:54 -08:00
parent f895c3f66d
commit d0de05acaa
13 changed files with 36 additions and 11 deletions
--- a/ledger/src/leader_schedule_cache.rs
+++ b/ledger/src/leader_schedule_cache.rs
@@ -146,7 +146,7 @@ impl LeaderScheduleCache {
            }
            start_index = 0;
        }
-        first_slot.and_then(|slot| Some((slot, last_slot)))
+        first_slot.map(|slot| (slot, last_slot))
    }

    fn slot_leader_at_no_compute(&self, slot: u64) -> Option<Pubkey> {