From b9afc0a44dd1425a1c9874b65abdeceb5928f843 Mon Sep 17 00:00:00 2001
From: pjht <pterpstra@pterpstra.com>
Date: Wed, 4 Sep 2024 11:30:38 -0500
Subject: [PATCH] Update to latest rustc

---
 compiler/rustc_target/src/spec/base/mikros.rs |  2 +-
 .../src/spec/targets/x86_64_unknown_mikros.rs |  2 +-
 library/Cargo.lock                            |  2 +-
 mikros_std_deps/volatile-0.4.6/src/lib.rs     |  2 +-
 src/tools/rustbook/Cargo.lock                 | 30 +++++--------------
 5 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/compiler/rustc_target/src/spec/base/mikros.rs b/compiler/rustc_target/src/spec/base/mikros.rs
index 9bb17d347fb..932b9908378 100644
--- a/compiler/rustc_target/src/spec/base/mikros.rs
+++ b/compiler/rustc_target/src/spec/base/mikros.rs
@@ -2,7 +2,7 @@
     Cc, LinkSelfContainedDefault, LinkerFlavor, Lld, RelocModel, StackProbeType, TargetOptions,
 };
 
-pub fn opts() -> TargetOptions {
+pub(crate) fn opts() -> TargetOptions {
     TargetOptions {
         os: "mikros".into(),
         executables: true,
diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_mikros.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_mikros.rs
index 8d2beee6fe8..2b27b730f9a 100644
--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_mikros.rs
+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_mikros.rs
@@ -1,6 +1,6 @@
 use crate::spec::{base, PanicStrategy, Target, TargetMetadata};
 
-pub fn target() -> Target {
+pub(crate) fn target() -> Target {
     let mut base = base::mikros::opts();
     base.cpu = "x86-64".into();
     base.disable_redzone = true;
diff --git a/library/Cargo.lock b/library/Cargo.lock
index 54019f682ef..62cbf13aedb 100644
--- a/library/Cargo.lock
+++ b/library/Cargo.lock
@@ -405,8 +405,8 @@ dependencies = [
  "std_detect",
  "unwind",
  "wasi",
- "x86_64",
  "windows-targets 0.0.0",
+ "x86_64",
 ]
 
 [[package]]
diff --git a/mikros_std_deps/volatile-0.4.6/src/lib.rs b/mikros_std_deps/volatile-0.4.6/src/lib.rs
index 1002240e316..4a913c93276 100644
--- a/mikros_std_deps/volatile-0.4.6/src/lib.rs
+++ b/mikros_std_deps/volatile-0.4.6/src/lib.rs
@@ -450,7 +450,7 @@ pub fn index<'a, I>(&'a self, index: I) -> Volatile<&'a I::Output, A>
     /// subslice.index_mut(0).write(6);
     /// assert_eq!(subslice.index(0).read(), 6);
     /// ```
-    pub fn index_mut<'a, I>(&'a mut self, index: I) -> Volatile<&mut I::Output, A>
+    pub fn index_mut<'a, I>(&'a mut self, index: I) -> Volatile<&'a mut I::Output, A>
     where
         I: SliceIndex<[T]>,
         R: DerefMut,
diff --git a/src/tools/rustbook/Cargo.lock b/src/tools/rustbook/Cargo.lock
index 1394675a9dc..df051ed447e 100644
--- a/src/tools/rustbook/Cargo.lock
+++ b/src/tools/rustbook/Cargo.lock
@@ -303,12 +303,6 @@ dependencies = [
  "crypto-common",
 ]
 
-[[package]]
-name = "doc-comment"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
-
 [[package]]
 name = "elasticlunr-rs"
 version = "3.0.2"
@@ -471,21 +465,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "html_parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f56db07b6612644f6f7719f8ef944f75fff9d6378fdf3d316fd32194184abd"
-dependencies = [
- "doc-comment",
- "pest",
- "pest_derive",
- "serde",
- "serde_derive",
- "serde_json",
- "thiserror",
-]
-
 [[package]]
 name = "humantime"
 version = "2.1.0"
@@ -690,7 +669,6 @@ dependencies = [
  "mdbook",
  "once_cell",
  "pathdiff",
- "pulldown-cmark",
  "regex",
  "semver",
  "serde_json",
@@ -702,13 +680,13 @@ name = "mdbook-trpl-listing"
 version = "0.1.0"
 dependencies = [
  "clap",
- "html_parser",
  "mdbook",
  "pulldown-cmark",
  "pulldown-cmark-to-cmark",
  "serde_json",
  "thiserror",
  "toml 0.8.14",
+ "xmlparser",
 ]
 
 [[package]]
@@ -1789,6 +1767,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "xmlparser"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
+
 [[package]]
 name = "yaml-rust"
 version = "0.4.5"