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

Update the book submodule and fix tidy #40732

Merged
merged 1 commit into from
Mar 23, 2017
Merged

Conversation

petrochenkov
Copy link
Contributor

When the book was included into https://github.com/rust-lang/rust as a submodule, tidy started failing on Windows.
rust-lang/book#549 fixed the problem, now the submodule needs to be updated.

@rust-highfive
Copy link
Collaborator

r? @GuillaumeGomez

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

@GuillaumeGomez
Copy link
Member

r? @steveklabnik

@steveklabnik
Copy link
Member

@bors: r+ rollup

thanks! There's some other good fixes in here too; some changes were merged into the book that regressed when this landed, I made the fixes in the upstream repo, and was planning on doing this myself later in the week 👍

Side note: My goal is to end up submitting these kinds of updates every week or so, rather than after every fix to the upstream repo. That way we don't end up spamming this repo with update PRs.

@bors
Copy link
Contributor

bors commented Mar 22, 2017

📌 Commit 9e772b0 has been approved by steveklabnik

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 22, 2017
Update the book submodule and fix tidy

When the book was included into https://github.com/rust-lang/rust as a submodule, tidy started failing on Windows.
rust-lang/book#549 fixed the problem, now the submodule needs to be updated.
bors added a commit that referenced this pull request Mar 22, 2017
Rollup of 13 pull requests

- Successful merges: #40509, #40523, #40548, #40578, #40619, #40689, #40690, #40692, #40704, #40722, #40723, #40725, #40732
- Failed merges:
@bors bors merged commit 9e772b0 into rust-lang:master Mar 23, 2017
@petrochenkov petrochenkov deleted the booktidy branch August 26, 2017 00:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants