Skip to content
This repository has been archived by the owner on Feb 28, 2021. It is now read-only.

Update rust toolchain to 2020-04-20 #383

Merged
merged 1 commit into from
Apr 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .buildkite/pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
command: "ci/run"
timeout_in_minutes: 60
env:
DOCKER_IMAGE: gcr.io/opensourcecoin/radicle-registry/ci-base:9956955f61e2c91fb94a2ed4eee26bf17aa44b50
DOCKER_IMAGE: gcr.io/opensourcecoin/radicle-registry/ci-base:c068afc4d2012cd70a9943ead3671e2e5b35508a
DOCKER_FILE: ci/base-image/Dockerfile
STEP_DOCKER_FILE: ci/node-image/Dockerfile
STEP_DOCKER_IMAGE: gcr.io/opensourcecoin/radicle-registry/node
Expand Down
4 changes: 2 additions & 2 deletions ci/base-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Includes
#
# * Rustup with `nightly-2020-03-19` toolchain (see RUST_VERSION)
# * Rustup with `nightly-2020-04-20` toolchain (see RUST_VERSION)
# * Additional rustup components and the wasm32 target
# * sccache v0.2.12

Expand Down Expand Up @@ -42,7 +42,7 @@ RUN set -euxo pipefail; \

# Install rustup and default toolchain from RUST_VERSION. This is copied from
# https://github.com/rust-lang/docker-rust/blob/8d0f25416858e2c1f59511a15c2bd0445b402caa/1.39.0/buster/slim/Dockerfile
ENV RUST_VERSION=nightly-2020-03-19
ENV RUST_VERSION=nightly-2020-04-20
RUN set -eux; \
dpkgArch="$(dpkg --print-architecture)"; \
case "${dpkgArch##*-}" in \
Expand Down
2 changes: 1 addition & 1 deletion client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ impl ClientT for Client {

async fn free_balance(&self, account_id: &AccountId) -> Result<state::AccountBalance, Error> {
let account_info = self
.fetch_map_value::<system::Account<Runtime>, _, _>(account_id.clone())
.fetch_map_value::<system::Account<Runtime>, _, _>(*account_id)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you happen to see this or was this reported by the updated toolchain?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The latter. Clippy caught it now

.await?;
Ok(account_info.data.free)
}
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2020-03-19
nightly-2020-04-20