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

Commits on Mar 9, 2017

  1. Removed RustFMT changes

    jdhorwitz committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    e2b4824 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2017

  1. Configuration menu
    Copy the full SHA
    6a2ef9a View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2017

  1. Stabilize pub(restricted)

    cramertj committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    28626ca View commit details
    Browse the repository at this point in the history
  2. fix typo in mir TerminatorKind docs

    David Renshaw committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    e9c07cf View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2017

  1. Configuration menu
    Copy the full SHA
    60c1c96 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fc04eaa View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1f43731 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2017

  1. Fix typo in ptr doc

    `sizeof` should be `size_of`
    DaseinPhaos authored Mar 20, 2017
    Configuration menu
    Copy the full SHA
    c50a6ec View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    17a26ee View commit details
    Browse the repository at this point in the history
  3. Remove the existing book

    We'll bring this back in with the next commit, as a submodule.
    steveklabnik committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    e4628fb View commit details
    Browse the repository at this point in the history
  4. Import submodule for the book.

    It's all in the external repository now.
    steveklabnik committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    f17965d View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8573a13 View commit details
    Browse the repository at this point in the history
  6. build book index

    steveklabnik committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    5f2f3d0 View commit details
    Browse the repository at this point in the history
  7. Render redirect pages.

    These pages will help people who have links to the older book.
    steveklabnik committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    422330d View commit details
    Browse the repository at this point in the history
  8. Fix up some issues.

    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.
    steveklabnik committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    c97b48f View commit details
    Browse the repository at this point in the history
  9. fix whitespace

    steveklabnik committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    966e721 View commit details
    Browse the repository at this point in the history
  10. skip nostarch directory

    This is for coordinating with our publishers; we don't ever want to test it.
    steveklabnik committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    2330459 View commit details
    Browse the repository at this point in the history
  11. Update book and reference submodules

    Some links needed adjustment to support this new scheme.
    steveklabnik committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    c0e7b16 View commit details
    Browse the repository at this point in the history
  12. Fix up various links

    The unstable book, libstd, libcore, and liballoc all needed some
    adjustment.
    steveklabnik committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    d1d9626 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    4eef581 View commit details
    Browse the repository at this point in the history
  14. fix trailing whitespace

    steveklabnik committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    96d3594 View commit details
    Browse the repository at this point in the history
  15. config.toml.example: nightlies.txt got removed

    Instead, stage0.txt got introduced.
    
    See also commit 02538d4
    est31 committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    aa83d71 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    1a00c8f View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2017

  1. Rollup merge of rust-lang#40229 - cramertj:break-to-blocks, r=nikomat…

    …sakis
    
    Implement `?` in catch expressions
    
    Builds on rust-lang#39921. Final part of rust-lang#39849.
    
    r? @nikomatsakis
    frewsxcv authored Mar 21, 2017
    Configuration menu
    Copy the full SHA
    fcc2d25 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    42cfdc1 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#40332 - steveklabnik:extract-book, r=alexcr…

    …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
    frewsxcv authored Mar 21, 2017
    Configuration menu
    Copy the full SHA
    14b5d56 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#40502 - jdhorwitz:master, r=steveklabnik

    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.
    frewsxcv authored Mar 21, 2017
    Configuration menu
    Copy the full SHA
    03235cc View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#40556 - cramertj:stabilize-pub-restricted, …

    …r=petrochenkov
    
    Stabilize pub(restricted)
    
    Fix rust-lang#32409
    frewsxcv authored Mar 21, 2017
    Configuration menu
    Copy the full SHA
    17656ab View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#40576 - dwrensha:mir-terminator-kind-doc-ty…

    …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`.
    frewsxcv authored Mar 21, 2017
    Configuration menu
    Copy the full SHA
    2532ad7 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#40667 - DaseinPhaos:patch-4, r=GuillaumeGomez

    Fix typo in `ptr` doc
    
    `sizeof` should be `size_of`
    frewsxcv authored Mar 21, 2017
    Configuration menu
    Copy the full SHA
    d0c04fb View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#40671 - GuillaumeGomez:options-urls, r=frew…

    …sxcv
    
    Add missing urls in Option enum
    
    r? @rust-lang/docs
    frewsxcv authored Mar 21, 2017
    Configuration menu
    Copy the full SHA
    bf3f77b View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#40681 - est31:nightlies_txt_was_removed, r=…

    …alexcrichton
    
    config.toml.example: nightlies.txt got removed
    
    Instead, stage0.txt got introduced.
    
    See also commit 02538d4
    frewsxcv authored Mar 21, 2017
    Configuration menu
    Copy the full SHA
    c6b2110 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#40685 - portal-chan:patch-1, r=eddyb

    Add missing associated type Item to Iterator
    frewsxcv authored Mar 21, 2017
    Configuration menu
    Copy the full SHA
    b6240e5 View commit details
    Browse the repository at this point in the history