From 7d27be2a73efde6272068fdefc1de6e5d91e7cd2 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Thu, 27 Feb 2020 22:19:56 -0700
Subject: [PATCH] Upgrade to Rust 1.41.1

---
 ci/docker-rust-nightly/Dockerfile | 2 +-
 ci/docker-rust/Dockerfile         | 2 +-
 ci/rust-version.sh                | 4 ++--
 perf/src/packet.rs                | 2 +-
 runtime/src/bank.rs               | 2 +-
 sdk/src/timing.rs                 | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ci/docker-rust-nightly/Dockerfile b/ci/docker-rust-nightly/Dockerfile
index bfc61dfab..1e3438cc7 100644
--- a/ci/docker-rust-nightly/Dockerfile
+++ b/ci/docker-rust-nightly/Dockerfile
@@ -1,4 +1,4 @@
-FROM solanalabs/rust:1.41.0
+FROM solanalabs/rust:1.41.1
 ARG date
 
 RUN set -x \
diff --git a/ci/docker-rust/Dockerfile b/ci/docker-rust/Dockerfile
index ad1937aef..4f066bef0 100644
--- a/ci/docker-rust/Dockerfile
+++ b/ci/docker-rust/Dockerfile
@@ -1,6 +1,6 @@
 # Note: when the rust version is changed also modify
 # ci/rust-version.sh to pick up the new image tag
-FROM rust:1.41.0
+FROM rust:1.41.1
 
 # Add Google Protocol Buffers for Libra's metrics library.
 ENV PROTOC_VERSION 3.8.0
diff --git a/ci/rust-version.sh b/ci/rust-version.sh
index e59b293ec..c82e17710 100644
--- a/ci/rust-version.sh
+++ b/ci/rust-version.sh
@@ -16,13 +16,13 @@
 if [[ -n $RUST_STABLE_VERSION ]]; then
   stable_version="$RUST_STABLE_VERSION"
 else
-  stable_version=1.41.0
+  stable_version=1.41.1
 fi
 
 if [[ -n $RUST_NIGHTLY_VERSION ]]; then
   nightly_version="$RUST_NIGHTLY_VERSION"
 else
-  nightly_version=2020-02-06
+  nightly_version=2020-02-27
 fi
 
 
diff --git a/perf/src/packet.rs b/perf/src/packet.rs
index 92f63c09c..ced9ca39f 100644
--- a/perf/src/packet.rs
+++ b/perf/src/packet.rs
@@ -8,7 +8,7 @@ pub const NUM_PACKETS: usize = 1024 * 8;
 
 pub const PACKETS_PER_BATCH: usize = 256;
 pub const NUM_RCVMMSGS: usize = 128;
-pub const PACKETS_BATCH_SIZE: usize = (PACKETS_PER_BATCH * PACKET_DATA_SIZE);
+pub const PACKETS_BATCH_SIZE: usize = PACKETS_PER_BATCH * PACKET_DATA_SIZE;
 
 #[derive(Debug, Clone)]
 pub struct Packets {
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index b1ff81893..d12a5cbd6 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -63,7 +63,7 @@ use std::{
     sync::{Arc, RwLock, RwLockReadGuard},
 };
 
-pub const SECONDS_PER_YEAR: f64 = (365.25 * 24.0 * 60.0 * 60.0);
+pub const SECONDS_PER_YEAR: f64 = 365.25 * 24.0 * 60.0 * 60.0;
 pub const MAX_SNAPSHOT_DATA_FILE_SIZE: u64 = 32 * 1024 * 1024 * 1024; // 32 GiB
 
 pub const MAX_LEADER_SCHEDULE_STAKES: Epoch = 5;
diff --git a/sdk/src/timing.rs b/sdk/src/timing.rs
index 428cacd5a..9b0bb0e6b 100644
--- a/sdk/src/timing.rs
+++ b/sdk/src/timing.rs
@@ -24,7 +24,7 @@ pub fn timestamp() -> u64 {
     duration_as_ms(&now)
 }
 
-pub const SECONDS_PER_YEAR: f64 = (365.242_199 * 24.0 * 60.0 * 60.0);
+pub const SECONDS_PER_YEAR: f64 = 365.242_199 * 24.0 * 60.0 * 60.0;
 
 /// from years to slots
 pub fn years_as_slots(years: f64, tick_duration: &Duration, ticks_per_slot: u64) -> f64 {