rustbook: fix path in toc links #26060
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @nikomatsakis (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
|
Just to confirm, can you make sure that the TRPL rustbook generated does indeed have all the links correct? |
|
For tests (and for build book) i use rustbook from Steve Klabnik repo. Latest commit in his repo not different with last changes rustbook in rust repo. (master)funkill@fennec ~/work/self/rust/rust $ diff ./src/rustbook/ ../rustbook/src/
(master)funkill@fennec ~/work/self/rust/rust $ git checkout fix_rustbook
Переключено на ветку «fix_rustbook»
(fix_rustbook)funkill@fennec ~/work/self/rust/rust $ diff ./src/rustbook/ ../rustbook/src/
diff ./src/rustbook/build.rs ../rustbook/src/build.rs
62c62
< current_page.path_to_root.join(&item.path).with_extension("html").display(),
---
> item.path_to_root.join(&item.path.with_extension("html")).display(),
(fix_rustbook)funkill@fennec ~/work/self/rust/rust $ cd ../rustbook
(master)funkill@fennec ~/work/self/rust/rustbook $ git remote show origin |grep URL
2: URL для извлечения: https://github.com/steveklabnik/rustbook
3: URL для отправки: https://github.com/steveklabnik/rustbook
(master)funkill@fennec ~/work/self/rust/rustbook $ git pull origin master
Из https://github.com/steveklabnik/rustbook
* branch master -> FETCH_HEAD
Already up-to-date.
(master)funkill@fennec ~/work/self/rust/rustbook $ cargo run -- build ../rust_book_ru
Compiling rustbook v0.3.0 (file:///home/funkill/work/self/rust/rustbook)
Running `target/debug/rustbook build ../rust_book_ru`
(master)funkill@fennec ~/work/self/rust/rustbook $ grep -m 4 -E "^<li><a [a-z\=\']* href=" ./_book/README.html
31:<li><a class='active' href='./README.html'><b>1.</b> Introduction</a>
33:<li><a href='../src/INTRODUCTION.html'><b>2.</b> Введение</a>
35:<li><a href='../src/getting-started.html'><b>3.</b> C чего начать</a>
37:<li><a href='../src/installing-rust.html'><b>3.1.</b> Установка Rust</a>
(master)funkill@fennec ~/work/self/rust/rustbook $ grep -m 4 -E "^<li><a [a-z\=\']* href=" ./_book/src/INTRODUCTION.html
31:<li><a href='./README.html'><b>1.</b> Introduction</a>
33:<li><a class='active' href='../src/INTRODUCTION.html'><b>2.</b> Введение</a>
35:<li><a href='../src/getting-started.html'><b>3.</b> C чего начать</a>
37:<li><a href='../src/installing-rust.html'><b>3.1.</b> Установка Rust</a>
(master)funkill@fennec ~/work/self/rust/rustbook $ rm -rf ./_book
(master)funkill@fennec ~/work/self/rust/rustbook $ cargo run -- build ../rust/src/doc/trpl
Running `target/debug/rustbook build ../rust/src/doc/trpl`
(master)funkill@fennec ~/work/self/rust/rustbook $ grep -m 4 -E "^<li><a [a-z\=\']* href=" ./_book/README.html
31:<li><a class='active' href='./README.html'><b>1.</b> Introduction</a>
33:<li><a href='getting-started.html'><b>2.</b> Getting Started</a>
35:<li><a href='installing-rust.html'><b>2.1.</b> Installing Rust</a>
37:<li><a href='hello-world.html'><b>2.2.</b> Hello, world!</a>
(master)funkill@fennec ~/work/self/rust/rustbook $ grep -m 4 -E "^<li><a [a-z\=\']* href=" ./_book/getting-started.html
31:<li><a href='./README.html'><b>1.</b> Introduction</a>
33:<li><a class='active' href='getting-started.html'><b>2.</b> Getting Started</a>
35:<li><a href='installing-rust.html'><b>2.1.</b> Installing Rust</a>
37:<li><a href='hello-world.html'><b>2.2.</b> Hello, world!</a>
(master)funkill@fennec ~/work/self/rust/rustbook $ cp -v ../rust/src/rustbook/* ./src/
«../rust/src/rustbook/book.rs» -> «./src/book.rs»
«../rust/src/rustbook/build.rs» -> «./src/build.rs»
«../rust/src/rustbook/css.rs» -> «./src/css.rs»
«../rust/src/rustbook/error.rs» -> «./src/error.rs»
«../rust/src/rustbook/help.rs» -> «./src/help.rs»
«../rust/src/rustbook/javascript.rs» -> «./src/javascript.rs»
«../rust/src/rustbook/main.rs» -> «./src/main.rs»
«../rust/src/rustbook/serve.rs» -> «./src/serve.rs»
«../rust/src/rustbook/subcommand.rs» -> «./src/subcommand.rs»
«../rust/src/rustbook/term.rs» -> «./src/term.rs»
«../rust/src/rustbook/test.rs» -> «./src/test.rs»
(master)funkill@fennec ~/work/self/rust/rustbook $ rm -rf ./_book
(master)funkill@fennec ~/work/self/rust/rustbook $ git status
На ветке master
Ваша ветка обновлена в соответствии с «origin/master».
Изменения, которые не в индексе для коммита:
(используйте «git add <файл>…», чтобы добавить файл в индекс)
(используйте «git checkout -- <файл>…», чтобы отменить изменения
в рабочем каталоге)
изменено: src/build.rs
нет изменений добавленных для коммита
(используйте «git add» и/или «git commit -a»)
(master)funkill@fennec ~/work/self/rust/rustbook $ git diff ./src/build.rs
diff --git a/src/build.rs b/src/build.rs
index 31c9732..5ffb9b0 100755
--- a/src/build.rs
+++ b/src/build.rs
@@ -59,7 +59,7 @@ fn write_toc(book: &Book, current_page: &BookItem, out: &mut Write) -> io::Resul
try!(writeln!(out, "<li><a {} href='{}'><b>{}</b> {}</a>",
class_string,
- item.path_to_root.join(&item.path.with_extension("html")).display(),
+ current_page.path_to_root.join(&item.path).with_extension("html").display(),
section,
item.title));
if !item.children.is_empty() {
(master)funkill@fennec ~/work/self/rust/rustbook $ cargo run -- build ../rust_book_ru
Compiling rustbook v0.3.0 (file:///home/funkill/work/self/rust/rustbook)
Running `target/debug/rustbook build ../rust_book_ru`
(master)funkill@fennec ~/work/self/rust/rustbook $ grep -m 4 -E "^<li><a [a-z\=\']* href=" ./_book/README.html
31:<li><a class='active' href='./README.html'><b>1.</b> Introduction</a>
33:<li><a href='./src/INTRODUCTION.html'><b>2.</b> Введение</a>
35:<li><a href='./src/getting-started.html'><b>3.</b> C чего начать</a>
37:<li><a href='./src/installing-rust.html'><b>3.1.</b> Установка Rust</a>
(master)funkill@fennec ~/work/self/rust/rustbook $ grep -m 4 -E "^<li><a [a-z\=\']* href=" ./_book/src/INTRODUCTION.html
31:<li><a href='../README.html'><b>1.</b> Introduction</a>
33:<li><a class='active' href='../src/INTRODUCTION.html'><b>2.</b> Введение</a>
35:<li><a href='../src/getting-started.html'><b>3.</b> C чего начать</a>
37:<li><a href='../src/installing-rust.html'><b>3.1.</b> Установка Rust</a>
(master)funkill@fennec ~/work/self/rust/rustbook $ grep -m 4 -E "^<li><a [a-z\=\']* href=" ./_book/README.html
31:<li><a class='active' href='./README.html'><b>1.</b> Introduction</a>
33:<li><a href='./getting-started.html'><b>2.</b> Getting Started</a>
35:<li><a href='./installing-rust.html'><b>2.1.</b> Installing Rust</a>
37:<li><a href='./hello-world.html'><b>2.2.</b> Hello, world!</a>
(master)funkill@fennec ~/work/self/rust/rustbook $ grep -m 4 -E "^<li><a [a-z\=\']* href=" ./_book/getting-started.html
31:<li><a href='README.html'><b>1.</b> Introduction</a>
33:<li><a class='active' href='getting-started.html'><b>2.</b> Getting Started</a>
35:<li><a href='installing-rust.html'><b>2.1.</b> Installing Rust</a>
37:<li><a href='hello-world.html'><b>2.2.</b> Hello, world!</a> |
bors
added a commit
that referenced
this pull request
Jun 8, 2015
Case: Russian translate of trpl use this structure: ```bash rust_book_ru $ tree . ├── README.md ├── src │ ├── academic-research.md ... └── SUMMARY.md ``` Links in table of content generated relative to the root dir, for example if i'm on the page `http://kgv.github.io/rust_book_ru/src/academic-research.html` link to README.html will be `http://kgv.github.io/rust_book_ru/src/README.html`, not `http://kgv.github.io/rust_book_ru/README.html`. Now we use old version of rustbook. Sorry for my english
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Case:
Russian translate of trpl use this structure:
rust_book_ru $ tree . ├── README.md ├── src │ ├── academic-research.md ... └── SUMMARY.mdLinks in table of content generated relative to the root dir, for example if i'm on the page
http://kgv.github.io/rust_book_ru/src/academic-research.htmllink to README.html will behttp://kgv.github.io/rust_book_ru/src/README.html, nothttp://kgv.github.io/rust_book_ru/README.html.Now we use old version of rustbook.
Sorry for my english