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 9 pull requests #66917

Merged
merged 29 commits into from
Dec 1, 2019
Merged

Rollup of 9 pull requests #66917

merged 29 commits into from
Dec 1, 2019

Commits on Nov 17, 2019

  1. Configuration menu
    Copy the full SHA
    be993be View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    48a86e0 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2019

  1. Simplify if else as suggested in PR feedback

    Thomas Etter committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    16bf4f5 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2019

  1. Configuration menu
    Copy the full SHA
    1e91e4e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3277209 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8af2f22 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2019

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

Commits on Nov 26, 2019

  1. Check SetDiscriminant place

    pvdrz committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    c66ad14 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d7c09f7 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2019

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

Commits on Nov 29, 2019

  1. Configuration menu
    Copy the full SHA
    1f853d2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    59a768c View commit details
    Browse the repository at this point in the history
  3. remove get_named_span

    mark-i-m committed Nov 29, 2019
    Configuration menu
    Copy the full SHA
    05db660 View commit details
    Browse the repository at this point in the history
  4. minor fix

    mark-i-m committed Nov 29, 2019
    Configuration menu
    Copy the full SHA
    2a86b6c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f8fb24f View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2019

  1. Configuration menu
    Copy the full SHA
    52426ab View commit details
    Browse the repository at this point in the history
  2. Format liballoc with rustfmt

    dtolnay committed Nov 30, 2019
    Configuration menu
    Copy the full SHA
    1c4d453 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7f20198 View commit details
    Browse the repository at this point in the history
  4. Address review comments

    aDotInTheVoid committed Nov 30, 2019
    Configuration menu
    Copy the full SHA
    a52eb05 View commit details
    Browse the repository at this point in the history
  5. Merge match branches

    pvdrz committed Nov 30, 2019
    Configuration menu
    Copy the full SHA
    2ced9d9 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2019

  1. Rollup merge of rust-lang#66503 - thomasetter:panic-error-msg, r=josh…

    …triplett
    
    More useful test error messages on should_panic(expected=...) mismatch
    
    Fixes  rust-lang#66304
    r? @gilescope
    
    Shows both the actual as well as the expected panic value when a test with `should_panic(expected=...)` fails.
    This makes `should_panic` more consistent with `assert_eq`.
    
    I am not sure whether printing the `Any::type_id()` is useful, is there something better that we could print for non-string panic values?
    Centril committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    6110d3e View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#66662 - RalfJung:miri-test-liballoc, r=dtolnay

    Miri: run panic-catching tests in liballoc
    
    I also converted two tests from using `thread::spawn(...).join()` just for catching panics, to `catch_panic`, so that Miri can run them.
    Centril committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    cb43d82 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#66679 - mark-i-m:fix-anon-lifetime-errors, …

    …r=matthewjasper
    
    Improve lifetime errors with implicit trait object lifetimes
    
    r? @matthewjasper
    
    cc @estebank
    
    I still think the ideal solution would be to construct a `BrAnon`, but that seems like a more invasive change, and can be done later. This at least gets rid of the hack in `OutliveSuggestion` and is slightly more principled.
    Centril committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    99f9fa3 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#66726 - CAD97:miri-recursion-limit, r=RalfJung

    Use recursion_limit for const eval stack limit
    
    cc rust-lang/miri#643 @orium @RalfJung
    
    I'm really not certain how exactly to handle this change, but it looks like it's that simple.
    
    Reuse `recursion_limit` ("The maximum recursion limit for potentially infinitely recursive operations such as auto-dereference and monomorphization") which is configurable by the user for the const evaluation stack frame limit.
    
    The other option is to make `const_eval_stack_frame_limit` configurable in the same way as `recursion_limit` (but I'm not sure how to do that and it'd be a bigger change).
    
    Fixes rust-lang/miri#643.
    Centril committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    60f4212 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#66790 - christianpoveda:check-set-discrimin…

    …ant, r=oli-obk
    
    Do `min_const_fn` checks for `SetDiscriminant`s target
    
    Fixes rust-lang#66556
    
    r? @oli-obk @ecstatic-morse
    Centril committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    75fd413 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#66832 - RalfJung:const-prop-no-alloc, r=oli…

    …-obk
    
    const_prop: detect and avoid catching Miri errors that require allocation
    
    r? @wesleywiser @oli-obk
    Centril committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    d91e63b View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#66880 - aDotInTheVoid:add-E0203-long, r=Gui…

    …llaumeGomez
    
    Add long error code explanation message for E0203
    
    Addressed some of rust-lang#61137
    
    r? @GuillaumeGomez
    Centril committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    d4f5956 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#66890 - dtolnay:fmt4, r=Dylan-DPC

    Format liballoc with rustfmt
    
    Same strategy as rust-lang#66691 -- as with my previous formatting PRs, I am avoiding causing merge conflicts in other PRs by only touches those files that are not involved in any currently open PR. Files that appear in new PRs between when this PR is opened and when it makes it to the top of the bors queue will be reverted from this PR.
    
    The list of files involved in open PRs is determined by querying GitHub's GraphQL API [with this script](https://gist.github.com/dtolnay/aa9c34993dc051a4f344d1b10e4487e8).
    
    With the list of files from the script in outstanding_files, the relevant commands were:
    
    ```
    $ find src/liballoc -name '*.rs' \
        | xargs rustfmt --edition=2018 --unstable-features --skip-children
    $ rg liballoc outstanding_files | xargs git checkout --
    ```
    
    To confirm no funny business:
    
    ```
    $ git checkout $THIS_COMMIT^
    $ git show --pretty= --name-only $THIS_COMMIT \
        | xargs rustfmt --edition=2018 --unstable-features --skip-children
    $ git diff $THIS_COMMIT  # there should be no difference
    ```
    
    r? @Dylan-DPC
    Centril committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    3db3f15 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#66896 - RalfJung:queries, r=Zoxc

    pass Queries to compiler callbacks
    
    rust-lang#66791 made it impossible to access the tcx in the callbacks; this should fix that.
    
    r? @Zoxc
    Centril committed Dec 1, 2019
    Configuration menu
    Copy the full SHA
    bed4c09 View commit details
    Browse the repository at this point in the history