Recover doc changes lost in #4904 #4916
Conversation
|
📌 Commit f235d7b has been approved by |
|
☀️ Test successful - status-appveyor, status-travis |
There was a problem hiding this comment.
Comparing a437b2e (a44612f^) with master turned up a few more issues. I've left some comments inline, and there are also:
- 93baf1e (Import mdBook-based docs and sync #4453) brought in some a
[jobserver]reference, but didn't bring in the definition so it was an incomplete cherry-pick of cbf25a9 (Add a GNU make jobserver implementation to Cargo #4110). - We need to cherry-pick 35f13e8 ([patch] slipped to 1.21, mark 2 #4517). That PR had c9c0407, which updated a
[patch]reference in the Book's manifest docs, but the book's dependency docs still need to be updated.
| @@ -76,6 +76,8 @@ runner = ".." | |||
| # custom flags to pass to all compiler invocations that target $triple | |||
| # this value overrides build.rustflags when both are present | |||
| rustflags = ["..", ".."] | |||
| # Whether or not to enable incremental compilation | |||
| incremental = true | |||
There was a problem hiding this comment.
45cc30b added this around line 102 to the [build] block, while this commit is adding it around line 80 to the [target.$triple] block. I think we need to move it.
| @@ -28,6 +28,10 @@ system: | |||
| * `RUSTFLAGS` - A space-separated list of custom flags to pass to all compiler | |||
| invocations that Cargo performs. In contrast with `cargo rustc`, this is | |||
| useful for passing a flag to *all* compiler instances. | |||
| * `CARGO_INCREMENTAL` - If this is set to 1 then Cargo will force incremental | |||
| compilation to be enabled for the current compilation, and when set to 0 it | |||
| will force disabling it. If this env var isn't present then cargo's defaults | |||
There was a problem hiding this comment.
45cc30b had “Cargo's” instead of this commit's “cargo's”. I think we need to title-case it.
| @@ -20,6 +20,12 @@ like so: | |||
| [source.my-awesome-source] | |||
| directory = "vendor" | |||
|
|
|||
| # Git sources can optionally specify a branch/tag/rev as well | |||
There was a problem hiding this comment.
5b08b8f added this entry after “Available kinds of sources that can be specified” in the “Configuration” section around line 71. This commit adds the entry to an example in the top “Replacing sources” section. I think we need to shift this entry down.
doc/guide/dependencies: Add a 'rust' language marker This had been added to the non-book docs in 2ad45a5 (#4455), despite the fact that the book didn't actually have that marker: $ git cat-file -p 2ad45a5:src/doc/book/src/guide/dependencies.md | grep -A2 'You can now use the' You can now use the `regex` library using `extern crate` in `main.rs`. ``` This is (along with the already-landed #4916), part of recovering from #4904.
Fixes #4906.