Skip to content

Commit 3087a1f

Browse files
committed
Auto merge of #40368 - arielb1:rollup, r=arielb1
Rollup of 20 pull requests - Successful merges: #40154, #40222, #40226, #40237, #40254, #40258, #40265, #40268, #40279, #40283, #40292, #40293, #40296, #40316, #40321, #40325, #40326, #40327, #40333, #40335 - Failed merges:
2 parents 5c9208f + f2886e8 commit 3087a1f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+435
-5780
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
[submodule "src/liblibc"]
1919
path = src/liblibc
2020
url = https://github.com/rust-lang/libc.git
21+
[submodule "src/doc/nomicon"]
22+
path = src/doc/nomicon
23+
url = https://github.com/rust-lang-nursery/nomicon
2124
[submodule "src/tools/cargo"]
2225
path = src/tools/cargo
2326
url = https://github.com/rust-lang/cargo

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -406,5 +406,5 @@ are:
406406
[rr]: https://doc.rust-lang.org/book/README.html
407407
[tlgba]: http://tomlee.co/2014/04/a-more-detailed-tour-of-the-rust-compiler/
408408
[ro]: http://www.rustaceans.org/
409-
[rctd]: ./COMPILER_TESTS.md
409+
[rctd]: ./src/test/COMPILER_TESTS.md
410410
[cheatsheet]: https://buildbot.rust-lang.org/homu/

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ $ ./configure
149149
$ make && sudo make install
150150
```
151151

152-
When using the configure script, the generated config.mk` file may override the
152+
When using the configure script, the generated `config.mk` file may override the
153153
`config.toml` file. To go back to the `config.toml` file, delete the generated
154154
`config.mk` file.
155155

src/doc/index.md

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Rust provides a number of book-length sets of documentation, collectively
2828
nicknamed 'The Rust Bookshelf.'
2929

3030
* [The Rust Programming Language][book] teaches you how to program in Rust.
31+
* [The Unstable Book][unstable-book] has documentation for unstable features.
3132
* [The Rustonomicon][nomicon] is your guidebook to the dark arts of unsafe Rust.
3233
* [The Reference][ref] is not a formal spec, but is more detailed and comprehensive than the book.
3334

@@ -44,4 +45,5 @@ landed before then. That work is being tracked [here][38643].
4445
[err]: error-index.html
4546
[book]: book/index.html
4647
[nomicon]: nomicon/index.html
48+
[unstable-book]: unstable-book/index.html
4749

src/doc/nomicon

Submodule nomicon added at d08fe97

src/doc/nomicon/src/README.md

-38
This file was deleted.

src/doc/nomicon/src/SUMMARY.md

-55
This file was deleted.

src/doc/nomicon/src/arc-and-mutex.md

-7
This file was deleted.

0 commit comments

Comments
 (0)