chore: Bump MSRV to 1.93 (#1594)

Also, clean up the parts that became more readable thanks to the newly
stabilized `std::fmt::from_fn`.

Author: lapla-cogito

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
         container:
           - 'ubuntu:24.04'
           - 'opensuse/tumbleweed:latest'
-          - 'rust:1.92-alpine'
+          - 'rust:1.93-alpine'
         test-qemu:
           - false
         test-plugins:
@@ -46,7 +46,7 @@ jobs:
             test-qemu: false
         exclude: # TODO: https://github.com/actions/runner/issues/1637
           - runs-on: ubuntu-24.04-arm
-            container: 'rust:1.92-alpine'
+            container: 'rust:1.93-alpine'
       fail-fast: false
 
     runs-on: ${{ matrix.runs-on }}
@@ -112,7 +112,7 @@ jobs:
         persist-credentials: false
     # This is where we check that we're not using features from a more recent rust version. When
     # updating this, please also update workspace.package.rust-version in `Cargo.toml`.
-    - uses: dtolnay/rust-toolchain@1.92.0
+    - uses: dtolnay/rust-toolchain@1.93.0
       id: rust-toolchain
       with:
         components: clippy

Cargo.toml

@@ -15,7 +15,7 @@ repository = "https://github.com/davidlattimore/wild"
 license = "MIT OR Apache-2.0"
 version = "0.8.0"
 readme = "README.md"
-rust-version = "1.92"
+rust-version = "1.93"
 edition = "2024"
 
 # Note, the versions listed here are minimum supported versions and should only be increased when

docker/alpine.Dockerfile

@@ -3,7 +3,7 @@
 # docker build --progress=plain -t wild-dev-alpine . -f docker/alpine.Dockerfile
 # docker run -it wild-dev-alpine
 
-FROM rust:1.92-alpine AS chef
+FROM rust:1.93-alpine AS chef
 RUN wget -qO- https://github.com/LukeMathWalker/cargo-chef/releases/download/v0.1.70/cargo-chef-x86_64-unknown-linux-musl.tar.gz | tar -xzf- && \
     mv cargo-chef /usr/local/bin
 RUN rustup toolchain install nightly && \

docker/arch.Dockerfile

@@ -46,7 +46,7 @@ RUN wget -qO- https://github.com/LukeMathWalker/cargo-chef/releases/download/v0.
 
 RUN wget https://sh.rustup.rs -O rustup-installer && \
     chmod +x rustup-installer && \
-    ./rustup-installer -y --default-toolchain 1.92.0
+    ./rustup-installer -y --default-toolchain 1.93.0
 
 ENV PATH="/root/.cargo/bin:$PATH"
 

docker/debian.Dockerfile

@@ -3,7 +3,7 @@
 # docker build --progress=plain -t wild-dev-debian . -f docker/debian.Dockerfile
 # docker run -it wild-dev-debian
 
-FROM rust:1.92 AS chef
+FROM rust:1.93 AS chef
 RUN apt-get update && \
     apt-get install -y \
         clang \

docker/ubuntu-24.04.Dockerfile

@@ -31,7 +31,7 @@ RUN apt-get update && \
 
 RUN wget https://sh.rustup.rs -O rustup-installer && \
     chmod +x rustup-installer && \
-    ./rustup-installer -y --default-toolchain 1.92.0
+    ./rustup-installer -y --default-toolchain 1.93.0
 
 ENV PATH="/root/.cargo/bin:$PATH"
 

flake.lock

@@ -176,7 +176,15 @@ pub(crate) fn create_groups<'data, O: ObjectFile<'data>>(
         symbol_db.add_group(Group::LinkerScripts(linker_scripts));
     }
 
-    tracing::trace!("GROUPS:\n{}", GroupsDisplay(&symbol_db.groups));
+    tracing::trace!(
+        "GROUPS:\n{}",
+        std::fmt::from_fn(|f| {
+            for (i, group) in symbol_db.groups.iter().enumerate() {
+                writeln!(f, "{i}: {group}")?;
+            }
+            Ok(())
+        })
+    );
 }
 
 /// Decides after how many symbols, we should start a new group.
@@ -223,8 +231,6 @@ fn count_symbols<'data, O: ObjectFile<'data>>(
     objects.iter().map(|o| o.num_symbols()).sum::<usize>()
 }
 
-struct GroupsDisplay<'a, 'data, O: ObjectFile<'data>>(&'a [Group<'data, O>]);
-
 impl<'data, O: ObjectFile<'data>> SequencedInputObject<'data, O> {
     pub(crate) fn symbol_name(
         &self,
@@ -289,15 +295,6 @@ impl<'db, 'data, O: ObjectFile<'data>> SequencedInput<'db, 'data, O> {
     }
 }
 
-impl<'data, O: ObjectFile<'data>> Display for GroupsDisplay<'_, 'data, O> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        for (i, group) in self.0.iter().enumerate() {
-            writeln!(f, "{i}: {group}")?;
-        }
-        Ok(())
-    }
-}
-
 impl<'data, O: ObjectFile<'data>> std::fmt::Display for SequencedInputObject<'data, O> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(&self.parsed.input, f)

libwild/src/grouping.rs

@@ -6178,25 +6178,18 @@ impl std::fmt::Debug for FileLayoutState<'_> {
     }
 }
 
-fn section_debug(object: &crate::elf::File, section_index: object::SectionIndex) -> SectionDebug {
+fn section_debug(
+    object: &crate::elf::File,
+    section_index: object::SectionIndex,
+) -> impl std::fmt::Display {
     let name = object
         .section(section_index)
         .and_then(|section| object.section_name(section))
         .map_or_else(
             |_| "??".to_owned(),
             |name| String::from_utf8_lossy(name).into_owned(),
         );
-    SectionDebug { name }
-}
-
-struct SectionDebug {
-    name: String,
-}
-
-impl Display for SectionDebug {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "`{}`", self.name)
-    }
+    std::fmt::from_fn(move |f| write!(f, "`{name}`"))
 }
 
 impl<'data> DynamicSymbolDefinition<'data> {

libwild/src/layout.rs

@@ -12,8 +12,8 @@
   glibc,
   stdenv,
 }:
-assert lib.assertMsg (lib.versionAtLeast rustc.version "1.92.0")
-  "Wild requires at least Rust 1.92.0, this instance of nixpkgs has Rust ${rustc.version}";
+assert lib.assertMsg (lib.versionAtLeast rustc.version "1.93.0")
+  "Wild requires at least Rust 1.93.0, this instance of nixpkgs has Rust ${rustc.version}";
 
 let
   cargoToml = builtins.fromTOML (builtins.readFile ../Cargo.toml);