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 6 pull requests #63395

Merged
merged 29 commits into from
Aug 9, 2019
Merged

Rollup of 6 pull requests #63395

merged 29 commits into from
Aug 9, 2019

Commits on Aug 5, 2019

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

Commits on Aug 8, 2019

  1. Configuration menu
    Copy the full SHA
    b9978e9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b2af718 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    58c231d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e82b053 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9cea446 View commit details
    Browse the repository at this point in the history
  6. fix typo in .gitignore

    Co-Authored-By: Vadim Petrochenkov <[email protected]>
    RalfJung and petrochenkov authored Aug 8, 2019
    Configuration menu
    Copy the full SHA
    fcb186d View commit details
    Browse the repository at this point in the history
  7. reduce visibility

    matklad committed Aug 8, 2019
    Configuration menu
    Copy the full SHA
    06701a8 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    c4a654d View commit details
    Browse the repository at this point in the history
  9. simplify a match

    RalfJung committed Aug 8, 2019
    Configuration menu
    Copy the full SHA
    ffb5f18 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    78b6580 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    946bed8 View commit details
    Browse the repository at this point in the history
  12. more comments

    RalfJung committed Aug 8, 2019
    Configuration menu
    Copy the full SHA
    2d49118 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    295f894 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    ceda774 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    05aa983 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    03de7fd View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    82b3b82 View commit details
    Browse the repository at this point in the history
  18. update miri

    RalfJung committed Aug 8, 2019
    Configuration menu
    Copy the full SHA
    e6be1d7 View commit details
    Browse the repository at this point in the history
  19. tweak ignores

    RalfJung committed Aug 8, 2019
    Configuration menu
    Copy the full SHA
    4bde056 View commit details
    Browse the repository at this point in the history
  20. more alphabetical

    RalfJung committed Aug 8, 2019
    Configuration menu
    Copy the full SHA
    798767c View commit details
    Browse the repository at this point in the history
  21. remove confusing remark

    RalfJung committed Aug 8, 2019
    Configuration menu
    Copy the full SHA
    fa58c27 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    48fbf48 View commit details
    Browse the repository at this point in the history
  23. Rollup merge of rust-lang#63162 - RalfJung:miri-xargo, r=alexcrichton

    Miri tests: use xargo to build separate libstd
    
    This uses `cargo miri setup` to prepare the libstd that is used for testing Miri, instead of adjusting the entire bootstrap process to make sure the libstd that already gets built is fit for Miri.
    
    The issue with our current approach is that with `test-miri = true`, libstd and the test suite get built with `--cfg miri`, which e.g. means hashbrown uses no SIMD, and not all things are tested. Such global side-effects seem like footguns waiting to go off.
    
    On the other hand, the new approach means we install xargo as a side-effect of doing `./x.py test src/tools/miri`, which might be surprising, and we also both have to build xargo and another libstd which costs some extra time. Not sure if the tools builders have enough time budget for that. Maybe there is a way to cache xargo?
    
    We have to first first land rust-lang/miri#870 in Miri and then update this PR to include that change (also to get CI to test Miri before bors), but I wanted to get the review started here.
    
    Cc @oli-obk (for Miri) @alexcrichton (for CI) @Mark-Simulacrum (for bootstrap)
    
    Fixes rust-lang#61833, fixes rust-lang#63219
    Centril authored Aug 8, 2019
    Configuration menu
    Copy the full SHA
    fea43aa View commit details
    Browse the repository at this point in the history
  24. Rollup merge of rust-lang#63289 - kornelski:missingcrate, r=zackmdavis

    Don't recommend `extern crate` syntax
    
    `extern crate` syntax is not a good recommendation any more, so I've changed it to just print a suggested crate name.
    Centril authored Aug 8, 2019
    Configuration menu
    Copy the full SHA
    74b22c9 View commit details
    Browse the repository at this point in the history
  25. Rollup merge of rust-lang#63373 - RalfJung:gitignore, r=alexcrichton

    gitignore: add comment explaining policy
    
    Based on rust-lang#63307 (comment), I added a comment what I think should be gitignored and what not. This is just a proposal, obviously.  Also see rust-lang#53768 for some more discussion.
    
    The summary is that if there are junk files that you create locally and are fine leaving around (such as `mir_dump`), git has the option for you to add them to `.git/info/exclude`. Others might prefer to keep their working dir clean of those same junk files, so we shouldn't just ignore them for everyone.
    
    I then also cleaned up a few more things, but there were many things that I had no idea where they came from so I didn't touch them.
    Centril authored Aug 8, 2019
    Configuration menu
    Copy the full SHA
    82e9762 View commit details
    Browse the repository at this point in the history
  26. Rollup merge of rust-lang#63374 - RalfJung:pin-packed, r=cramertj

    move of packed fields might or might not occur when they actually are sufficiently aligned
    
    See taiki-e/pin-project#34, where it was pointed out that we actually don't move fields of 1-aligned types when dropping a packed struct -- but e.g. in a `packed(2)` struct, we don't do something similar for 2-aligned types. The code for that is [here](https://github.com/rust-lang/rust/blob/db7c773a6be2f050d1d1504763819ea3916f5428/src/librustc_mir/util/alignment.rs#L7).
    Centril authored Aug 8, 2019
    Configuration menu
    Copy the full SHA
    432b55e View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    c9dd930 View commit details
    Browse the repository at this point in the history
  28. Rollup merge of rust-lang#63387 - Centril:async-block-control-flow-te…

    …sts, r=cramertj
    
    Test interaction between `async { ... }` and `?`, `return`, and `break`
    
    Per the second checkbox in rust-lang#62121 (comment), test that `async { .. }` blocks:
    1. do not allow `break` expressions.
    2. get targeted by `return` and not the parent function.
    3. get targeted by `?` and not the parent function.
    
    Works towards resolving blockers in rust-lang#63209.
    
    r? @cramertj
    Centril authored Aug 8, 2019
    Configuration menu
    Copy the full SHA
    87fb0ad View commit details
    Browse the repository at this point in the history