From 2fedfbb3f4aafe706129f0cb1853bcbc4d42eeec Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Mon, 1 Jun 2020 13:17:50 +0200
Subject: [PATCH] Bump Rust nightly to 2020-05-31

---
 .changelog/2962.trivial.md               | 0
 .github/workflows/ci-reproducibility.yml | 2 +-
 .github/workflows/release.yml            | 2 +-
 README.md                                | 8 ++++----
 docker/development/Dockerfile            | 6 +++---
 rust-toolchain                           | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 .changelog/2962.trivial.md

diff --git a/.changelog/2962.trivial.md b/.changelog/2962.trivial.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/.github/workflows/ci-reproducibility.yml b/.github/workflows/ci-reproducibility.yml
index 40453182188..5303987c6cb 100644
--- a/.github/workflows/ci-reproducibility.yml
+++ b/.github/workflows/ci-reproducibility.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2020-05-15
+          toolchain: nightly-2020-05-31
           override: true
       - name: Install oasis-node build prerequisites
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7e2efe47f69..fe4b2ee9672 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2020-05-15
+          toolchain: nightly-2020-05-31
           override: true
       - name: Install oasis-node prerequisites
         run: |
diff --git a/README.md b/README.md
index 5fe25baf155..31a2106e93c 100644
--- a/README.md
+++ b/README.md
@@ -137,8 +137,8 @@ Prerequisites:
   Then install the Fortanix Rust EDP utilities by running:
 
   ```
-  cargo +nightly install --version 0.3.1 fortanix-sgx-tools
-  cargo +nightly install --version 0.7.0 sgxs-tools
+  cargo +nightly install --version 0.4.0 fortanix-sgx-tools
+  cargo +nightly install --version 0.8.2 sgxs-tools
   ```
 
   _NOTE: These utilities must be compiled with a nightly version of the Rust
@@ -170,8 +170,8 @@ Prerequisites:
   active toolchain
   ----------------
 
-  nightly-2020-05-27-x86_64-unknown-linux-gnu (overridden by '/oasis-core/rust-toolchain')
-  rustc 1.45.0-nightly (5239f5c57 2020-05-26)
+  nightly-2020-05-31-x86_64-unknown-linux-gnu (overridden by '/oasis-core/rust-toolchain')
+  rustc 1.45.0-nightly (74e804683 2020-05-30)
   ```
 
   Then add the Fortanix SGX Rust target to this version of the Rust toolchain by
diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
index b4f67155424..239b6203b13 100644
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@ -6,7 +6,7 @@ ARG GO_PROTOC_VERSION=3.6.1
 ARG GO_PROTOC_GEN_GO_VERSION=1.21.0
 ARG GOLANGCILINT_VERSION=1.23.6
 ARG GOCOVMERGE_VERSION=b5bfa59ec0adc420475f97f89b58045c721d761c
-ARG RUST_NIGHTLY_VERSION=2020-05-15
+ARG RUST_NIGHTLY_VERSION=2020-05-31
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -44,8 +44,8 @@ RUN curl "https://sh.rustup.rs" -sfo rustup.sh && \
     sh rustup.sh -y --default-toolchain nightly-${RUST_NIGHTLY_VERSION} && \
     rustup target add x86_64-fortanix-unknown-sgx && \
     rustup component add rustfmt && \
-    cargo install --version 0.3.1 fortanix-sgx-tools && \
-    cargo install --version 0.7.0 sgxs-tools && \
+    cargo install --version 0.4.0 fortanix-sgx-tools && \
+    cargo install --version 0.8.2 sgxs-tools && \
     cargo install cargo-audit
 
 # Install Go and utilities.
diff --git a/rust-toolchain b/rust-toolchain
index 8737a7eb567..29cb0a8a74c 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-05-15
+nightly-2020-05-31