Skip to content

Commit f91a29c

Browse files
authored
Unrolled build for #149684
Rollup merge of #149684 - tshepang:rdg-sync, r=tshepang rustc-dev-guide subtree update Subtree update of `rustc-dev-guide` to rust-lang/rustc-dev-guide@0afee7b. Created using https://github.com/rust-lang/josh-sync. r? `@ghost`
2 parents b4f1098 + caac41d commit f91a29c

29 files changed

+491
-335
lines changed

src/doc/rustc-dev-guide/.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
if: github.repository == 'rust-lang/rustc-dev-guide'
1515
runs-on: ubuntu-latest
1616
env:
17-
MDBOOK_VERSION: 0.4.52
18-
MDBOOK_LINKCHECK2_VERSION: 0.9.1
19-
MDBOOK_MERMAID_VERSION: 0.12.6
17+
MDBOOK_VERSION: 0.5.1
18+
MDBOOK_LINKCHECK2_VERSION: 0.11.0
19+
MDBOOK_MERMAID_VERSION: 0.17.0
2020
MDBOOK_OUTPUT__LINKCHECK__FOLLOW_WEB_LINKS: ${{ github.event_name != 'pull_request' }}
2121
DEPLOY_DIR: book/html
2222
BASE_SHA: ${{ github.event.pull_request.base.sha }}

src/doc/rustc-dev-guide/README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@ following example.
6565
ENABLE_LINKCHECK=1 mdbook serve
6666
```
6767

68-
### Table of Contents
69-
70-
Each page has a TOC that is automatically generated by `pagetoc.js`.
71-
There is an associated `pagetoc.css`, for styling.
72-
7368
## Synchronizing josh subtree with rustc
7469

7570
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.

src/doc/rustc-dev-guide/book.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ edit-url-template = "https://github.com/rust-lang/rustc-dev-guide/edit/main/{pat
1515
additional-js = [
1616
"mermaid.min.js",
1717
"mermaid-init.js",
18-
"pagetoc.js",
1918
]
20-
additional-css = ["pagetoc.css"]
2119

2220
[output.html.search]
2321
use-boolean-and = true

src/doc/rustc-dev-guide/ci/sembr/src/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static REGEX_IGNORE_END: LazyLock<Regex> =
2727
static REGEX_IGNORE_LINK_TARGETS: LazyLock<Regex> =
2828
LazyLock::new(|| Regex::new(r"^\[.+\]: ").unwrap());
2929
static REGEX_SPLIT: LazyLock<Regex> =
30-
LazyLock::new(|| Regex::new(r"([^\.\d\-\*]\.|[^r]\?|;|!)\s").unwrap());
30+
LazyLock::new(|| Regex::new(r"([^\.\d\-\*]\.|[^r]\?|!)\s").unwrap());
3131
// list elements, numbered (1.) or not (- and *)
3232
static REGEX_LIST_ENTRY: LazyLock<Regex> =
3333
LazyLock::new(|| Regex::new(r"^\s*(\d\.|\-|\*)\s+").unwrap());
@@ -196,7 +196,7 @@ fn lengthen_lines(content: &str, limit: usize) -> String {
196196
fn test_sembr() {
197197
let original = "
198198
# some. heading
199-
must! be; split?
199+
must! be. split?
200200
1. ignore a dot after number. but no further
201201
ignore | tables
202202
ignore e.g. and
@@ -214,7 +214,7 @@ git log main.. compiler
214214
let expected = "
215215
# some. heading
216216
must!
217-
be;
217+
be.
218218
split?
219219
1. ignore a dot after number.
220220
but no further

src/doc/rustc-dev-guide/pagetoc.css

Lines changed: 0 additions & 84 deletions
This file was deleted.

src/doc/rustc-dev-guide/pagetoc.js

Lines changed: 0 additions & 104 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cc328c12382f05d8ddf6ffc8139deb7985270ad8
1+
dfe1b8c97bcde283102f706d5dcdc3649e5e12e3

src/doc/rustc-dev-guide/src/SUMMARY.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
- [Mastering @rustbot](./rustbot.md)
5353
- [Walkthrough: a typical contribution](./walkthrough.md)
5454
- [Implementing new language features](./implementing_new_features.md)
55+
- [Stability guarantees](./stability-guarantees.md)
5556
- [Stability attributes](./stability.md)
5657
- [Stabilizing language features](./stabilization_guide.md)
5758
- [Stabilization report template](./stabilization_report_template.md)
@@ -185,14 +186,15 @@
185186
- [Opaque types](./solve/opaque-types.md)
186187
- [Significant changes and quirks](./solve/significant-changes.md)
187188
- [`Unsize` and `CoerceUnsized` traits](./traits/unsize.md)
188-
- [Type checking](./type-checking.md)
189-
- [Method lookup](./method-lookup.md)
190-
- [Variance](./variance.md)
191-
- [Coherence checking](./coherence.md)
192-
- [Opaque types](./opaque-types-type-alias-impl-trait.md)
193-
- [Inference details](./opaque-types-impl-trait-inference.md)
194-
- [Return Position Impl Trait In Trait](./return-position-impl-trait-in-trait.md)
195-
- [Region inference restrictions][opaque-infer]
189+
- [Variance](./variance.md)
190+
- [Coherence checking](./coherence.md)
191+
- [HIR Type checking](./hir-typeck/summary.md)
192+
- [Coercions](./hir-typeck/coercions.md)
193+
- [Method lookup](./hir-typeck/method-lookup.md)
194+
- [Opaque types](./opaque-types-type-alias-impl-trait.md)
195+
- [Inference details](./opaque-types-impl-trait-inference.md)
196+
- [Return Position Impl Trait In Trait](./return-position-impl-trait-in-trait.md)
197+
- [Region inference restrictions][opaque-infer]
196198
- [Const condition checking](./effects.md)
197199
- [Pattern and exhaustiveness checking](./pat-exhaustive-checking.md)
198200
- [Unsafety checking](./unsafety-checking.md)

src/doc/rustc-dev-guide/src/appendix/bibliography.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Rust, as well as publications about Rust.
3232
* [Scheduling techniques for concurrent systems](https://www.stanford.edu/~ouster/cgi-bin/papers/coscheduling.pdf)
3333
* [Singularity: rethinking the software stack](https://research.microsoft.com/pubs/69431/osr2007_rethinkingsoftwarestack.pdf)
3434
* [The data locality of work stealing](http://www.aladdin.cs.cmu.edu/papers/pdfs/y2000/locality_spaa00.pdf)
35-
* [Thread scheduling for multiprogramming multiprocessors](https://www.eecis.udel.edu/%7Ecavazos/cisc879-spring2008/papers/arora98thread.pdf)
35+
* [Thread scheduling for multiprogramming multiprocessors](https://dl.acm.org/doi/10.1145/277651.277678)
3636
* [Three layer cake for shared-memory programming](https://dl.acm.org/doi/10.1145/1953611.1953616)
3737
* [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
3838

src/doc/rustc-dev-guide/src/appendix/code-index.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Item | Kind | Short description | Chapter |
1616
`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)
1717
`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)
1818
`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)
19-
`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)
2019
`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)
2120
`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)
2221
`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 |
3433
[Identifiers in the HIR]: ../hir.html#hir-id
3534
[The parser]: ../the-parser.html
3635
[The Rustc Driver and Interface]: ../rustc-driver/intro.html
37-
[Type checking]: ../type-checking.html
36+
[Type checking]: ../hir-typeck/summary.html
3837
[The `ty` modules]: ../ty.html
3938
[Rustdoc]: ../rustdoc.html
4039
[Emitting Diagnostics]: ../diagnostics.html

0 commit comments

Comments
 (0)