Copy book.toml unstable book generator by gruberb · Pull Request #59747 · rust-lang/rust

gruberb · 2019-04-06T10:02:38Z

Solves #59554 and adds a book title to the unstable book.

I assume that copy_recursive will take files regardless of their type (.md or .toml).

Although I had a hard time time testing it. A second pair of eyes is definitely needed.

rust-highfive · 2019-04-06T10:02:48Z

r? @nikomatsakis

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

Centril · 2019-04-06T11:28:33Z

r? @ehuss

emilyalbini · 2019-04-06T11:31:20Z

r? @ehuss

Centril · 2019-04-06T11:33:37Z

r? @frewsxcv

Centril · 2019-04-06T11:36:49Z

r? @ehuss

ehuss · 2019-04-06T17:17:37Z

@gruberb It looks like there's something missing, all I see is a renamed variable.

gruberb · 2019-04-06T17:19:49Z

@ehuss I also moved/created a book.toml with a title in the src folder. The copy_recursive method, as far as I understood it, is taking every file in the folder and copies it to the destination folder when it's getting build.

ehuss · 2019-04-06T17:36:38Z

copy_recursive is taking every file from src/doc/unstable-book/src to build/*/md-doc/unstable-book. It is not copying all the files from src/tools/unstable-book-gen. The two markdown files there are just templates used during generation.

You should be able test this by running ./x.py doc src/tools/unstable-book-gen src/doc/unstable-book --stage=0. This will generate the unstable book into build/*/md-doc/unstable-book and then run mdbook from there to generate the docs into build/*/doc/unstable-book. The goal here is to get book.toml copied into build/*/md-doc/unstable-book.

gruberb · 2019-04-07T17:32:35Z

Ping @ehuss. I updated the PR and can now display the title.

The biggest change is changing the PATH_STR from:
pub const PATH_STR: &str = "doc/unstable-book/src";
to
pub const PATH_STR: &str = "doc/unstable-book";

In addition I added src to the sub paths.

ehuss · 2019-04-08T20:18:33Z

Thanks!
@bors r+

bors · 2019-04-08T20:18:34Z

@ehuss: 🔑 Insufficient privileges: Not in reviewers

ehuss · 2019-04-09T03:27:43Z

@Centril can you r+ and/or delegate=ehuss?

emilyalbini · 2019-04-09T10:54:37Z

@bors delegate=ehuss

bors · 2019-04-09T10:54:38Z

✌️ @ehuss can now approve this pull request

ehuss · 2019-04-09T15:53:30Z

@bors r+

bors · 2019-04-09T15:53:32Z

📌 Commit 34c1572 has been approved by ehuss

…k, r=ehuss Copy book.toml unstable book generator Solves rust-lang#59554 and adds a book title to the unstable book. I assume that [copy_recursive](https://github.com/rust-lang/rust/blob/acd8dd6a50d505057a7d7ad8d0d7a4c2bd274200/src/tools/unstable-book-gen/src/main.rs#L105) will take files regardless of their type (`.md` or `.toml`). Although I had a hard time time testing it. A second pair of eyes is definitely needed.

@ghost

Rollup of 18 pull requests Successful merges: - rust-lang#59612 (Use normal newtype_index macro for MIR dataflows) - rust-lang#59675 (Stabilize the `alloc` crate.) - rust-lang#59708 (Mark variables captured by reference as mutable correctly) - rust-lang#59735 (remove lookup_char_pos_adj) - rust-lang#59747 (Copy book.toml unstable book generator) - rust-lang#59796 (Retire `IsNotConst` naming) - rust-lang#59804 (Clean up jobserver integration) - rust-lang#59818 (Eliminate `FnBox` usages from libstd.) - rust-lang#59830 (Fix links on keyword docs.) - rust-lang#59835 (Re-export NonZero signed variant in std) - rust-lang#59852 (std: Add `{read,write}_vectored` for more types) - rust-lang#59855 (Fix attributes position in type declaration) - rust-lang#59858 (Make duplicate matcher bindings a hard error) - rust-lang#59879 (Use SecRandomCopyBytes instead of /dev/urandom on MacOS) - rust-lang#59899 (In `-Zprint-type-size` output, sort enum variants by size.) - rust-lang#59912 (MaybeUninit: remove deprecated functions) - rust-lang#59925 (Fix paste error in split_ascii_whitespace docs.) - rust-lang#59930 (Exclude some copies of old book editions from search engines) Failed merges: r? @ghost

@ghost

Rollup of 18 pull requests Successful merges: - #59612 (Use normal newtype_index macro for MIR dataflows) - #59675 (Stabilize the `alloc` crate.) - #59708 (Mark variables captured by reference as mutable correctly) - #59735 (remove lookup_char_pos_adj) - #59747 (Copy book.toml unstable book generator) - #59796 (Retire `IsNotConst` naming) - #59804 (Clean up jobserver integration) - #59818 (Eliminate `FnBox` usages from libstd.) - #59830 (Fix links on keyword docs.) - #59835 (Re-export NonZero signed variant in std) - #59852 (std: Add `{read,write}_vectored` for more types) - #59855 (Fix attributes position in type declaration) - #59858 (Make duplicate matcher bindings a hard error) - #59879 (Use SecRandomCopyBytes instead of /dev/urandom on MacOS) - #59899 (In `-Zprint-type-size` output, sort enum variants by size.) - #59912 (MaybeUninit: remove deprecated functions) - #59925 (Fix paste error in split_ascii_whitespace docs.) - #59930 (Exclude some copies of old book editions from search engines) Failed merges: r? @ghost

…k, r=ehuss Copy book.toml unstable book generator Solves rust-lang#59554 and adds a book title to the unstable book. I assume that [copy_recursive](https://github.com/rust-lang/rust/blob/acd8dd6a50d505057a7d7ad8d0d7a4c2bd274200/src/tools/unstable-book-gen/src/main.rs#L105) will take files regardless of their type (`.md` or `.toml`). Although I had a hard time time testing it. A second pair of eyes is definitely needed.

@ghost

Rollup of 16 pull requests Successful merges: - #59675 (Stabilize the `alloc` crate.) - #59708 (Mark variables captured by reference as mutable correctly) - #59735 (remove lookup_char_pos_adj) - #59747 (Copy book.toml unstable book generator) - #59796 (Retire `IsNotConst` naming) - #59804 (Clean up jobserver integration) - #59818 (Eliminate `FnBox` usages from libstd.) - #59830 (Fix links on keyword docs.) - #59835 (Re-export NonZero signed variant in std) - #59852 (std: Add `{read,write}_vectored` for more types) - #59855 (Fix attributes position in type declaration) - #59858 (Make duplicate matcher bindings a hard error) - #59899 (In `-Zprint-type-size` output, sort enum variants by size.) - #59912 (MaybeUninit: remove deprecated functions) - #59925 (Fix paste error in split_ascii_whitespace docs.) - #59930 (Exclude some copies of old book editions from search engines) Failed merges: r? @ghost

Bastian Gruber added 2 commits April 6, 2019 11:57

Add book.toml to tools/unstable, add copy_book_toml to scipt
1c3979c

Remove copy_book_toml method in favor for copy_recursive
5ddb339

rust-highfive assigned nikomatsakis Apr 6, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 6, 2019

path -> from
280277a

rust-highfive assigned frewsxcv and unassigned nikomatsakis Apr 6, 2019

rust-highfive assigned ehuss and unassigned frewsxcv Apr 6, 2019

Change root path for unstable-book
34c1572

bors 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 Apr 9, 2019

Centril mentioned this pull request Apr 12, 2019
Rollup of 17 pull requests #59921
Closed

Centril mentioned this pull request Apr 13, 2019
Rollup of 18 pull requests #59937
Closed

Centril mentioned this pull request Apr 13, 2019
Rollup of 16 pull requests #59941
Closed

Centril mentioned this pull request Apr 13, 2019
Rollup of 16 pull requests #59949
Merged

bors merged commit 34c1572 into rust-lang:masterApr 14, 2019

Uh oh!

Uh oh!

Conversation

gruberb commented Apr 6, 2019• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Apr 6, 2019

Uh oh!

Centril commented Apr 6, 2019

Uh oh!

emilyalbini commented Apr 6, 2019

Uh oh!

Centril commented Apr 6, 2019

Uh oh!

Centril commented Apr 6, 2019

Uh oh!

ehuss commented Apr 6, 2019

Uh oh!

gruberb commented Apr 6, 2019

Uh oh!

ehuss commented Apr 6, 2019

Uh oh!

gruberb commented Apr 7, 2019• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ehuss commented Apr 8, 2019

Uh oh!

bors commented Apr 8, 2019

Uh oh!

ehuss commented Apr 9, 2019

Uh oh!

emilyalbini commented Apr 9, 2019

Uh oh!

bors commented Apr 9, 2019

Uh oh!

ehuss commented Apr 9, 2019

Uh oh!

bors commented Apr 9, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

gruberb commented Apr 6, 2019•
edited
Loading

gruberb commented Apr 7, 2019•
edited
Loading