From 0cd97c313ca9b61a4791dbd35395c20d92696f1f Mon Sep 17 00:00:00 2001 From: devmobasa <4170275+devmobasa@users.noreply.github.com> Date: Tue, 27 Oct 2026 10:13:17 +0100 Subject: [PATCH] chore: update Rust toolchain to 1.99.1 --- .github/workflows/build-packages.yml | 2 +- .github/workflows/ci.yml | 4 ++-- AGENTS.md | 2 +- CONTRIBUTING.md | 2 +- Cargo.toml | 2 +- README.md | 8 ++++---- README.zh-CN.md | 8 ++++---- configurator/Cargo.toml | 2 +- configurator/README.md | 2 +- flake.lock | 6 +++--- rust-toolchain.toml | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index 429fc41a..75272aa8 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -36,7 +36,7 @@ jobs: run: dotnet run tools/wayscriber.cs --no-build -- ci install-dependencies package - name: Set up Rust - uses: dtolnay/rust-toolchain@1.98.1 + uses: dtolnay/rust-toolchain@1.99.1 - name: Install nfpm run: dotnet run tools/wayscriber.cs --no-build -- ci install-nfpm diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0cb828ad..8ff15073 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: run: dotnet run tools/wayscriber.cs --no-build -- ci prepare-gtk4-layer-shell --library-mode both - name: Set up Rust - uses: dtolnay/rust-toolchain@1.98.1 + uses: dtolnay/rust-toolchain@1.99.1 with: components: clippy, rustfmt @@ -103,7 +103,7 @@ jobs: run: dotnet run tools/wayscriber.cs --no-build -- ci prepare-gtk4-layer-shell --library-mode both - name: Set up Rust - uses: dtolnay/rust-toolchain@1.98.1 + uses: dtolnay/rust-toolchain@1.99.1 with: components: clippy, rustfmt diff --git a/AGENTS.md b/AGENTS.md index e2252bc8..1f19ebe2 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -4,7 +4,7 @@ - This file applies to the whole wayscriber workspace. - wayscriber is a Rust desktop annotation app for Wayland compositors. - The workspace root crate is `wayscriber`; `configurator/` is a separate GTK4/libadwaita (Relm4) desktop configurator crate. -- Both crates use Rust 1.98.1 and edition 2024; `rust-toolchain.toml` pins the development toolchain. +- Both crates use Rust 1.99.1 and edition 2024; `rust-toolchain.toml` pins the development toolchain. - The workspace default member is only the root crate; use `-p wayscriber-configurator` or `--workspace` when configurator coverage is needed. ## Architecture diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cd51dec2..bda172f3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,7 +15,7 @@ module boundary. ## Workspace and toolchain -The repository is one Cargo workspace using Rust 1.98.1 and edition 2024. +The repository is one Cargo workspace using Rust 1.99.1 and edition 2024. `rust-toolchain.toml` pins the development toolchain, including Clippy and rustfmt; CI uses the same version. The Nix flake selects that version through the `rust-overlay` input pinned in `flake.lock`, using the root package's `rust-version` for both crates and the development diff --git a/Cargo.toml b/Cargo.toml index 86203b4f..2dec103a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "wayscriber" version = "0.9.27" edition = "2024" -rust-version = "1.98.1" +rust-version = "1.99.1" description = "Screen annotation tool for Wayland compositors" homepage = "https://wayscriber.com" repository = "https://github.com/devmobasa/wayscriber" diff --git a/README.md b/README.md index 1f531d0d..76d8c403 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # wayscriber [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) -[![Rust](https://img.shields.io/badge/rust-1.98.1%2B-orange.svg)](https://www.rust-lang.org/) +[![Rust](https://img.shields.io/badge/rust-1.99.1%2B-orange.svg)](https://www.rust-lang.org/) **English** · [简体中文](README.zh-CN.md) @@ -572,7 +572,7 @@ sudo dnf install ./wayscriber-configurator-x86_64.rpm ### From source -Rust 1.98.1 or newer is required. If `rustup` is not already installed, install it (this also installs `cargo`), then load Cargo into your current shell: +Rust 1.99.1 or newer is required. If `rustup` is not already installed, install it (this also installs `cargo`), then load Cargo into your current shell: ```bash curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh @@ -584,11 +584,11 @@ Clone the repository. Run the dependency and build commands from its directory: ```bash git clone https://github.com/devmobasa/wayscriber.git cd wayscriber -rustup toolchain install 1.98.1 --component clippy --component rustfmt +rustup toolchain install 1.99.1 --component clippy --component rustfmt cargo --version ``` -The repository's `rust-toolchain.toml` selects Rust 1.98.1 inside this checkout. If an older +The repository's `rust-toolchain.toml` selects Rust 1.99.1 inside this checkout. If an older directory override is already set, remove it with `rustup override unset` from the checkout so the file can select the toolchain. diff --git a/README.zh-CN.md b/README.zh-CN.md index 477e5363..73a2fd6e 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,7 +1,7 @@ # wayscriber [![许可证](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) -[![Rust](https://img.shields.io/badge/rust-1.98.1%2B-orange.svg)](https://www.rust-lang.org/) +[![Rust](https://img.shields.io/badge/rust-1.99.1%2B-orange.svg)](https://www.rust-lang.org/) [English](README.md) · **简体中文** @@ -581,7 +581,7 @@ sudo dnf install ./wayscriber-configurator-x86_64.rpm ### 从源码构建 -需要 Rust 1.98.1 或更新版本。如果尚未安装 `rustup`，请先安装它（也会安装 `cargo`），随后在当前 shell 中加载 Cargo： +需要 Rust 1.99.1 或更新版本。如果尚未安装 `rustup`，请先安装它（也会安装 `cargo`），随后在当前 shell 中加载 Cargo： ```bash curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh @@ -594,12 +594,12 @@ source "$HOME/.cargo/env" ```bash git clone https://github.com/devmobasa/wayscriber.git cd wayscriber -rustup toolchain install 1.98.1 --component clippy --component rustfmt +rustup toolchain install 1.99.1 --component clippy --component rustfmt cargo --version ``` -仓库的 `rust-toolchain.toml` 会在此检出目录中选择 Rust 1.98.1。如果此前为目录设置了旧版覆盖，请在该目录执行 `rustup override unset`，让工具链文件生效。 +仓库的 `rust-toolchain.toml` 会在此检出目录中选择 Rust 1.99.1。如果此前为目录设置了旧版覆盖，请在该目录执行 `rustup override unset`，让工具链文件生效。 **依赖：** diff --git a/configurator/Cargo.toml b/configurator/Cargo.toml index 1fefcbe6..a295a9f5 100644 --- a/configurator/Cargo.toml +++ b/configurator/Cargo.toml @@ -2,7 +2,7 @@ name = "wayscriber-configurator" version = "0.9.27" edition = "2024" -rust-version = "1.98.1" +rust-version = "1.99.1" [lints] workspace = true diff --git a/configurator/README.md b/configurator/README.md index 73a946d3..7c1969f3 100644 --- a/configurator/README.md +++ b/configurator/README.md @@ -15,7 +15,7 @@ This file covers building and running the configurator from source. For screensh ## Prerequisites -- Rust toolchain 1.98.1 or newer (`../rust-toolchain.toml` pins development builds). +- Rust toolchain 1.99.1 or newer (`../rust-toolchain.toml` pins development builds). - System development packages for GTK 4 and libadwaita. ## Run It diff --git a/flake.lock b/flake.lock index 695af92f..f1ff766d 100644 --- a/flake.lock +++ b/flake.lock @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1788505699, - "narHash": "sha256-PSPDCdbEBEbSDCWcqv5GkbyD2ACQ9Diz6vmEbWdy4dM=", + "lastModified": 1793086596, + "narHash": "sha256-ObKS44vw4IIVpQ69YJzUGjZ0IwnpWoUlwjJSY7gefdo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9eccf73c5b810052f08aa77ae0548c383259f17f", + "rev": "c7e9d512653a35ef4d5879c3df4d44d7b78d0e6d", "type": "github" }, "original": { diff --git a/rust-toolchain.toml b/rust-toolchain.toml index e6300496..57ef39fe 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.98.1" +channel = "1.99.1" profile = "minimal" components = ["clippy", "rustfmt"]