Skip to content
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

Copy book.toml unstable book generator #59747

Merged
merged 4 commits into from
Apr 14, 2019
Merged

Copy book.toml unstable book generator #59747

merged 4 commits into from
Apr 14, 2019

Conversation

gruberb
Copy link
Contributor

@gruberb gruberb commented Apr 6, 2019

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
Copy link
Collaborator

r? @nikomatsakis

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

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

Centril commented Apr 6, 2019

r? @ehuss

1 similar comment
@pietroalbini
Copy link
Member

r? @ehuss

@Centril
Copy link
Contributor

Centril commented Apr 6, 2019

r? @frewsxcv

@Centril
Copy link
Contributor

Centril commented Apr 6, 2019

r? @ehuss

@rust-highfive rust-highfive assigned ehuss and unassigned frewsxcv Apr 6, 2019
@ehuss
Copy link
Contributor

ehuss commented Apr 6, 2019

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

@gruberb
Copy link
Contributor Author

gruberb commented Apr 6, 2019

@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
Copy link
Contributor

ehuss commented Apr 6, 2019

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
Copy link
Contributor Author

gruberb commented Apr 7, 2019

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.

Screenshot 2019-04-07 at 19 30 40

@ehuss
Copy link
Contributor

ehuss commented Apr 8, 2019

Thanks!
@bors r+

@bors
Copy link
Contributor

bors commented Apr 8, 2019

@ehuss: 🔑 Insufficient privileges: Not in reviewers

@ehuss
Copy link
Contributor

ehuss commented Apr 9, 2019

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

@pietroalbini
Copy link
Member

@bors delegate=ehuss

@bors
Copy link
Contributor

bors commented Apr 9, 2019

✌️ @ehuss can now approve this pull request

@ehuss
Copy link
Contributor

ehuss commented Apr 9, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Apr 9, 2019

📌 Commit 34c1572 has been approved by ehuss

@bors 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 added a commit to Centril/rust that referenced this pull request Apr 12, 2019
…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.
Centril added a commit to Centril/rust that referenced this pull request Apr 13, 2019
…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.
Centril added a commit to Centril/rust that referenced this pull request Apr 13, 2019
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
bors added a commit that referenced this pull request Apr 13, 2019
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
Centril added a commit to Centril/rust that referenced this pull request Apr 13, 2019
…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.
Centril added a commit to Centril/rust that referenced this pull request Apr 13, 2019
…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.
bors added a commit that referenced this pull request Apr 13, 2019
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
@bors bors merged commit 34c1572 into rust-lang:master Apr 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants