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

Rollup of 10 pull requests #40693

Merged
merged 33 commits into from
Mar 21, 2017
Merged

Rollup of 10 pull requests #40693

merged 33 commits into from
Mar 21, 2017

Conversation

jdhorwitz and others added 30 commits March 9, 2017 18:17
`sizeof` should be `size_of`
We'll bring this back in with the next commit, as a submodule.
It's all in the external repository now.
These pages will help people who have links to the older book.
Becuase I had run a `x.py doc` before doing this work, I had
accidentally relied on some files existing in places that they didn't
need to be.
This is for coordinating with our publishers; we don't ever want to test it.
Some links needed adjustment to support this new scheme.
The unstable book, libstd, libcore, and liballoc all needed some
adjustment.
Instead, stage0.txt got introduced.

See also commit 02538d4
…sakis

Implement `?` in catch expressions

Builds on rust-lang#39921. Final part of rust-lang#39849.

r? @nikomatsakis
…ichton

Extract book into a submodule

Part of rust-lang#39588

We probably don't want to land this till after the beta branches on friday, but would still ❤️ a review from @alexcrichton , since I am a rustbuild noob.

This pr:

1. removes the book
2. adds it back in as a submodule
3. the submodule includes both the old book and the new book
4. it also includes an index page explaining the difference in editions
5. it also includes redirect pages for the old book URLs.
6. so we build all that stuff too.

r? @alexcrichton
clean up visuals on error index rust-lang#40425

r? @steveklabnik

Knocking these down to a smaller header made it look quite nice in my opinion.
…po, r=nikomatsakis

fix innacuracy in mir TerminatorKind::SwitchInt docs

Each index of `values` corresponds to an index of `targets`, and `targets` additionally has a "default case" element at its end, so `targets.len() == values.len() + 1`, not the other way around. For example, [here](https://github.com/rust-lang/rust/blob/0aeb9c12979e6da753701a798d04105b6b1a8c28/src/librustc/mir/mod.rs#L549-L550) is a concrete instance of `SwitchInt` being constructed with `targets.len() == 2` and `values.len() == 1`.
Fix typo in `ptr` doc

`sizeof` should be `size_of`
…sxcv

Add missing urls in Option enum

r? @rust-lang/docs
…alexcrichton

config.toml.example: nightlies.txt got removed

Instead, stage0.txt got introduced.

See also commit 02538d4
Add missing associated type Item to Iterator
@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (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. Due to 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.

@frewsxcv
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Mar 21, 2017

📌 Commit b6240e5 has been approved by frewsxcv

@bors
Copy link
Contributor

bors commented Mar 21, 2017

⌛ Testing commit b6240e5 with merge b2c9c84...

@alexcrichton
Copy link
Member

@bors: retry

I think we just hit a bug in travis... The last build was never flagged as finished.

@bors
Copy link
Contributor

bors commented Mar 21, 2017

⌛ Testing commit b6240e5 with merge bd1e0bf...

@bors
Copy link
Contributor

bors commented Mar 21, 2017

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member

alexcrichton commented Mar 21, 2017

@bors: retry

@bors
Copy link
Contributor

bors commented Mar 21, 2017

⌛ Testing commit b6240e5 with merge 58c701f...

bors added a commit that referenced this pull request Mar 21, 2017
Rollup of 10 pull requests

- Successful merges: #40229, #40312, #40332, #40502, #40556, #40576, #40667, #40671, #40681, #40685
- Failed merges:
@bors
Copy link
Contributor

bors commented Mar 21, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: frewsxcv
Pushing 58c701f to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.