Skip to content

Commit

Permalink
Merge pull request #508 from stepchowfun/rust-v1.78.0
Browse files Browse the repository at this point in the history
Update Rust to v1.78.0
  • Loading branch information
stepchowfun committed May 4, 2024
2 parents 39d249f + 4c71e5a commit cce508c
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ jobs:
set -euxo pipefail
# Install the appropriate version of Rust.
rustup toolchain install 1.77.0 # [ref:rust_1.77.0]
rustup default 1.77.0 # [ref:rust_1.77.0]
rustup toolchain install 1.78.0 # [ref:rust_1.78.0]
rustup default 1.78.0 # [ref:rust_1.78.0]
# Add the targets.
rustup target add x86_64-pc-windows-msvc
Expand Down Expand Up @@ -118,8 +118,8 @@ jobs:
set -euxo pipefail
# Install the appropriate version of Rust.
rustup toolchain install 1.77.0 # [ref:rust_1.77.0]
rustup default 1.77.0 # [ref:rust_1.77.0]
rustup toolchain install 1.78.0 # [ref:rust_1.78.0]
rustup default 1.78.0 # [ref:rust_1.78.0]
# Add the targets.
rustup target add x86_64-apple-darwin
Expand Down Expand Up @@ -191,8 +191,8 @@ jobs:
set -euxo pipefail
# Install the appropriate version of Rust.
rustup toolchain install 1.77.0 # [ref:rust_1.77.0]
rustup default 1.77.0 # [ref:rust_1.77.0]
rustup toolchain install 1.78.0 # [ref:rust_1.78.0]
rustup default 1.78.0 # [ref:rust_1.78.0]
# Fetch the program version.
VERSION="$(cargo pkgid | cut -d# -f2 | cut -d: -f2)"
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ repository = "https://github.com/stepchowfun/toast"
readme = "README.md"

[lints]
clippy.all = "deny"
clippy.all = { level = "deny", priority = -1 }
clippy.default_numeric_fallback = "deny"
clippy.pedantic = "deny"
clippy.pedantic = { level = "deny", priority = -1 }
rust.warnings = "deny"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/base-images/centos/toast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tasks:
i_am_root:
command: touch /i-am-root.txt
create_user:
command: adduser user
command: useradd user --shell /bin/bash
greet:
dependencies:
- i_am_root
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/base-images/debian/toast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tasks:
i_am_root:
command: touch /i-am-root.txt
create_user:
command: adduser --disabled-password --gecos '' user
command: useradd user --shell /bin/bash
greet:
dependencies:
- i_am_root
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/base-images/fedora/toast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tasks:
i_am_root:
command: touch /i-am-root.txt
create_user:
command: adduser user
command: useradd user --shell /bin/bash
greet:
dependencies:
- i_am_root
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/base-images/ubuntu/toast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tasks:
i_am_root:
command: touch /i-am-root.txt
create_user:
command: adduser --disabled-password --gecos '' user
command: useradd user --shell /bin/bash
greet:
dependencies:
- i_am_root
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-03-23]. The
# version for the `trailing_comma` formatting option [tag:rust_fmt_nightly_2024-05-04]. 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-03-23 --frozen --offline fmt --all -- "$@"; }
cargo-fmt () { cargo +nightly-2024-05-04 --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.77.0].
# Install stable Rust [tag:rust_1.78.0].
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
-y \
--default-toolchain 1.77.0 \
--default-toolchain 1.78.0 \
--profile minimal \
--component clippy
# Add Rust tools to `$PATH`.
. "$HOME/.cargo/env"
# Install nightly Rust [ref:rust_fmt_nightly_2024-03-23].
rustup toolchain install nightly-2024-03-23 --profile minimal --component rustfmt
# Install nightly Rust [ref:rust_fmt_nightly_2024-05-04].
rustup toolchain install nightly-2024-05-04 --profile minimal --component rustfmt
install_tools:
description: Install the tools needed to build and validate the program.
Expand Down

0 comments on commit cce508c

Please sign in to comment.