Extract book into a submodule #40332
Conversation
|
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. |
| t!(t!(File::open(&version_input)).read_to_string(&mut info)); | ||
| let info = info.replace("VERSION", &build.rust_release()) | ||
| .replace("SHORT_HASH", build.rust_info.sha_short().unwrap_or("")) | ||
| .replace("STAMP", build.rust_info.sha().unwrap_or("")); |
There was a problem hiding this comment.
This all seems pretty familiar, perhaps copied from elsewhere in this file? Could that be deduplicated?
There was a problem hiding this comment.
Yeah; I wasn't sure about it. There's just enough that's different.... I bet I can make it work.
There was a problem hiding this comment.
Let's at least refactor out what we can, especially these bits about version/short_hash/stamp/etc
|
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
force-pushed
the
extract-book
branch
from
607e28d
to
f80deb6
Compare
|
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
force-pushed
the
extract-book
branch
from
f80deb6
to
45a365e
Compare
well uh, okay then (We should exclude the nostarch dir...) |
|
@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! |
|
@bors: r+ |
|
📌 Commit 89761c4 has been approved by |
|
⌛ Testing commit 89761c4 with merge 8c0fa3d... |
|
💔 Test failed - status-appveyor |
|
No idea why tidy didn't see that on my machine... |
|
@bors: r=alexcrichton |
|
📌 Commit 960eb2e has been approved by |
|
💡 This pull request was already approved, no need to approve it again.
|
|
📌 Commit 960eb2e has been approved by |
|
@bors: r=alexcrichton |
|
💡 This pull request was already approved, no need to approve it again.
|
|
📌 Commit 960eb2e has been approved by |
|
@bors: r- |
steveklabnik
force-pushed
the
extract-book
branch
from
610075c
to
9d2cfd4
Compare
|
@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 |
|
📌 Commit 9d2cfd4 has been approved by |
|
📌 Commit 7c3814f has been approved by |
|
@bors: r- okay i dunno why tidy is now flipping out :( |
|
@bors: r=alexcrichton oh my directory was dirty. I need more ☕️ . Tidy passes. |
|
📌 Commit 7c3814f has been approved by |
|
☔ 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
force-pushed
the
extract-book
branch
from
7c3814f
to
96d3594
Compare
|
@bors: r=alexcrichton passed everything on my machine |
|
📌 Commit 96d3594 has been approved by |
…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
Part of #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:
r? @alexcrichton