From 94242cbb15d59574d64eaed8974686200985bac9 Mon Sep 17 00:00:00 2001 From: Stephan Boyer Date: Thu, 1 Oct 2026 09:50:37 -0700 Subject: [PATCH 1/2] Update Rust --- .github/workflows/ci.yml | 12 ++++++------ toast.yml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de4a039..29d8495 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,8 +83,8 @@ jobs: # https://github.com/rust-lang/rustup/issues/2441 # # for more information. - rustup toolchain install 1.98.1 --no-self-update # [group:rust_1.98.1] - rustup default 1.98.1 # [group:rust_1.98.1] + rustup toolchain install 1.99.0 --no-self-update # [group:rust_1.99.0] + rustup default 1.99.0 # [group:rust_1.99.0] # Add the targets. rustup target add x86_64-pc-windows-msvc @@ -124,8 +124,8 @@ jobs: set -euxo pipefail # Install the appropriate version of Rust. - rustup toolchain install 1.98.1 # [group:rust_1.98.1] - rustup default 1.98.1 # [group:rust_1.98.1] + rustup toolchain install 1.99.0 # [group:rust_1.99.0] + rustup default 1.99.0 # [group:rust_1.99.0] # Add the targets. rustup target add x86_64-apple-darwin @@ -214,8 +214,8 @@ jobs: set -euxo pipefail # Install the appropriate version of Rust. - rustup toolchain install 1.98.1 # [group:rust_1.98.1] - rustup default 1.98.1 # [group:rust_1.98.1] + rustup toolchain install 1.99.0 # [group:rust_1.99.0] + rustup default 1.99.0 # [group:rust_1.99.0] # Fetch the program version. VERSION="$(cargo pkgid | cut -d# -f2 | cut -d: -f2)" diff --git a/toast.yml b/toast.yml index f5df2c6..082cf29 100644 --- a/toast.yml +++ b/toast.yml @@ -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_2026-09-16]. The + # version for the `trailing_comma` formatting option [tag:rust_fmt_nightly_2026-10-01]. 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-2026-09-16 --frozen --offline fmt --all -- "$@"; } + cargo-fmt () { cargo +nightly-2026-10-01 --frozen --offline fmt --all -- "$@"; } # Make Bash log commands. set -x @@ -73,18 +73,18 @@ tasks: - install_packages - create_user command: | - # Install stable Rust [group:rust_1.98.1]. + # Install stable Rust [group:rust_1.99.0]. curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \ -y \ - --default-toolchain 1.98.1 \ + --default-toolchain 1.99.0 \ --profile minimal \ --component clippy # Add Rust tools to `$PATH`. . "$HOME/.cargo/env" - # Install nightly Rust [ref:rust_fmt_nightly_2026-09-16]. - rustup toolchain install nightly-2026-09-16 --profile minimal --component rustfmt + # Install nightly Rust [ref:rust_fmt_nightly_2026-10-01]. + rustup toolchain install nightly-2026-10-01 --profile minimal --component rustfmt install_tools: description: Install the tools needed to build and validate the program. From b568e8f6e026a85dec0829a3acf85e963fbbb090 Mon Sep 17 00:00:00 2001 From: Stephan Boyer Date: Thu, 1 Oct 2026 09:56:11 -0700 Subject: [PATCH 2/2] Fix new Clippy lints --- src/duplicates.rs | 4 ++-- src/groups.rs | 4 ++-- src/references.rs | 4 ++-- src/target_collisions.rs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/duplicates.rs b/src/duplicates.rs index 291712a..a679007 100644 --- a/src/duplicates.rs +++ b/src/duplicates.rs @@ -30,7 +30,7 @@ mod tests { #[test] fn check_empty() { - assert!(check(&HashMap::new()).is_empty()); + assert_eq!(check(&HashMap::new()), Vec::::new()); } #[test] @@ -54,7 +54,7 @@ mod tests { tags_map.insert("tag1".to_owned(), tags_vec1); tags_map.insert("tag2".to_owned(), tags_vec2); - assert!(check(&tags_map).is_empty()); + assert_eq!(check(&tags_map), Vec::::new()); } #[test] diff --git a/src/groups.rs b/src/groups.rs index c2c5fb9..9fdc9d1 100644 --- a/src/groups.rs +++ b/src/groups.rs @@ -41,7 +41,7 @@ mod tests { #[test] fn check_empty() { // Ensure an empty collection has no invalid groups. - assert!(check(&HashMap::new()).is_empty()); + assert_eq!(check(&HashMap::new()), Vec::::new()); } #[test] @@ -53,7 +53,7 @@ mod tests { )]); // Ensure the multi-member group is valid. - assert!(check(&groups).is_empty()); + assert_eq!(check(&groups), Vec::::new()); } #[test] diff --git a/src/references.rs b/src/references.rs index 829daa6..d2b5bd4 100644 --- a/src/references.rs +++ b/src/references.rs @@ -36,7 +36,7 @@ mod tests { #[test] fn check_empty() { // Ensure an empty collection has no dangling references. - assert!(check(&HashSet::new(), &[]).is_empty()); + assert_eq!(check(&HashSet::new(), &[]), Vec::::new()); } #[test] @@ -46,7 +46,7 @@ mod tests { let refs = vec![reference("tag", 1), reference("group", 2)]; // Ensure both references resolve. - assert!(check(&targets, &refs).is_empty()); + assert_eq!(check(&targets, &refs), Vec::::new()); } #[test] diff --git a/src/target_collisions.rs b/src/target_collisions.rs index 5063b6e..ff0b67d 100644 --- a/src/target_collisions.rs +++ b/src/target_collisions.rs @@ -49,7 +49,7 @@ mod tests { HashMap::from([("group".to_owned(), vec![directive(Type::Group, "group", 2)])]); // Ensure disjoint target labels are valid. - assert!(check(&tags, &groups).is_empty()); + assert_eq!(check(&tags, &groups), Vec::::new()); } #[test]