gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade to Rust 1.42 (#8836) (#8839)

Browse Source 
automerge
This commit is contained in:
mergify[bot]
2020-03-13 14:29:18 -07:00
committed by GitHub
parent 7722723400
commit d1ec6c0b8b
7 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci/docker-rust-nightly/Dockerfile
View File

@ -1,4 +1,4 @@
FROM solanalabs/rust:1.41.1 FROM solanalabs/rust:1.42.0
ARG date ARG date
RUN set -x \ RUN set -x \

2
ci/docker-rust-nightly/README.md
View File

@ -15,6 +15,8 @@ To update the pinned version:
1. Run `ci/docker-rust-nightly/build.sh` to rebuild the nightly image locally, 1. Run `ci/docker-rust-nightly/build.sh` to rebuild the nightly image locally,
or potentially `ci/docker-rust-nightly/build.sh YYYY-MM-DD` if there's a or potentially `ci/docker-rust-nightly/build.sh YYYY-MM-DD` if there's a
specific YYYY-MM-DD that is desired (default is today's build). specific YYYY-MM-DD that is desired (default is today's build).
Check https://rust-lang.github.io/rustup-components-history/ for build
status
1. Update `ci/rust-version.sh` to reflect the new nightly `YYY-MM-DD` 1. Update `ci/rust-version.sh` to reflect the new nightly `YYY-MM-DD`
1. Run `SOLANA_DOCKER_RUN_NOSETUID=1 ci/docker-run.sh --nopull solanalabs/rust-nightly:YYYY-MM-DD ci/test-coverage.sh` 1. Run `SOLANA_DOCKER_RUN_NOSETUID=1 ci/docker-run.sh --nopull solanalabs/rust-nightly:YYYY-MM-DD ci/test-coverage.sh`
to confirm the new nightly image builds. Fix any issues as needed to confirm the new nightly image builds. Fix any issues as needed

2
ci/docker-rust/Dockerfile
View File

@ -1,6 +1,6 @@
# Note: when the rust version is changed also modify # Note: when the rust version is changed also modify
# ci/rust-version.sh to pick up the new image tag # ci/rust-version.sh to pick up the new image tag
FROM rust:1.41.1 FROM rust:1.42.0
# Add Google Protocol Buffers for Libra's metrics library. # Add Google Protocol Buffers for Libra's metrics library.
ENV PROTOC_VERSION 3.8.0 ENV PROTOC_VERSION 3.8.0

4
ci/rust-version.sh
View File

@ -16,13 +16,13 @@
if [[ -n $RUST_STABLE_VERSION ]]; then if [[ -n $RUST_STABLE_VERSION ]]; then
stable_version="$RUST_STABLE_VERSION" stable_version="$RUST_STABLE_VERSION"
else else
stable_version=1.41.1 stable_version=1.42.0
fi fi
if [[ -n $RUST_NIGHTLY_VERSION ]]; then if [[ -n $RUST_NIGHTLY_VERSION ]]; then
nightly_version="$RUST_NIGHTLY_VERSION" nightly_version="$RUST_NIGHTLY_VERSION"
else else
nightly_version=2020-02-27 nightly_version=2020-03-12
fi fi

2
ledger/src/blockstore.rs
View File

@ -3947,7 +3947,7 @@ pub mod tests {
.flat_map(|k| { .flat_map(|k| {
let begin = k * gap + 1; let begin = k * gap + 1;
let end = (k + 1) * gap; let end = (k + 1) * gap;
(begin..end) begin..end
}) })
.collect(); .collect();
assert_eq!( assert_eq!(

2
runtime/src/bank.rs
View File

@ -1005,7 +1005,7 @@ impl Bank {
let results = self let results = self
.rc .rc
.accounts .accounts
.lock_accounts(txs, iteration_order.as_ref().map(|v| v.as_slice())); .lock_accounts(txs, iteration_order.as_deref());
TransactionBatch::new(results, &self, txs, iteration_order) TransactionBatch::new(results, &self, txs, iteration_order)
} }

2
runtime/src/transaction_batch.rs
View File

@ -39,7 +39,7 @@ impl<'a, 'b> TransactionBatch<'a, 'b> {
} }
pub fn iteration_order(&self) -> Option<&[usize]> { pub fn iteration_order(&self) -> Option<&[usize]> {
self.iteration_order.as_ref().map(|v| v.as_slice()) self.iteration_order.as_deref()
} }
pub fn bank(&self) -> &Bank { pub fn bank(&self) -> &Bank {
self.bank self.bank