Update to Rust 2024 edition. (#2658)

Author: qwandor

.github/workflows/build.sh

@@ -25,7 +25,7 @@ else
     # Back-date the sources to POT-Creation-Date. The content lives in two
     # directories:
     rm -r src/ third_party/
-    git restore --source "$(git rev-list -n 1 --before "$pot_creation_date" @)" src/ third_party/
+    git restore --source "$(git rev-list -n 1 --before "$pot_creation_date" @)" src/ third_party/ book.toml
     # Set language and adjust site URL. Clear the redirects since they are
     # in sync with the source files, not the translation.
     export MDBOOK_BOOK__LANGUAGE=$book_lang

.github/workflows/build.yml

@@ -161,9 +161,11 @@ jobs:
           MDBOOK_OUTPUT='{"xgettext": {"pot-file": "messages.pot"}}' mdbook build -d po
           msgfmt -o /dev/null --statistics po/messages.pot
 
-      - name: Install mdbook-linkcheck
+      - name: Install mdbook-linkcheck2
         if: contains(fromJSON(env.LINK_CHECKED_LANGUAGES), matrix.language)
-        run: cargo install mdbook-linkcheck --locked --version 0.7.7
+        run: |
+          cargo uninstall mdbook-linkcheck || true
+          cargo install mdbook-linkcheck2 --locked --version 0.9.1
 
       - name: Build ${{ matrix.language }} translation
         run: |
@@ -210,6 +212,9 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Update Rust
+        run: rustup update
+
       - name: Setup Rust cache
         uses: ./.github/workflows/setup-rust-cache
 

.github/workflows/install-mdbook/action.yml

@@ -13,6 +13,6 @@ runs:
       run: |
         sudo apt-get update
         sudo apt-get install -y texlive texlive-luatex texlive-lang-cjk texlive-lang-arabic librsvg2-bin fonts-noto
-        curl -LsSf https://github.com/jgm/pandoc/releases/download/3.6.2/pandoc-3.6.2-linux-amd64.tar.gz | tar zxf -
-        echo "$PWD/pandoc-3.6.2/bin" >> $GITHUB_PATH
+        curl -LsSf https://github.com/jgm/pandoc/releases/download/3.7.0.1/pandoc-3.7.0.1-linux-amd64.tar.gz | tar zxf -
+        echo "$PWD/pandoc-3.7.0.1/bin" >> $GITHUB_PATH
       shell: bash

.github/workflows/publish.yml

@@ -35,6 +35,9 @@ jobs:
         with:
           fetch-depth: 0 # We need the full history for build.sh below.
 
+      - name: Update Rust
+        run: rustup update
+
       - name: Setup Rust cache
         uses: ./.github/workflows/setup-rust-cache
 

README.md

@@ -55,7 +55,7 @@ The course is built using a few tools:
 - [mdbook-i18n-helpers and i18n-report](https://github.com/google/mdbook-i18n-helpers)
 - [mdbook-exerciser](mdbook-exerciser/)
 - [mdbook-course](mdbook-course/)
-- [mdbook-linkcheck](https://github.com/Michael-F-Bryan/mdbook-linkcheck)
+- [mdbook-linkcheck2](https://github.com/marxin/mdbook-linkcheck2)
 
 First install Rust by following the instructions on https://rustup.rs/. Then
 clone this repository:

book.toml

@@ -5,7 +5,7 @@ src = "src"
 title = "Comprehensive Rust 🦀"
 
 [rust]
-edition = "2021"
+edition = "2024"
 
 [build]
 extra-watch-dirs = ["po", "third_party"]
@@ -299,3 +299,12 @@ exclude = [
   "comprehensive-rust-exercises.zip",
   # "crates.io", # uncomment when follow-web-links is true
 ]
+
+[output.linkcheck2]
+optional = true
+follow-web-links = false # change to true to check web links
+exclude = [
+  "comprehensive-rust.pdf",
+  "comprehensive-rust-exercises.zip",
+  # "crates.io", # uncomment when follow-web-links is true
+]

dprint.json

@@ -9,7 +9,7 @@
       "command": "yapf3",
       "exts": ["py"]
     }, {
-      "command": "rustup run stable rustfmt --edition 2021",
+      "command": "rustup run stable rustfmt --edition 2024",
       "exts": ["rs"]
     }]
   },

mdbook-course/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mdbook-course"
 version = "0.1.0"
 authors = ["Dustin Mitchell <djmitche@google.com>"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 publish = false
 repository = "https://github.com/google/comprehensive-rust"

mdbook-course/src/course.rs

@@ -35,8 +35,8 @@
 //! item becomes the first slide in that segment. Any other sub-items of the
 //! top-level item are treated as further slides in the same segment.
 
-use crate::frontmatter::{split_frontmatter, Frontmatter};
-use crate::markdown::{duration, Table};
+use crate::frontmatter::{Frontmatter, split_frontmatter};
+use crate::markdown::{Table, duration};
 use mdbook::book::{Book, BookItem, Chapter};
 use std::fmt::Write;
 use std::path::PathBuf;
@@ -318,7 +318,9 @@ impl Session {
         }
         format!(
             "Including {BREAK_DURATION} minute breaks, this session should take about {}. It contains:\n\n{}",
-            duration(self.minutes()), segments)
+            duration(self.minutes()),
+            segments
+        )
     }
 
     /// Return the total duration of this session.
@@ -337,11 +339,7 @@ impl Session {
     ///
     /// This includes breaks between segments.
     pub fn target_minutes(&self) -> u64 {
-        if self.target_minutes > 0 {
-            self.target_minutes
-        } else {
-            self.minutes()
-        }
+        if self.target_minutes > 0 { self.target_minutes } else { self.minutes() }
     }
 }
 

mdbook-exerciser/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mdbook-exerciser"
 version = "0.1.0"
 authors = ["Andrew Walbran <qwandor@google.com>"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 repository = "https://github.com/google/comprehensive-rust"
 description = "A tool for extracting starter code for exercises from Markdown files."