Merge ref 'f5209000832c' from rust-lang/rust

Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: f5209000832c9d3bc29c91f4daef4ca9f28dc797
Filtered ref: 7d63be37076f39216080a677b88ad18621850d0c
Upstream diff: rust-lang/rust@36b2369...f520900

This merge was created using https://github.com/rust-lang/josh-sync.

Author: The Miri Cronjob Bot

.github/workflows/ci.yml

@@ -14,9 +14,9 @@ jobs:
     if: github.repository == 'rust-lang/rustc-dev-guide'
     runs-on: ubuntu-latest
     env:
-      MDBOOK_VERSION: 0.4.52
-      MDBOOK_LINKCHECK2_VERSION: 0.9.1
-      MDBOOK_MERMAID_VERSION: 0.12.6
+      MDBOOK_VERSION: 0.5.1
+      MDBOOK_LINKCHECK2_VERSION: 0.11.0
+      MDBOOK_MERMAID_VERSION: 0.17.0
       MDBOOK_OUTPUT__LINKCHECK__FOLLOW_WEB_LINKS: ${{ github.event_name != 'pull_request' }}
       DEPLOY_DIR: book/html
       BASE_SHA: ${{ github.event.pull_request.base.sha }}

README.md

@@ -65,11 +65,6 @@ following example.
 ENABLE_LINKCHECK=1 mdbook serve
 ```
 
-### Table of Contents
-
-Each page has a TOC that is automatically generated by `pagetoc.js`.
-There is an associated `pagetoc.css`, for styling.
-
 ## Synchronizing josh subtree with rustc
 
 This repository is linked to `rust-lang/rust` as a [josh](https://josh-project.github.io/josh/intro.html) subtree. You can use the [rustc-josh-sync](https://github.com/rust-lang/josh-sync) tool to perform synchronization.

book.toml

@@ -15,9 +15,7 @@ edit-url-template = "https://github.com/rust-lang/rustc-dev-guide/edit/main/{pat
 additional-js = [
   "mermaid.min.js",
   "mermaid-init.js",
-  "pagetoc.js",
 ]
-additional-css = ["pagetoc.css"]
 
 [output.html.search]
 use-boolean-and = true

ci/sembr/src/main.rs

@@ -27,7 +27,7 @@ static REGEX_IGNORE_END: LazyLock<Regex> =
 static REGEX_IGNORE_LINK_TARGETS: LazyLock<Regex> =
     LazyLock::new(|| Regex::new(r"^\[.+\]: ").unwrap());
 static REGEX_SPLIT: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r"([^\.\d\-\*]\.|[^r]\?|;|!)\s").unwrap());
+    LazyLock::new(|| Regex::new(r"([^\.\d\-\*]\.|[^r]\?|!)\s").unwrap());
 // list elements, numbered (1.) or not  (- and *)
 static REGEX_LIST_ENTRY: LazyLock<Regex> =
     LazyLock::new(|| Regex::new(r"^\s*(\d\.|\-|\*)\s+").unwrap());
@@ -196,7 +196,7 @@ fn lengthen_lines(content: &str, limit: usize) -> String {
 fn test_sembr() {
     let original = "
 # some. heading
-must! be; split?
+must! be. split?
 1. ignore a dot after number. but no further
 ignore | tables
 ignore e.g. and
@@ -214,7 +214,7 @@ git log main.. compiler
     let expected = "
 # some. heading
 must!
-be;
+be.
 split?
 1. ignore a dot after number.
    but no further

pagetoc.css

@@ -1 +1 @@
-cc328c12382f05d8ddf6ffc8139deb7985270ad8
+dfe1b8c97bcde283102f706d5dcdc3649e5e12e3

pagetoc.js

@@ -52,6 +52,7 @@
 - [Mastering @rustbot](./rustbot.md)
 - [Walkthrough: a typical contribution](./walkthrough.md)
 - [Implementing new language features](./implementing_new_features.md)
+- [Stability guarantees](./stability-guarantees.md)
 - [Stability attributes](./stability.md)
 - [Stabilizing language features](./stabilization_guide.md)
     - [Stabilization report template](./stabilization_report_template.md)
@@ -185,14 +186,15 @@
         - [Opaque types](./solve/opaque-types.md)
         - [Significant changes and quirks](./solve/significant-changes.md)
     - [`Unsize` and `CoerceUnsized` traits](./traits/unsize.md)
-- [Type checking](./type-checking.md)
-    - [Method lookup](./method-lookup.md)
-    - [Variance](./variance.md)
-    - [Coherence checking](./coherence.md)
-    - [Opaque types](./opaque-types-type-alias-impl-trait.md)
-        - [Inference details](./opaque-types-impl-trait-inference.md)
-        - [Return Position Impl Trait In Trait](./return-position-impl-trait-in-trait.md)
-        - [Region inference restrictions][opaque-infer]
+- [Variance](./variance.md)
+- [Coherence checking](./coherence.md)
+- [HIR Type checking](./hir-typeck/summary.md)
+    - [Coercions](./hir-typeck/coercions.md)
+    - [Method lookup](./hir-typeck/method-lookup.md)
+- [Opaque types](./opaque-types-type-alias-impl-trait.md)
+    - [Inference details](./opaque-types-impl-trait-inference.md)
+    - [Return Position Impl Trait In Trait](./return-position-impl-trait-in-trait.md)
+    - [Region inference restrictions][opaque-infer]
 - [Const condition checking](./effects.md)
 - [Pattern and exhaustiveness checking](./pat-exhaustive-checking.md)
 - [Unsafety checking](./unsafety-checking.md)

rust-version

@@ -32,7 +32,7 @@ Rust, as well as publications about Rust.
 * [Scheduling techniques for concurrent systems](https://www.stanford.edu/~ouster/cgi-bin/papers/coscheduling.pdf)
 * [Singularity: rethinking the software stack](https://research.microsoft.com/pubs/69431/osr2007_rethinkingsoftwarestack.pdf)
 * [The data locality of work stealing](http://www.aladdin.cs.cmu.edu/papers/pdfs/y2000/locality_spaa00.pdf)
-* [Thread scheduling for multiprogramming multiprocessors](https://www.eecis.udel.edu/%7Ecavazos/cisc879-spring2008/papers/arora98thread.pdf)
+* [Thread scheduling for multiprogramming multiprocessors](https://dl.acm.org/doi/10.1145/277651.277678)
 * [Three layer cake for shared-memory programming](https://dl.acm.org/doi/10.1145/1953611.1953616)
 * [Work-first and help-first scheduling policies for async-finish task parallelism](https://dl.acm.org/doi/10.1109/IPDPS.2009.5161079) - More general than fully-strict work stealing
 

src/SUMMARY.md

@@ -16,7 +16,6 @@ Item            |  Kind    | Short description           | Chapter            |
 `HirId` | struct | One of four types of HIR node identifiers | [Identifiers in the HIR] | [compiler/rustc_hir_id/src/lib.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/struct.HirId.html)
 `Lexer` | struct | This is the lexer used during parsing. It consumes characters from the raw source code being compiled and produces a series of tokens for use by the rest of the parser | [The parser] |  [compiler/rustc_parse/src/lexer/mod.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_parse/lexer/struct.Lexer.html)
 `NodeId` | struct | One of four types of HIR node identifiers. Being phased out | [Identifiers in the HIR] | [compiler/rustc_ast/src/ast.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast/node_id/struct.NodeId.html)
-`P` | struct | An owned immutable smart pointer. By contrast, `&T` is not owned, and `Box<T>` is not immutable. | None | [compiler/rustc_ast/src/ptr.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast/ptr/struct.P.html)
 `ParamEnv` | struct | Information about generic parameters or `Self`, useful for working with associated or generic items | [Parameter Environment] | [compiler/rustc_middle/src/ty/mod.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.ParamEnv.html)
 `ParseSess` | struct | This struct contains information about a parsing session | [The parser] | [compiler/rustc_session/src/parse/parse.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_session/parse/struct.ParseSess.html)
 `Rib` | struct | Represents a single scope of names | [Name resolution] | [compiler/rustc_resolve/src/lib.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_resolve/late/struct.Rib.html)
@@ -34,7 +33,7 @@ Item            |  Kind    | Short description           | Chapter            |
 [Identifiers in the HIR]: ../hir.html#hir-id
 [The parser]: ../the-parser.html
 [The Rustc Driver and Interface]: ../rustc-driver/intro.html
-[Type checking]: ../type-checking.html
+[Type checking]: ../hir-typeck/summary.html
 [The `ty` modules]: ../ty.html
 [Rustdoc]: ../rustdoc.html
 [Emitting Diagnostics]: ../diagnostics.html