diff --git a/ci/docker-rust-nightly/Dockerfile b/ci/docker-rust-nightly/Dockerfile index e4e48c6974..bfc61dfaba 100644 --- a/ci/docker-rust-nightly/Dockerfile +++ b/ci/docker-rust-nightly/Dockerfile @@ -1,4 +1,4 @@ -FROM solanalabs/rust:1.40.0 +FROM solanalabs/rust:1.41.0 ARG date RUN set -x \ diff --git a/ci/docker-rust/Dockerfile b/ci/docker-rust/Dockerfile index a303bc48f5..ad1937aef2 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.40.0 +FROM rust:1.41.0 # 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 529ca142d7..e59b293ecb 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.40.0 + stable_version=1.41.0 fi if [[ -n $RUST_NIGHTLY_VERSION ]]; then nightly_version="$RUST_NIGHTLY_VERSION" else - nightly_version=2019-12-19 + nightly_version=2020-02-06 fi diff --git a/core/build.rs b/core/build.rs deleted file mode 100644 index a2fbf3beff..0000000000 --- a/core/build.rs +++ /dev/null @@ -1,8 +0,0 @@ -fn main() { - // Until https://github.com/rust-lang/rust/issues/44839 is resolved - // `#[target_feature(enable = "avx512f")]` is not available. - // Use an env flag instead: - if is_x86_feature_detected!("avx512f") { - println!("cargo:rustc-env=TARGET_FEATURE_AVX512F=1"); - } -} diff --git a/core/src/validator.rs b/core/src/validator.rs index 302603cfdd..48b129211e 100644 --- a/core/src/validator.rs +++ b/core/src/validator.rs @@ -659,16 +659,6 @@ fn report_target_features() { process::exit(1); } } - - // TARGET_FEATURE_AVX512F is defined by build.rs - if option_env!("TARGET_FEATURE_AVX512F").is_some() { - if is_x86_feature_detected!("avx512f") { - info!("AVX512 detected"); - } else { - error!("Your machine does not have AVX512 support, please rebuild from source on your machine"); - process::exit(1); - } - } } // Get the activated stake percentage (based on the provided bank) that is visible in gossip diff --git a/sdk/src/clock.rs b/sdk/src/clock.rs index 275fb37333..22b36606c6 100644 --- a/sdk/src/clock.rs +++ b/sdk/src/clock.rs @@ -57,7 +57,7 @@ pub const MAX_TRANSACTION_FORWARDING_DELAY: usize = 6; /// Converts a slot to a storage segment. Does not indicate that a segment is complete. pub fn get_segment_from_slot(rooted_slot: Slot, slots_per_segment: u64) -> Segment { - ((rooted_slot + (slots_per_segment - 1)) / slots_per_segment) + (rooted_slot + (slots_per_segment - 1)) / slots_per_segment } /// Given a slot returns the latest complete segment, if no segment could possibly be complete diff --git a/sdk/src/entrypoint.rs b/sdk/src/entrypoint.rs index ab8c91e64b..4ddb6df7ed 100644 --- a/sdk/src/entrypoint.rs +++ b/sdk/src/entrypoint.rs @@ -71,7 +71,7 @@ pub unsafe fn deserialize<'a>(input: *mut u8) -> (&'a Pubkey, Vec(); diff --git a/sdk/src/hash.rs b/sdk/src/hash.rs index e1a86e5253..2f02a61be7 100644 --- a/sdk/src/hash.rs +++ b/sdk/src/hash.rs @@ -1,6 +1,5 @@ //! The `hash` module provides functions for creating SHA-256 hashes. -use bs58; use sha2::{Digest, Sha256}; use std::convert::TryFrom; use std::fmt; @@ -100,7 +99,6 @@ pub fn extend_and_hash(id: &Hash, val: &[u8]) -> Hash { #[cfg(test)] mod tests { use super::*; - use bs58; #[test] fn test_hash_fromstr() {