Skip to content

Commit

Permalink
Merge pull request #435 from gramlang/rust-v1.79.0
Browse files Browse the repository at this point in the history
Update Rust to v1.79.0
  • Loading branch information
stepchowfun authored Jun 14, 2024
2 parents 692c433 + 6e33e3e commit 89f29ec
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ jobs:
# https://github.com/rust-lang/rustup/issues/2441
#
# for more information.
rustup toolchain install 1.78.0 --no-self-update # [ref:rust_1.78.0]
rustup default 1.78.0 # [ref:rust_1.78.0]
rustup toolchain install 1.79.0 --no-self-update # [ref:rust_1.79.0]
rustup default 1.79.0 # [ref:rust_1.79.0]
# Add the targets.
rustup target add x86_64-pc-windows-msvc
Expand Down Expand Up @@ -123,8 +123,8 @@ jobs:
set -euxo pipefail
# Install the appropriate version of Rust.
rustup toolchain install 1.78.0 # [ref:rust_1.78.0]
rustup default 1.78.0 # [ref:rust_1.78.0]
rustup toolchain install 1.79.0 # [ref:rust_1.79.0]
rustup default 1.79.0 # [ref:rust_1.79.0]
# Add the targets.
rustup target add x86_64-apple-darwin
Expand Down Expand Up @@ -196,8 +196,8 @@ jobs:
set -euxo pipefail
# Install the appropriate version of Rust.
rustup toolchain install 1.78.0 # [ref:rust_1.78.0]
rustup default 1.78.0 # [ref:rust_1.78.0]
rustup toolchain install 1.79.0 # [ref:rust_1.79.0]
rustup default 1.79.0 # [ref:rust_1.79.0]
# Fetch the program version.
VERSION="$(cargo pkgid | cut -d# -f2 | cut -d: -f2)"
Expand Down
12 changes: 6 additions & 6 deletions toast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ command_prefix: |
cargo-offline () { cargo --frozen --offline "$@"; }
# Use this wrapper for formatting code or checking that code is formatted. We use a nightly Rust
# version for the `trailing_comma` formatting option [tag:rust_fmt_nightly_2024-05-04]. The
# version for the `trailing_comma` formatting option [tag:rust_fmt_nightly_2024-06-14]. The
# nightly version was chosen as the latest available release with all components present
# according to this page:
# https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu.html
cargo-fmt () { cargo +nightly-2024-05-04 --frozen --offline fmt --all -- "$@"; }
cargo-fmt () { cargo +nightly-2024-06-14 --frozen --offline fmt --all -- "$@"; }
# Make Bash log commands.
set -x
Expand Down Expand Up @@ -71,18 +71,18 @@ tasks:
- install_packages
- create_user
command: |
# Install stable Rust [tag:rust_1.78.0].
# Install stable Rust [tag:rust_1.79.0].
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
-y \
--default-toolchain 1.78.0 \
--default-toolchain 1.79.0 \
--profile minimal \
--component clippy
# Add Rust tools to `$PATH`.
. "$HOME/.cargo/env"
# Install nightly Rust [ref:rust_fmt_nightly_2024-05-04].
rustup toolchain install nightly-2024-05-04 --profile minimal --component rustfmt
# Install nightly Rust [ref:rust_fmt_nightly_2024-06-14].
rustup toolchain install nightly-2024-06-14 --profile minimal --component rustfmt
install_tools:
description: Install the tools needed to build and validate the program.
Expand Down

0 comments on commit 89f29ec

Please sign in to comment.