Skip to content

Commit 04fef17

Browse files
committed
Auto merge of #49753 - kennytm:rollup, r=kennytm
Rollup of 9 pull requests Successful merges: - #49510 (Fix anchor position on fields) - #49652 (Fix anchors issue when everything is collapsed) - #49702 (std: Inline some Termination-related methods) - #49728 (add emit_debug_gdb_scripts target option and ..) - #49731 (add THUMB targets to rustup manifest) - #49742 (Using X headings instead of 0.X #49739) - #49748 (proc_macro: Improve Debug representations) - #49750 (bootstrap: Remove the fast path) - #49503 (Inject the `compiler_builtins` crate whenever the `core` crate is injected) Failed merges:
2 parents e0a9bd0 + 24b3a97 commit 04fef17

File tree

36 files changed

+188
-80
lines changed

36 files changed

+188
-80
lines changed

src/Cargo.lock

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/bootstrap/bootstrap.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -770,10 +770,7 @@ def bootstrap(help_triggered):
770770
if 'dev' in data:
771771
build.set_dev_environment()
772772

773-
# No help text depends on submodules. This check saves ~1 minute of git commands, even if
774-
# all the submodules are present and downloaded!
775-
if not help_triggered:
776-
build.update_submodules()
773+
build.update_submodules()
777774

778775
# Fetch/build the bootstrap
779776
build.build = args.build or build.build_triple()

src/doc/index.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -13,65 +13,65 @@ unofficial documentation resources as well!
1313
Many of these resources take the form of "books"; we collectively call these
1414
"The Rust Bookshelf." Some are large, some are small.
1515

16-
## Learn Rust
16+
# Learn Rust
1717

1818
If you'd like to learn Rust, this is the spot for you! All of these resources
1919
assume that you have programmed before, but not in any specific language:
2020

21-
### The Rust Programming Language
21+
## The Rust Programming Language
2222

2323
Affectionately nicknamed "the book," [The Rust Programming
2424
Language](book/index.html) will give you an overview of the language from
2525
first principles. You'll build a few projects along the way, and by the end,
2626
you'll have a solid grasp of the language.
2727

28-
### Rust By Example
28+
## Rust By Example
2929

3030
If reading multiple hundreds of pages about a language isn't your style, then
3131
[Rust By Example](rust-by-example/index.html) has you covered. While the book talks about code with
3232
a lot of words, RBE shows off a bunch of code, and keeps the talking to a
3333
minimum. It also includes exercises!
3434

35-
## Use Rust
35+
# Use Rust
3636

3737
Once you've gotten familliar with the language, these resources can help you
3838
when you're actually using it day-to-day.
3939

40-
### The Standard Library
40+
## The Standard Library
4141

4242
Rust's standard library has [extensive API documentation](std/index.html),
4343
with explanations of how to use various things, as well as example code for
4444
accomplishing various tasks.
4545

46-
### The Cargo Book
46+
## The Cargo Book
4747

4848
[The Cargo Book](cargo/index.html) is a guide to Cargo, Rust's build tool and dependency manager.
4949

50-
### The Rustdoc Book
50+
## The Rustdoc Book
5151

5252
[The Rustdoc Book](rustdoc/index.html) describes our documentation tool, `rustdoc`.
5353

54-
### Extended Error Listing
54+
## Extended Error Listing
5555

5656
Many of Rust's errors come with error codes, and you can request extended
5757
diagnostics from the compiler on those errors. You can also [read them
5858
here](error-index.html), if you prefer to read them that way.
5959

60-
## Master Rust
60+
# Master Rust
6161

6262
Once you're quite familiar with the language, you may find these advanced
6363
resources useful.
6464

65-
### The Reference
65+
## The Reference
6666

6767
[The Reference](reference/index.html) is not a formal spec, but is more detailed and
6868
comprehensive than the book.
6969

70-
### The Rustonomicon
70+
## The Rustonomicon
7171

7272
[The Rustonomicon](nomicon/index.html) is your guidebook to the dark arts of unsafe
7373
Rust. It's also sometimes called "the 'nomicon."
7474

75-
### The Unstable Book
75+
## The Unstable Book
7676

7777
[The Unstable Book](unstable-book/index.html) has documentation for unstable features.

src/liballoc/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ path = "lib.rs"
1010
[dependencies]
1111
core = { path = "../libcore" }
1212
std_unicode = { path = "../libstd_unicode" }
13+
compiler_builtins = { path = "../rustc/compiler_builtins_shim" }
1314

1415
[dev-dependencies]
1516
rand = "0.4"

src/liballoc_jemalloc/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ alloc = { path = "../liballoc" }
1616
alloc_system = { path = "../liballoc_system" }
1717
core = { path = "../libcore" }
1818
libc = { path = "../rustc/libc_shim" }
19+
compiler_builtins = { path = "../rustc/compiler_builtins_shim" }
1920

2021
[build-dependencies]
2122
build_helper = { path = "../build_helper" }

src/liballoc_system/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ doc = false
1313
alloc = { path = "../liballoc" }
1414
core = { path = "../libcore" }
1515
libc = { path = "../rustc/libc_shim" }
16+
compiler_builtins = { path = "../rustc/compiler_builtins_shim" }
1617

1718
# See comments in the source for what this dependency is
1819
[target.'cfg(all(target_arch = "wasm32", not(target_os = "emscripten")))'.dependencies]

src/libpanic_abort/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ doc = false
1212
[dependencies]
1313
core = { path = "../libcore" }
1414
libc = { path = "../rustc/libc_shim" }
15+
compiler_builtins = { path = "../rustc/compiler_builtins_shim" }

src/libpanic_unwind/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ alloc = { path = "../liballoc" }
1414
core = { path = "../libcore" }
1515
libc = { path = "../rustc/libc_shim" }
1616
unwind = { path = "../libunwind" }
17+
compiler_builtins = { path = "../rustc/compiler_builtins_shim" }

0 commit comments

Comments
 (0)