Skip to content

Commit

Permalink
Merge #474
Browse files Browse the repository at this point in the history
474: Upgrade to nightly-2022-06-25 r=mkroening a=mkroening

Closes hermit-os/hermit-rs#300. 🎉 

Co-authored-by: Martin Kröning <[email protected]>
  • Loading branch information
bors[bot] and mkroening authored Jun 25, 2022
2 parents 0a88bfe + 71e13ac commit 9da7a96
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH \
# Manually sync this with rust-toolchain.toml!
RUST_VERSION=nightly-2022-04-24 \
RUST_VERSION=nightly-2022-06-25 \
RUST_COMPONENTS="clippy llvm-tools-preview rustfmt rust-src" \
RUST_TARGETS="x86_64-unknown-none"

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[toolchain]
# Manually sync this with Dockerfile!
channel = "nightly-2022-05-15"
channel = "nightly-2022-06-25"
components = [
"clippy",
"llvm-tools-preview",
Expand Down

0 comments on commit 9da7a96

Please sign in to comment.