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 mdbook #61948

Merged
merged 1 commit into from
Jun 21, 2019
Merged

Update mdbook #61948

merged 1 commit into from
Jun 21, 2019

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jun 19, 2019

This updates to mdbook 0.3.0. This release includes the following changes:
https://github.com/rust-lang-nursery/mdBook/blob/master/CHANGELOG.md#mdbook-030
One of the biggest changes is the update to pulldown-cmark.

This also bumps the submodules (except the nomicon which has some broken links).

reference

6 commits in f8ae436..08ae27a
2019-05-31 14:59:12 +0200 to 2019-06-17 11:24:13 -0700

book

8 commits in 62a8c6f25fbd981c80a046f3b04be9684749af3b..9aacfcc4c5b102c8cda195932addefd32fe955d2
2019-05-28 15:48:23 -0400 to 2019-06-16 21:27:26 -0400

  • Add a script to help diff rendered books
  • Update mdbook links (Update mdbook links book#1989)
  • Update for markdown changes. (Update for markdown changes. book#1984)
  • Make all mentions of crates.io consistent
  • Propagate corrections made in layout
  • Add link to Swedish translation
  • Propagate small edits made in layout
  • Remove snapshot files that have been checked with layout

rust-by-example

3 commits in d8eec1dd65470b9a68e80ac1cba8fad0daac4916..b27472962986e85c94f4183b1a6d2207660d3ed6
2019-06-08 10:15:22 -0300 to 2019-06-17 15:52:07 -0300

rustc-guide

15 commits in 3ac9cfc9c9ab2e366feebf18718112737f572352..f55e97c145cf37fd664db2e0e2f2d05df328bf4f
2019-06-02 19:36:58 -0500 to 2019-06-15 17:29:12 -0500

  • fix typos
  • Update for TyCtxt<'a, 'gcx, 'tcx> -> TyCtxt<'tcx>.
  • fix ci failures, typos, broken links
  • Some edits to address review comments
  • Notes about closure de-sugaring
  • add note about rebuilding llvm
  • Changes to config.toml require a clean
  • Fix a few typos in type inference chapter
  • Add triagebot (Add triagebot rustc-dev-guide#337)
  • Update how-to-build-and-run.md
  • Update how-to-build-and-run.md
  • Update compiler-debugging.md
  • use debug instead of debuginfo-level
  • Replaced tabs with spaces
  • correct indentation

edition-guide

4 commits in 581c6cccfaf995394ea9dcac362dc8e731c18558..f8072acde5ce29c7570d7986180bbded2d22e287
2019-05-06 12:47:44 -0700 to 2019-06-14 23:27:05 +0200

embedded-book

1 commits in f0c75b75f9c18537b78f5d17c1015247e9a49c86..ef27b517dcd0b990c888c0d7caeff52a5a115619
2019-06-03 10:49:02 +0000 to 2019-06-18 22:59:47 +0000

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 19, 2019
@ehuss
Copy link
Contributor Author

ehuss commented Jun 19, 2019

cc @mati865, one more step to excising mdbook 0.1. There's a hiccup with migrating cargo, there will need to be some more work done. I'll look at migrating the reference.

@@ -196,7 +196,7 @@ impl Step for RustbookSrc {

let vers = match self.version {
RustbookVersion::MdBook1 => "1",
RustbookVersion::MdBook2 => "2",
RustbookVersion::Latest => "3",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, I am not totally sure about the "latest" name, given that it's not literally the latest. It's probably fine.

@steveklabnik
Copy link
Member

@bors: r+ rollup

thanks so much, @ehuss !

@bors
Copy link
Contributor

bors commented Jun 20, 2019

📌 Commit 5e08a0696b33e1cb8f1eda41eb1bf21e4f1c59b4 has been approved by steveklabnik

@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 Jun 20, 2019
@bors
Copy link
Contributor

bors commented Jun 21, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout update-mdbook (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self update-mdbook --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 21, 2019
@ehuss
Copy link
Contributor Author

ehuss commented Jun 21, 2019

@bors r=steveklabnik

@bors
Copy link
Contributor

bors commented Jun 21, 2019

📌 Commit 2dafa91 has been approved by steveklabnik

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 21, 2019
@bors
Copy link
Contributor

bors commented Jun 21, 2019

⌛ Testing commit 2dafa91 with merge dbec74f...

bors added a commit that referenced this pull request Jun 21, 2019
Update mdbook

This updates to mdbook 0.3.0. This release includes the following changes:
https://github.com/rust-lang-nursery/mdBook/blob/master/CHANGELOG.md#mdbook-030
One of the biggest changes is the update to pulldown-cmark.

This also bumps the submodules (except the nomicon which has some broken links).

## reference

6 commits in f8ae436..08ae27a
2019-05-31 14:59:12 +0200 to 2019-06-17 11:24:13 -0700
- Document `underscore_const_names` (rust-lang/reference#620)
- Describe `#[repr(align(x))]` semantics on `enum`s (rust-lang/reference#619)
- Fix typo in lazy_static example. (rust-lang/reference#622)
- Rust 2015 supports Kleene ? macro operator (rust-lang/reference#617)
- Bitrig support has been removed (rust-lang/reference#615)
- Fix spell error in attributes/diagnostics.md (rust-lang/reference#614)

## book

8 commits in 62a8c6f25fbd981c80a046f3b04be9684749af3b..9aacfcc4c5b102c8cda195932addefd32fe955d2
2019-05-28 15:48:23 -0400 to 2019-06-16 21:27:26 -0400
- Add a script to help diff rendered books
- Update mdbook links (rust-lang/book#1989)
- Update for markdown changes. (rust-lang/book#1984)
- Make all mentions of crates.io consistent
- Propagate corrections made in layout
- Add link to Swedish translation
- Propagate small edits made in layout
- Remove snapshot files that have been checked with layout

## rust-by-example

3 commits in d8eec1dd65470b9a68e80ac1cba8fad0daac4916..b27472962986e85c94f4183b1a6d2207660d3ed6
2019-06-08 10:15:22 -0300 to 2019-06-17 15:52:07 -0300
- Update `macro_rules!` formatting. (rust-lang/rust-by-example#1205)
- Add Cargo comment to the `try!` macro example. (rust-lang/rust-by-example#1203)
- Fix typo (rust-lang/rust-by-example#1204)

## rustc-guide

15 commits in 3ac9cfc9c9ab2e366feebf18718112737f572352..f55e97c145cf37fd664db2e0e2f2d05df328bf4f
2019-06-02 19:36:58 -0500 to 2019-06-15 17:29:12 -0500
- fix typos
- Update for TyCtxt&lt;'a, 'gcx, 'tcx&gt; -&gt; TyCtxt&lt;'tcx&gt;.
- fix ci failures, typos, broken links
- Some edits to address review comments
- Notes about closure de-sugaring
- add note about rebuilding llvm
- Changes to config.toml require a clean
- Fix a few typos in type inference chapter
- Add triagebot (rust-lang/rustc-dev-guide#337)
- Update how-to-build-and-run.md
- Update how-to-build-and-run.md
- Update compiler-debugging.md
- use debug instead of debuginfo-level
- Replaced tabs with spaces
- correct indentation

## edition-guide

4 commits in 581c6cccfaf995394ea9dcac362dc8e731c18558..f8072acde5ce29c7570d7986180bbded2d22e287
2019-05-06 12:47:44 -0700 to 2019-06-14 23:27:05 +0200
- Small fixes (rust-lang/edition-guide#179)
- Cleanup unused NLL link (rust-lang/edition-guide#167)
- Part 2: Rust 2015 now supports ? macro rep op (rust-lang/edition-guide#163)
- Part 1: Rust 2015 now supports ? macro rep op (rust-lang/edition-guide#162)

## embedded-book

1 commits in f0c75b75f9c18537b78f5d17c1015247e9a49c86..ef27b517dcd0b990c888c0d7caeff52a5a115619
2019-06-03 10:49:02 +0000 to 2019-06-18 22:59:47 +0000
- Fix link for more strict commonmark interpretation.  (rust-embedded/book#194)
@bors
Copy link
Contributor

bors commented Jun 21, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: steveklabnik
Pushing dbec74f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 21, 2019
@bors bors merged commit 2dafa91 into rust-lang:master Jun 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

None yet

5 participants