Start shipping the Cargo book #45692

steveklabnik · 2017-11-01T19:25:49Z

Fixes #44910
Fixes #39588

See both of those bugs for more details.

rust-highfive · 2017-11-01T19:26:01Z

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

alexcrichton

Looks great! Just one minor nit but otherwise r=me

alexcrichton · 2017-11-01T22:01:09Z

src/bootstrap/doc.rs

+        run.builder.ensure(CargoBook {
+            target: run.target,
+            name: INTERNER.intern_str("cargo"),
+            src: INTERNER.intern_path(PathBuf::from("src/tools/cargo/src/doc/book")),


I think this and the name field above are best left as local variables in run perhaps because I don't think they're inputs so much as calculated.

ah makes sense, I did a bit TOO much cargo culting.

I'll update this after we decide what the name should be, and then

behnam · 2017-11-02T04:08:15Z

src/doc/index.md

@@ -28,6 +28,7 @@ Rust provides a number of book-length sets of documentation, collectively
 nicknamed 'The Rust Bookshelf.'

 * [The Rust Programming Language][book] teaches you how to program in Rust.
+* [The Cargo Book][cargo-book] is a guide to Cargo, Rust's build tool and dependency manager.


We're calling it "The Cargo Manual" in the cargo repo. Should we update that to say "The Cargo Book"?

I'm okay with either, but the rest are almost all called "Book". I'll defer to @rust-lang/cargo here

I'm fine with "The Cargo Book", it jives better with me with "bookshelf"

Cool! Let's go with what you have here and I'll submit a PR for cargo to update the title there.

PR to update cargo: rust-lang/cargo#4695

steveklabnik · 2017-11-02T20:46:51Z

@bors: r=alexcrichton

bors · 2017-11-02T20:46:52Z

📌 Commit ac90301 has been approved by alexcrichton

bors · 2017-11-03T05:50:18Z

⌛ Testing commit ac90301c48fb4e1d1b05ac5b4be62be768b52ae5 with merge af64ce8e3be13f3bc1bed4021c25f1a4df74fc7d...

bors · 2017-11-03T07:34:07Z

💔 Test failed - status-travis

kennytm · 2017-11-03T07:38:43Z

x86_64-gnu-distcheck failed, broken links.

[01:39:55] cargo/print.html:97: broken link - cargo/getting-started.html
[01:39:55] cargo/print.html:790: broken link - cargo/config.html
[01:39:55] cargo/print.html:2671: broken link fragment `#the-dependencies-section` pointing to `cargo/reference/manifest.html`
[01:39:55] cargo/faq.html:144: broken link fragment `#the-dependencies-section` pointing to `cargo/reference/manifest.html`
[01:39:55] cargo/reference/specifying-dependencies.html:372: broken link - cargo/config.html
[01:39:55] cargo/index.html:96: broken link - cargo/getting-started.html

shepmaster · 2017-11-10T15:05:27Z

Triage ping @steveklabnik — we haven't heard from you in a week and this PR has some test failures that need to be addressed!

steveklabnik · 2017-11-10T16:06:01Z

Whoops, thanks. Will look into this soon.

Fix broken links in cargo book Needed to address failures in rust-lang/rust#45692

behnam · 2017-11-11T05:22:09Z

I checked these files (cargo/print.html and cargo/faq.html, at least) on the cargo repo, under target/doc/book/ and all the links look fine when built. Not sure what's different in the rust build that could cause this. (Haven't tried building this PR on machine yet, because of some build issues.)

behnam · 2017-11-11T05:23:02Z

Oh, I just saw that you fixed some of the links, @steveklabnik! Thanks!

steveklabnik · 2017-11-11T14:06:38Z

@alexcrichton are we free to just update the cargo repo whenever? We'd need to do that to land this PR, I thought it was generally updated once a cycle. I could be wrong.

Mark-Simulacrum · 2017-11-11T14:08:48Z

We're free to update the Cargo submodule whenever, yes. We try to do it at least once a cycle, but generally it happens about 3-5 times based on bugfixes landing.

bors · 2017-11-11T22:59:25Z

⌛ Testing commit 8f0f3b131105b0723d4428b36118f4f9d32f91bf with merge 4ef9cb0494c4267c6f202d2b1a3832c00bdff5b5...

bors · 2017-11-12T00:26:18Z

💔 Test failed - status-travis

kennytm · 2017-11-12T07:55:06Z

FreeBSD, could not compile cargo because libc is updated. (Note that this will also affect at least NetBSD)

[01:20:28] �[m�[m�[32m�[1m   Compiling�[m cargo v0.24.0 (file:///checkout/src/tools/cargo)
[01:20:30] �[1m�[31merror[E0308]�(B�[m�[1m: mismatched types�(B�[m
[01:20:30]    �(B�[m�[1m�[34m--> �(B�[m/checkout/src/tools/cargo/src/cargo/core/shell.rs:299:49�(B�[m
[01:20:30]     �(B�[m�[1m�[34m|�(B�[m
[01:20:30] �[1m�[34m299�(B�[m �(B�[m�[1m�[34m| �(B�[m            if libc::ioctl(libc::STDERR_FILENO, libc::TIOCGWINSZ, &mut winsize) < 0 {�(B�[m
[01:20:30]     �(B�[m�[1m�[34m| �(B�[m                                                �(B�[m�[1m�[31m^^^^^^^^^^^^^^^^�(B�[m �(B�[m�[1m�[31mexpected u64, found u32�(B�[m
[01:20:30] 
[01:20:34] �[1m�[31merror�(B�[m�[1m: aborting due to previous error�(B�[m
[01:20:34] 
[01:20:34] �[m�[m�[31m�[1merror:�[m Could not compile `cargo`.
[01:20:34] 
[01:20:34] To learn more, run the command again with --verbose.
[01:20:34]

steveklabnik · 2017-11-12T08:09:10Z

I... have no idea what to do here, then.

kennytm · 2017-11-12T09:17:52Z

@steveklabnik Cargo needs to modify src/cargo/core/shell.rs to make it portable across unixes. Maybe just adding an as cast (or .into() if possible) is enough. After that, we update the sub module here again.

alexcrichton · 2017-11-12T10:26:42Z

I've opened rust-lang/cargo#4713 to hopefully fix this.

kennytm · 2017-11-12T19:23:56Z

rust-lang/cargo#4713 has been merged, the cargo submodule can be updated again. @steveklabnik

bors · 2017-11-13T04:19:24Z

☔ The latest upstream changes (presumably #45949) made this pull request unmergeable. Please resolve the merge conflicts.

steveklabnik · 2017-11-13T13:03:31Z

Should be resolved!

Mark-Simulacrum · 2017-11-13T13:49:56Z

I feel like this shouldn't need to update Cargo -- perhaps that's accidental / needs a rebase? I think current Cargo master is in src/tools/cargo (or at least recent enough for this repo).

Fixes rust-lang#44910 Fixes rust-lang#39588 See both of those bugs for more details.

steveklabnik · 2017-11-14T11:52:27Z

I had updated it because I needed to update before; I guess given the conflict, it's probably not needed. I've been travelling and so I haven't been paying as close attention to the queue as usual.

I've removed that bit and rebased, let's see what Travis says.

steveklabnik · 2017-11-15T18:46:33Z

@bors: r=alexcrichton

looks like this is passing!

bors · 2017-11-15T18:46:33Z

📌 Commit 3b32a3a has been approved by alexcrichton

bors · 2017-11-16T01:17:05Z

⌛ Testing commit 3b32a3a with merge 42ea30c...

Start shipping the Cargo book Fixes #44910 Fixes #39588 See both of those bugs for more details.

bors · 2017-11-16T03:49:08Z

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 42ea30c to master...

behnam · 2017-11-22T21:19:48Z

For some reason the book is not correctly built on auto-deploy. I filed a new issue for it: #46195

rust-highfive assigned alexcrichton Nov 1, 2017

steveklabnik added the relnotes Marks issues that should be documented in the release notes of the next release. label Nov 1, 2017

kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 1, 2017

alexcrichton reviewed Nov 1, 2017

View reviewed changes

behnam reviewed Nov 2, 2017

View reviewed changes

behnam mentioned this pull request Nov 2, 2017

Redirect doc.crates.io to doc.rust-lang.org/cargo rust-lang/cargo#4694

Closed

kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 2, 2017

behnam approved these changes Nov 2, 2017

View reviewed changes

steveklabnik force-pushed the ship-cargo-book branch from 4a7f3e6 to ac90301 Compare November 2, 2017 20:46

kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 2, 2017

kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 3, 2017

steveklabnik mentioned this pull request Nov 10, 2017

Fix broken links in cargo book rust-lang/cargo#4710

Merged

bors added a commit to rust-lang/cargo that referenced this pull request Nov 11, 2017

Auto merge of #4710 - steveklabnik:fix-broken-links, r=Mark-Simulacrum

b8e0b8f

Fix broken links in cargo book Needed to address failures in rust-lang/rust#45692

steveklabnik force-pushed the ship-cargo-book branch from 3ce57d2 to 8f0f3b1 Compare November 11, 2017 15:01

kennytm mentioned this pull request Nov 12, 2017

Update Cargo submodule #45813

Closed

kennytm mentioned this pull request Nov 12, 2017

Fix compilation on more platforms rust-lang/cargo#4713

Merged

steveklabnik force-pushed the ship-cargo-book branch from 8f0f3b1 to 184077d Compare November 13, 2017 13:03

steveklabnik added 2 commits November 14, 2017 06:51

Start shipping the Cargo book

623886f

Fixes rust-lang#44910 Fixes rust-lang#39588 See both of those bugs for more details.

link the cargo book into the bookshelf

3b32a3a

steveklabnik force-pushed the ship-cargo-book branch from 184077d to 3b32a3a Compare November 14, 2017 11:52

kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 14, 2017

kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 15, 2017

bors added a commit that referenced this pull request Nov 16, 2017

Auto merge of #45692 - steveklabnik:ship-cargo-book, r=alexcrichton

42ea30c

Start shipping the Cargo book Fixes #44910 Fixes #39588 See both of those bugs for more details.

bors merged commit 3b32a3a into rust-lang:master Nov 16, 2017

behnam mentioned this pull request Nov 22, 2017

target/doc/cargo is almost empty #46195

Closed

Start shipping the Cargo book #45692

Start shipping the Cargo book #45692

Conversation

steveklabnik commented Nov 1, 2017

rust-highfive commented Nov 1, 2017

alexcrichton left a comment

Choose a reason for hiding this comment

alexcrichton Nov 1, 2017

Choose a reason for hiding this comment

steveklabnik Nov 2, 2017

Choose a reason for hiding this comment

behnam Nov 2, 2017

Choose a reason for hiding this comment

steveklabnik Nov 2, 2017

Choose a reason for hiding this comment

alexcrichton Nov 2, 2017

Choose a reason for hiding this comment

behnam Nov 2, 2017

Choose a reason for hiding this comment

behnam Nov 2, 2017

Choose a reason for hiding this comment

steveklabnik commented Nov 2, 2017

bors commented Nov 2, 2017

bors commented Nov 3, 2017

bors commented Nov 3, 2017

kennytm commented Nov 3, 2017

shepmaster commented Nov 10, 2017

steveklabnik commented Nov 10, 2017

behnam commented Nov 11, 2017

behnam commented Nov 11, 2017

steveklabnik commented Nov 11, 2017

Mark-Simulacrum commented Nov 11, 2017

bors commented Nov 11, 2017

bors commented Nov 12, 2017

kennytm commented Nov 12, 2017 • edited Loading

steveklabnik commented Nov 12, 2017

kennytm commented Nov 12, 2017

alexcrichton commented Nov 12, 2017

kennytm commented Nov 12, 2017

bors commented Nov 13, 2017

steveklabnik commented Nov 13, 2017

Mark-Simulacrum commented Nov 13, 2017

steveklabnik commented Nov 14, 2017

steveklabnik commented Nov 15, 2017

bors commented Nov 15, 2017

bors commented Nov 16, 2017

bors commented Nov 16, 2017

behnam commented Nov 22, 2017

kennytm commented Nov 12, 2017 •

edited

Loading