Extract book into a submodule by steveklabnik · Pull Request #40332 · rust-lang/rust

steveklabnik · 2017-03-07T21:41:14Z

We probably don't want to land this till after the beta branches on friday, but would still ❤️ a review from @alexcrichton , since I am a rustbuild noob.

This pr:

removes the book
adds it back in as a submodule
the submodule includes both the old book and the new book
it also includes an index page explaining the difference in editions
it also includes redirect pages for the old book URLs.
so we build all that stuff too.

r? @alexcrichton

steveklabnik · 2017-03-07T22:23:52Z

I pushed two more commits; one fixes a trailing whitespace issue, the last one exempts the book from tidy. I think we don't actually want that, but for now it will let things build.

alexcrichton · 2017-03-08T00:02:27Z

This all seems pretty familiar, perhaps copied from elsewhere in this file? Could that be deduplicated?

Yeah; I wasn't sure about it. There's just enough that's different.... I bet I can make it work.

Let's at least refactor out what we can, especially these bits about version/short_hash/stamp/etc

alexcrichton · 2017-03-08T00:03:37Z

lgtm modulo one minor comment.

But yeah if you're ok holding off this may be good to wait until after the branch

Also the travis failure looks like it may need attention

steveklabnik · 2017-03-13T18:55:54Z

I've updated the book to be tidy-clean and re-enabled tidy for the book. Let's see what travis has to say...

steveklabnik · 2017-03-13T20:15:31Z

 C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 1011)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 1057)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 108)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 1086)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 1209)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 124)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 1265)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 1296)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 1314)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 1330)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 184)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 345)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 377)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 387)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 401)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 505)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 525)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 542)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 635)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 658)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 723)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 742)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 865)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 891)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 90)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 901)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 917)
C:\Users\steve\src\rust\src/doc\book\second-edition\nostarch\chapter15.md - Smart_Pointers (line 931)

well uh, okay then

(We should exclude the nostarch dir...)

steveklabnik · 2017-03-13T20:42:35Z

@alexcrichton I never know what the right way to compare paths is, please check out the latest commit there.

This now passes locally on my machine, and so should be good to go sooN!

alexcrichton · 2017-03-13T20:55:49Z

@bors: r+

bors · 2017-03-13T20:55:50Z

📌 Commit 89761c4 has been approved by alexcrichton

bors · 2017-03-14T02:20:27Z

⌛ Testing commit 89761c4 with merge 8c0fa3d...

bors · 2017-03-14T02:31:28Z

💔 Test failed - status-appveyor

steveklabnik · 2017-03-14T14:56:52Z

No idea why tidy didn't see that on my machine...

steveklabnik · 2017-03-14T15:02:40Z

@bors: r=alexcrichton

bors · 2017-03-14T15:02:41Z

📌 Commit 960eb2e has been approved by @alexcrichton

bors · 2017-03-14T15:02:51Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Fix race condition in fs::create_dir_all #39799

bors · 2017-03-14T15:02:51Z

📌 Commit 960eb2e has been approved by @alexcrichton

steveklabnik · 2017-03-14T15:03:09Z

@bors: r=alexcrichton

bors · 2017-03-14T15:03:10Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Fix race condition in fs::create_dir_all #39799

bors · 2017-03-14T15:03:11Z

📌 Commit 960eb2e has been approved by alexcrichton

steveklabnik · 2017-03-14T18:44:21Z

@bors: r-

see rust-lang/rust#40332

steveklabnik · 2017-03-15T18:38:58Z

@bors: r=alexcrichton

I had to fix up a number of links because, silly me, I forgot to run linkchecker.

I am triple checking a clean build locally but there are a lot of p=1 builds in the queue, so gonna r+ this now

bors · 2017-03-15T18:38:59Z

📌 Commit 9d2cfd4 has been approved by alexcrichton

bors · 2017-03-17T13:26:10Z

📌 Commit 7c3814f has been approved by alexcrichton

steveklabnik · 2017-03-17T13:31:18Z

@bors: r-

okay i dunno why tidy is now flipping out :(

steveklabnik · 2017-03-17T13:32:18Z

@bors: r=alexcrichton

oh my directory was dirty. I need more ☕️ . Tidy passes.

bors · 2017-03-17T13:32:19Z

📌 Commit 7c3814f has been approved by alexcrichton

bors · 2017-03-17T20:25:08Z

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

We'll bring this back in with the next commit, as a submodule.

It's all in the external repository now.

These pages will help people who have links to the older book.

Becuase I had run a `x.py doc` before doing this work, I had accidentally relied on some files existing in places that they didn't need to be.

This is for coordinating with our publishers; we don't ever want to test it.

Some links needed adjustment to support this new scheme.

The unstable book, libstd, libcore, and liballoc all needed some adjustment.

steveklabnik · 2017-03-20T15:20:24Z

@bors: r=alexcrichton

passed everything on my machine

bors · 2017-03-20T15:20:26Z

📌 Commit 96d3594 has been approved by alexcrichton

@alexcrichton

…ichton Extract book into a submodule Part of rust-lang#39588 We probably don't want to land this till after the beta branches on friday, but would still ❤️ a review from @alexcrichton , since I am a rustbuild noob. This pr: 1. removes the book 2. adds it back in as a submodule 3. the submodule includes both the old book and the new book 4. it also includes an index page explaining the difference in editions 5. it also includes redirect pages for the old book URLs. 6. so we build all that stuff too. r? @alexcrichton

Rollup of 10 pull requests - Successful merges: #40229, #40312, #40332, #40502, #40556, #40576, #40667, #40671, #40681, #40685 - Failed merges:

rust-highfive assigned alexcrichton Mar 7, 2017

steveklabnik mentioned this pull request Mar 7, 2017
Tracking issue for RFC 1828: Rust Bookshelf #39588
Closed
10 tasks

alexcrichton reviewed Mar 8, 2017
View reviewed changes

steveklabnik mentioned this pull request Mar 13, 2017
Work towards getting tidy clean rust-lang/book#536
Merged

steveklabnik force-pushed the extract-book branch from 607e28d to f80deb6Compare March 13, 2017 18:55

steveklabnik force-pushed the extract-book branch from f80deb6 to 45a365eCompare March 13, 2017 19:05

steveklabnik added a commit to rust-lang/reference that referenced this pull request Mar 15, 2017
Fix links to the book
927ffc2
see rust-lang/rust#40332

steveklabnik mentioned this pull request Mar 15, 2017
Fix links to the book rust-lang/reference#11
Merged

steveklabnik force-pushed the extract-book branch from 610075c to 9d2cfd4Compare March 15, 2017 18:37

steveklabnik added 12 commits March 20, 2017 10:10

Remove the existing book
e4628fb
We'll bring this back in with the next commit, as a submodule.

Import submodule for the book.
f17965d
It's all in the external repository now.

build both editions of the book
8573a13

build book index
5f2f3d0

Render redirect pages.
422330d
These pages will help people who have links to the older book.

Fix up some issues.
c97b48f
Becuase I had run a `x.py doc` before doing this work, I had accidentally relied on some files existing in places that they didn't need to be.

fix whitespace
966e721

skip nostarch directory
2330459
This is for coordinating with our publishers; we don't ever want to test it.

Update book and reference submodules
c0e7b16
Some links needed adjustment to support this new scheme.

Fix up various links
d1d9626
The unstable book, libstd, libcore, and liballoc all needed some adjustment.

exempt hbs from linkchecker
4eef581

fix trailing whitespace
96d3594

steveklabnik force-pushed the extract-book branch from 7c3814f to 96d3594Compare March 20, 2017 14:30

frewsxcv mentioned this pull request Mar 20, 2017
Rollup of 9 pull requests #40688
Closed

frewsxcv mentioned this pull request Mar 21, 2017
Rollup of 10 pull requests #40693
Merged

bors added a commit that referenced this pull request Mar 21, 2017
Auto merge of#40693- frewsxcv:rollup, r=frewsxcv
58c701f
Rollup of 10 pull requests - Successful merges: #40229, #40312, #40332, #40502, #40556, #40576, #40667, #40671, #40681, #40685 - Failed merges:

bors merged commit 96d3594 into rust-lang:masterMar 21, 2017

steveklabnik deleted the extract-book branch March 21, 2017 19:53

Uh oh!

Uh oh!

Conversation

steveklabnik commented Mar 7, 2017

Uh oh!

steveklabnik commented Mar 7, 2017

Uh oh!

alexcrichtonMar 8, 2017

Choose a reason for hiding this comment

Uh oh!

steveklabnikMar 8, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alexcrichtonMar 8, 2017

Choose a reason for hiding this comment

Uh oh!

alexcrichton commented Mar 8, 2017

Uh oh!

steveklabnik commented Mar 13, 2017

Uh oh!

steveklabnik commented Mar 13, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

steveklabnik commented Mar 13, 2017

Uh oh!

alexcrichton commented Mar 13, 2017

Uh oh!

bors commented Mar 13, 2017

Uh oh!

bors commented Mar 14, 2017

Uh oh!

bors commented Mar 14, 2017

Uh oh!

steveklabnik commented Mar 14, 2017

Uh oh!

steveklabnik commented Mar 14, 2017• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Mar 14, 2017

Uh oh!

bors commented Mar 14, 2017

Uh oh!

bors commented Mar 14, 2017

Uh oh!

steveklabnik commented Mar 14, 2017

Uh oh!

bors commented Mar 14, 2017

Uh oh!

bors commented Mar 14, 2017

Uh oh!

steveklabnik commented Mar 14, 2017

Uh oh!

steveklabnik commented Mar 15, 2017

Uh oh!

bors commented Mar 15, 2017

Uh oh!

bors commented Mar 17, 2017

Uh oh!

steveklabnik commented Mar 17, 2017

Uh oh!

steveklabnik commented Mar 17, 2017

Uh oh!

bors commented Mar 17, 2017

Uh oh!

bors commented Mar 17, 2017

Uh oh!

steveklabnik commented Mar 20, 2017

Uh oh!

bors commented Mar 20, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

steveklabnikMar 8, 2017•
edited
Loading

steveklabnik commented Mar 13, 2017•
edited
Loading

steveklabnik commented Mar 14, 2017•
edited
Loading