Update several dependencies

Cargo.toml

@@ -9,8 +9,8 @@ edition = "2024"
 
 [dependencies]
 anyhow = "1"
-atoi = "2"
+atoi = "3"
-audioadapter-buffers = "3"
+audioadapter-buffers = "4"
 atomic = "0.6"
 bitflags = { version = "2", features = ["serde"] }
 bytemuck = { version = "1", features = ["derive"] }
@@ -25,21 +25,21 @@ egui-wgpu = { version = "0.34", features = ["winit"] }
 fxprof-processed-profile = "0.8"
 fixed = { version = "1.28", features = ["num-traits"] }
 gilrs = { version = "0.11", features = ["serde-serialize"] }
-gimli = "0.33"
+gimli = "0.34"
 hex = "0.4"
 image = { version = "0.25", default-features = false, features = ["png"] }
-itertools = "0.14"
+itertools = "0.15"
 normpath = "1"
 notify = "8"
 num-derive = "0.4"
 num-traits = "0.2"
 object = "0.39"
 oneshot = { version = "0.2", features = ["async", "std"] }
-pollster = "0.4"
+pollster = "1"
 rand = "0.10"
 rfd = "0.17"
 rtrb = "0.3"
-rubato = "2"
+rubato = "4"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 thread-priority = "3"

build.Dockerfile

@@ -1,7 +1,7 @@
 # This Dockerfile produces a base image for builds.
 # It includes all dependencies necessary to cross-compile for Windows/MacOS/Linux.
 
-FROM debian:bookworm AS osxcross
+FROM debian:trixie AS osxcross
 ADD --chmod=644 "https://apt.llvm.org/llvm-snapshot.gpg.key" /etc/apt/trusted.gpg.d/apt.llvm.org.asc
 WORKDIR /build/osxcross
 ADD "https://github.com/tpoechtrager/osxcross.git#47936a512273bb3b414b5a2e83043c92eabc7ae7" .
@@ -9,25 +9,21 @@ ADD "https://github.com/joseluisq/macosx-sdks/releases/download/14.5/MacOSX14.5.
 RUN apt-get update && \
     apt-get install -y ca-certificates
 COPY llvm.sources /etc/apt/sources.list.d/llvm.sources
-COPY install-llvm.sh .
 RUN apt-get update && \
-    ./install-llvm.sh && \
+    apt-get install -y bash bzip2 clang-22 git lld-22 llvm-22 make patch xz-utils && \
-    apt-get install -y bash bzip2 git make patch xz-utils && \
     ln -s $(which clang-22) /usr/bin/clang && \
     ln -s $(which clang++-22) /usr/bin/clang++ && \
     ln -s $(which ld64.lld-22) /usr/bin/ld64.lld && \
     SDK_VERSION=14.5 UNATTENDED=1 ENABLE_COMPILER_RT_INSTALL=1 TARGET_DIR=/osxcross ./build.sh
 
-FROM rust:1.95-bookworm
+FROM rust:1.97-trixie
 ADD --chmod=644 "https://apt.llvm.org/llvm-snapshot.gpg.key" /etc/apt/trusted.gpg.d/apt.llvm.org.asc
 COPY llvm.sources /etc/apt/sources.list.d/llvm.sources
-COPY install-llvm.sh .
 RUN rustup target add x86_64-pc-windows-msvc && \
     rustup target add x86_64-apple-darwin && \
     rustup target add aarch64-apple-darwin && \
     apt-get update && \
-    ./install-llvm.sh && \
+    apt-get install -y clang-22 lld-22 libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
-    apt-get install -y libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
     cargo install cargo-bundle xwin && \
     xwin --accept-license splat --output xwin && \
     rm -rf .xwin-cache && \

install-llvm.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-# Hopefully temporary script to manually install working llvm packages.
-# The apt index for these is broken in bookworm, and upgrading to trixie
-# would make them depend on too new of a libc version.
-
-# https://apt.llvm.org/bookworm/pool/main/l/llvm-toolchain-22/clang-22_22.1.0~%2B%2B20260223093050%2Bcd5897175d0d-1~exp1~20260223093246.28_amd64.deb
-PACKAGES=('clang-22' 'clang-tools-22' 'libclang-common-22-dev' 'libclang-cpp22' 'libclang-rt-22-dev' 'libclang1-22' 'libllvm22' 'lld-22' 'llvm-22' 'llvm-22-dev' 'llvm-22-linker-tools' 'llvm-22-runtime' 'llvm-22-tools')
-FILES=()
-URL='https://apt.llvm.org/bookworm/pool/main/l/llvm-toolchain-22'
-VERSION='22.1.0~%2B%2B20260223093050%2Bcd5897175d0d-1~exp1~20260223093246.28_amd64.deb'
-
-apt-get install -y curl python3
-for package in "${PACKAGES[@]}"; do
-    curl -O -L "$URL/${package}_$VERSION"
-    FILES+=("./${package}_$VERSION")
-done
-
-apt-get install -y "${FILES[@]}"

llvm.sources

@@ -1,4 +1,4 @@
 Types: deb deb-src
-URIs: http://apt.llvm.org/bookworm/
+URIs: http://apt.llvm.org/trixie/
-Suites: llvm-toolchain-bookworm-22
+Suites: llvm-toolchain-trixie-22
 Components: main

src/audio.rs

@@ -3,7 +3,7 @@ use std::time::Duration;
 use anyhow::{Result, bail};
 use audioadapter_buffers::direct::InterleavedSlice;
 use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
-use rubato::Resampler;
+use rubato::{Adjustable as _, Resampler};
 use tracing::error;
 
 pub struct Audio {

src/window/utils.rs

@@ -1,6 +1,6 @@
 use std::{
     fmt::{Display, UpperHex},
-    ops::{Bound, Deref, DerefMut, RangeBounds},
+    ops::{AddAssign, Bound, Deref, DerefMut, MulAssign, RangeBounds},
     str::FromStr,
 };
 
@@ -10,7 +10,7 @@ use egui::{
     RichText, Sense, Shape, Stroke, StrokeKind, TextEdit, Ui, UiBuilder, Vec2, Widget, WidgetText,
     ecolor::HexColor, util::id_type_map::SerializableAny,
 };
-use num_traits::{CheckedAdd, CheckedSub, One};
+use num_traits::{CheckedAdd, CheckedSub, One, Zero};
 
 pub trait UiExt {
     fn section(&mut self, title: impl Into<String>, add_contents: impl FnOnce(&mut Ui));
@@ -105,14 +105,16 @@ enum Direction {
 
 pub trait Number:
     Copy
+    + Zero
     + One
+    + AddAssign
+    + MulAssign
     + CheckedAdd
     + CheckedSub
     + Eq
     + Ord
     + Display
     + FromStr
-    + FromRadix16
     + UpperHex
     + Send
     + Sync
@@ -121,14 +123,16 @@ pub trait Number:
 }
 impl<
     T: Copy
+        + Zero
         + One
+        + AddAssign
+        + MulAssign
         + CheckedAdd
         + CheckedSub
         + Eq
         + Ord
         + Display
         + FromStr
-        + FromRadix16
         + UpperHex
         + Send
         + Sync
@@ -209,8 +213,8 @@ impl<T: Number> Widget for NumberEdit<'_, T> {
         let from_string = |val: &str| {
             if self.hex {
                 let bytes = val.as_bytes();
-                let (result, consumed) = T::from_radix_16(bytes);
+                let (result, consumed) = atoi::Integer::<T>::from_radix_16(bytes);
-                (consumed == bytes.len()).then_some(result)
+                (consumed == bytes.len()).then_some(result.0)
             } else {
                 val.parse::<T>().ok()
             }