Auto merge of rust-lang#17732 - lnicola:sync-from-rust, r=lnicola

minor: sync from downstream

Author: bors

.github/workflows/dependencies.yml

@@ -64,11 +64,17 @@ jobs:
       - name: cargo update
         # Remove first line that always just says "Updating crates.io index"
         run: cargo update 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
+      - name: cargo update rustbook
+        run: |
+          echo -e "\nrustbook dependencies:" >> cargo_update.log
+          cargo update --manifest-path src/tools/rustbook 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
       - name: upload Cargo.lock artifact for use in PR
         uses: actions/upload-artifact@v4
         with:
           name: Cargo-lock
-          path: Cargo.lock
+          path: |
+            Cargo.lock
+            src/tools/rustbook/Cargo.lock
           retention-days: 1
       - name: upload cargo-update log artifact for use in PR
         uses: actions/upload-artifact@v4
@@ -113,7 +119,7 @@ jobs:
           git config user.name github-actions
           git config user.email [email protected]
           git switch --force-create cargo_update
-          git add ./Cargo.lock
+          git add ./Cargo.lock ./src/tools/rustbook/Cargo.lock
           git commit --no-verify --file=commit.txt
 
       - name: push

.gitignore

@@ -50,7 +50,6 @@ build/
 /target
 /src/bootstrap/target
 /src/tools/x/target
-/inc-fat/
 # Created by default with `src/ci/docker/run.sh`
 /obj/
 /rustc-ice*

.mailmap

@@ -435,7 +435,7 @@ Nick Platt <[email protected]>
 Niclas Schwarzlose <[email protected]>
 Nicolas Abram <[email protected]>
 Nicole Mazzuca <[email protected]>
-Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> nils <[email protected]>
+Noratrieb <48135649+Noratrieb@users.noreply.github.com> <[email protected]>
 Nif Ward <[email protected]>
 Nika Layzell <[email protected]> <[email protected]>
 NODA Kai <[email protected]>