From 37fd07e1e7eacfd21b429d4fa642b3581b61240b Mon Sep 17 00:00:00 2001 From: Stephan Boyer Date: Sun, 2 Nov 2025 17:49:40 -0800 Subject: [PATCH] Update Rust to v1.91.0 --- .github/workflows/ci.yml | 12 ++++++------ src/run.rs | 19 +++++++++---------- toast.yml | 12 ++++++------ 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00f76cd..dd471dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,8 +90,8 @@ jobs: # https://github.com/rust-lang/rustup/issues/2441 # # for more information. - rustup toolchain install 1.88.0 --no-self-update # [ref:rust_1.88.0] - rustup default 1.88.0 # [ref:rust_1.88.0] + rustup toolchain install 1.91.0 --no-self-update # [ref:rust_1.91.0] + rustup default 1.91.0 # [ref:rust_1.91.0] # Add the targets. rustup target add x86_64-pc-windows-msvc @@ -131,8 +131,8 @@ jobs: set -euxo pipefail # Install the appropriate version of Rust. - rustup toolchain install 1.88.0 # [ref:rust_1.88.0] - rustup default 1.88.0 # [ref:rust_1.88.0] + rustup toolchain install 1.91.0 # [ref:rust_1.91.0] + rustup default 1.91.0 # [ref:rust_1.91.0] # Add the targets. rustup target add x86_64-apple-darwin @@ -213,8 +213,8 @@ jobs: set -euxo pipefail # Install the appropriate version of Rust. - rustup toolchain install 1.88.0 # [ref:rust_1.88.0] - rustup default 1.88.0 # [ref:rust_1.88.0] + rustup toolchain install 1.91.0 # [ref:rust_1.91.0] + rustup default 1.91.0 # [ref:rust_1.91.0] # Fetch the program version. VERSION="$(cargo pkgid | cut -d# -f2 | cut -d: -f2)" diff --git a/src/run.rs b/src/run.rs index 02d92bc..dad32af 100644 --- a/src/run.rs +++ b/src/run.rs @@ -603,16 +603,15 @@ fn construct_polyforest( let mut new_frontier = HashSet::new(); for image_id in frontier { - if let Some(image_node) = polyforest.get(&image_id).cloned() { - if let Some(parent_id) = &image_node.image_record.parent_id { - if let Some(parent_node) = polyforest.get_mut(parent_id) { - parent_node.last_used_since_epoch = max( - parent_node.last_used_since_epoch, - image_node.last_used_since_epoch, - ); - new_frontier.insert(parent_id.clone()); - } - } + if let Some(image_node) = polyforest.get(&image_id).cloned() + && let Some(parent_id) = &image_node.image_record.parent_id + && let Some(parent_node) = polyforest.get_mut(parent_id) + { + parent_node.last_used_since_epoch = max( + parent_node.last_used_since_epoch, + image_node.last_used_since_epoch, + ); + new_frontier.insert(parent_id.clone()); } } diff --git a/toast.yml b/toast.yml index c1c38e7..803e367 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_2025-07-06]. The + # version for the `trailing_comma` formatting option [tag:rust_fmt_nightly_2025-11-02]. 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-2025-07-06 --frozen --offline fmt --all -- "$@"; } + cargo-fmt () { cargo +nightly-2025-11-02 --frozen --offline fmt --all -- "$@"; } # Make Bash log commands. set -x @@ -92,18 +92,18 @@ tasks: - install_packages - create_user command: | - # Install stable Rust [tag:rust_1.88.0]. + # Install stable Rust [tag:rust_1.91.0]. curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \ -y \ - --default-toolchain 1.88.0 \ + --default-toolchain 1.91.0 \ --profile minimal \ --component clippy # Add Rust tools to `$PATH`. . "$HOME/.cargo/env" - # Install nightly Rust [ref:rust_fmt_nightly_2025-07-06]. - rustup toolchain install nightly-2025-07-06 --profile minimal --component rustfmt + # Install nightly Rust [ref:rust_fmt_nightly_2025-11-02]. + rustup toolchain install nightly-2025-11-02 --profile minimal --component rustfmt install_tools: description: Install the tools needed to build and validate the program.