Skip to content

Commit

Permalink
Update Rust to v1.74.0
Browse files Browse the repository at this point in the history
  • Loading branch information
stepchowfun committed Nov 17, 2023
1 parent 435e8ba commit 38a963b
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ jobs:
set -euo pipefail
# Install the appropriate version of Rust.
rustup toolchain install 1.73.0 # [ref:rust_1.73.0]
rustup default 1.73.0 # [ref:rust_1.73.0]
rustup toolchain install 1.74.0 # [ref:rust_1.74.0]
rustup default 1.74.0 # [ref:rust_1.74.0]
# Add the targets.
rustup target add x86_64-pc-windows-msvc
Expand Down Expand Up @@ -113,8 +113,8 @@ jobs:
set -euo pipefail
# Install the appropriate version of Rust.
rustup toolchain install 1.73.0 # [ref:rust_1.73.0]
rustup default 1.73.0 # [ref:rust_1.73.0]
rustup toolchain install 1.74.0 # [ref:rust_1.74.0]
rustup default 1.74.0 # [ref:rust_1.74.0]
# Add the targets.
rustup target add x86_64-apple-darwin
Expand Down Expand Up @@ -186,8 +186,8 @@ jobs:
set -euo pipefail
# Install the appropriate version of Rust.
rustup toolchain install 1.73.0 # [ref:rust_1.73.0]
rustup default 1.73.0 # [ref:rust_1.73.0]
rustup toolchain install 1.74.0 # [ref:rust_1.74.0]
rustup default 1.74.0 # [ref:rust_1.74.0]
# Fetch the program version.
VERSION="$(cargo pkgid | cut -d# -f2 | cut -d: -f2)"
Expand Down
4 changes: 2 additions & 2 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ mod tests {

#[test]
fn parse_nonempty() {
let config = r#"
let config = r"
docker_cli: podman
docker_repo: foo
read_local_cache: false
write_local_cache: false
read_remote_cache: true
write_remote_cache: true
"#
"
.trim();

let result = Config {
Expand Down
12 changes: 6 additions & 6 deletions src/toastfile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -650,9 +650,9 @@ mod tests {

#[test]
fn parse_empty() {
let input = r#"
let input = r"
image: encom:os-12
"#
"
.trim();

let toastfile = Toastfile {
Expand All @@ -669,11 +669,11 @@ image: encom:os-12

#[test]
fn parse_minimal_task() {
let input = r#"
let input = r"
image: encom:os-12
tasks:
foo: {}
"#
"
.trim();

let mut tasks = HashMap::new();
Expand Down Expand Up @@ -714,7 +714,7 @@ tasks:
#[test]
#[allow(clippy::too_many_lines)]
fn parse_comprehensive_task() {
let input = r#"
let input = r"
image: encom:os-12
default: bar
location: /default_location
Expand Down Expand Up @@ -763,7 +763,7 @@ tasks:
extra_docker_arguments:
- --cpus
- '4'
"#
"
.trim();

let mut environment = HashMap::new();
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_2023-10-06]. The
# version for the `trailing_comma` formatting option [tag:rust_fmt_nightly_2023-11-17]. 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-2023-10-06 --frozen --offline fmt --all -- "$@"; }
cargo-fmt () { cargo +nightly-2023-11-17 --frozen --offline fmt --all -- "$@"; }
tasks:
install_packages:
description: Install system packages.
Expand Down Expand Up @@ -87,18 +87,18 @@ tasks:
- install_packages
- create_user
command: |
# Install stable Rust [tag:rust_1.73.0].
# Install stable Rust [tag:rust_1.74.0].
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
-y \
--default-toolchain 1.73.0 \
--default-toolchain 1.74.0 \
--profile minimal \
--component clippy
# Add Rust tools to `$PATH`.
. "$HOME/.cargo/env"
# Install nightly Rust [ref:rust_fmt_nightly_2023-10-06].
rustup toolchain install nightly-2023-10-06 --profile minimal --component rustfmt
# Install nightly Rust [ref:rust_fmt_nightly_2023-11-17].
rustup toolchain install nightly-2023-11-17 --profile minimal --component rustfmt
install_tools:
description: Install the tools needed to build and validate the program.
Expand Down

0 comments on commit 38a963b

Please sign in to comment.