-
Notifications
You must be signed in to change notification settings - Fork 13.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update book #47753
Update book #47753
Conversation
(rust_highfive has picked a reviewer for you, use r? to override) |
in terms of r+, r=me whenever this is good to go! I imagine though @rust-lang/docs may wish to help out with the investigation |
I can confirm the reference rendering strangely. There's an open PR on the reference that might help with this; should we merge that first and update it here? |
You'll probably want to make sure each document's Let me know if there's anything we can do from |
a9268e3
to
33b32f0
Compare
This will fail until rust-lang/mdBook#585 is in an mdbook release. |
33b32f0
to
d319ba2
Compare
this should be good to go now 🎊 |
Looks like Travis may be failing? |
Hm. very odd.
not super helpful... |
Lol. We're using /// Prints a "backtrace" of some `Error`.
pub fn log_backtrace(e: &Error) {
error!("Error: {}", e);
for cause in e.iter().skip(1) {
error!("\tCaused By: {}", cause);
}
} |
@Michael-F-Bryan yeah, sorry, I typed that in haste; this behavior is totally reasonable! I've pushed a commit that uses this, let's see what it says (the build succeeds for me locally) |
7fe8313
to
dd32a11
Compare
i was able to reproduce locally, and this is what I have:
this make sense as to why it's only the reference that fails. note that i wonder if this is an mdbook bug, not respecting the path when passed in |
Yes, this is the answer, I believe. The reference has |
Before, when someone like the Reference set their extra css as "theme/reference.css" in their book.toml, this path would be treated as relative to the invocation of mdbook, and not respect the input path. This PR modifies these relative paths to do so. Fixes the build of rust-lang/rust#47753 which blocks updating rustc to mdbook 0.1
dd32a11
to
84f2111
Compare
confirmed the fix locally, but pushed a commit up here to check on the builders too we'll need an mdbook release in order to ship this |
well, uh looks like that's another bug: https://travis-ci.org/rust-lang/rust/builds/334450214#L2554 |
okay! I'm going to wait until the release ships, and then rebase this to be more reasonable. |
Why is it invalid? In that we don't accept MPL based code? I was pretty sure we had some already... and it would be kinda weird to reject Mozilla's license, heh. |
@steveklabnik it would be invalid if these packages were used by the standard library since it should be strictly MIT/Apache2. As these are only used for generating the book, you can add exceptions to tidy by editing https://github.com/rust-lang/rust/blob/master/src/tools/tidy/src/deps.rs |
new commit pushed, that look correct? :) |
@bors r=alexcrichton |
📌 Commit abb162c has been approved by |
…chton Update book This PR does two things: 1. update the book to include rust-lang/book#1088 2. update to mdbook 0.1 Both of these things are big changes, so I want to land them now, well before the next branch, so we can kick the tires. ------------------------------ Locally, I'm seeing some weirdness around the reference and this: ![image](https://user-images.githubusercontent.com/27786/35411917-8dcbb31a-01e8-11e8-8c30-0bd280d93b9d.png) Putting this PR up so others can try and build and see if it reproduces for them.
…chton Update book This PR does two things: 1. update the book to include rust-lang/book#1088 2. update to mdbook 0.1 Both of these things are big changes, so I want to land them now, well before the next branch, so we can kick the tires. ------------------------------ Locally, I'm seeing some weirdness around the reference and this: ![image](https://user-images.githubusercontent.com/27786/35411917-8dcbb31a-01e8-11e8-8c30-0bd280d93b9d.png) Putting this PR up so others can try and build and see if it reproduces for them.
☔ The latest upstream changes (presumably #47991) made this pull request unmergeable. Please resolve the merge conflicts. |
Includes rust-lang/book#1088 and rust-lang/book@62210e3
and improve printing of errors
abb162c
to
983cc00
Compare
@bors r=alexcrichton |
📌 Commit 983cc00 has been approved by |
…chton Update book This PR does two things: 1. update the book to include rust-lang/book#1088 2. update to mdbook 0.1 Both of these things are big changes, so I want to land them now, well before the next branch, so we can kick the tires. ------------------------------ Locally, I'm seeing some weirdness around the reference and this: ![image](https://user-images.githubusercontent.com/27786/35411917-8dcbb31a-01e8-11e8-8c30-0bd280d93b9d.png) Putting this PR up so others can try and build and see if it reproduces for them.
* Handle input path with regards to custom css Before, when someone like the Reference set their extra css as "theme/reference.css" in their book.toml, this path would be treated as relative to the invocation of mdbook, and not respect the input path. This PR modifies these relative paths to do so. Fixes the build of rust-lang/rust#47753 which blocks updating rustc to mdbook 0.1 * don't use file-name the style name is theme/reference.css, this results in a Err(StripPrefixError(())), which means that we push only the file_name, losing the theme bit
This PR does two things:
Both of these things are big changes, so I want to land them now, well before the next branch, so we can kick the tires.
Locally, I'm seeing some weirdness around the reference and this:
Putting this PR up so others can try and build and see if it reproduces for them.