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 #72010

Merged
merged 14 commits into from
May 8, 2020
Merged

Rollup of 6 pull requests #72010

merged 14 commits into from
May 8, 2020

Commits on May 7, 2020

  1. Add hir::ConstContext

    ecstatic-morse committed May 7, 2020
    Configuration menu
    Copy the full SHA
    3f661da View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e356d5c View commit details
    Browse the repository at this point in the history
  3. Remove old util/liveness.rs module

    The liveness dataflow analysis now lives in
    `librustc_mir/dataflow/impls/liveness.rs`. The borrow-checker has an
    abstraction around of "defs" and "uses" that I've made module private. I
    would have moved it to `util/def_use.rs`, but there's a slightly
    different abstraction used for copy propagation with that name.
    ecstatic-morse committed May 7, 2020
    Configuration menu
    Copy the full SHA
    34508d8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    046848e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    cd291b8 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2020

  1. Add myself to mailmap.

    crlf0710 committed May 8, 2020
    Configuration menu
    Copy the full SHA
    4c032d4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    13c9312 View commit details
    Browse the repository at this point in the history
  3. add const-generics test

    lcnr committed May 8, 2020
    Configuration menu
    Copy the full SHA
    4fd70e4 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#71989 - ecstatic-morse:const-context-enum, …

    …r=oli-obk
    
    Use a single enum for the kind of a const context
    
    This adds a `ConstContext` enum to the `rustc_hir` crate and method that can be called via `tcx.hir()` to get the `ConstContext` for a given body owner. This arose from discussion in rust-lang#71824.
    
    r? @oli-obk
    Dylan-DPC committed May 8, 2020
    Configuration menu
    Copy the full SHA
    1e6c199 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#71993 - ecstatic-morse:cleanup-old-liveness…

    …, r=jonas-schievink
    
    Remove old `util/liveness.rs` module
    
    The liveness dataflow analysis now lives in the `dataflow` module, so this one is no longer necessary. I've copied the relevant bits of the module docs for `util::liveness` to `MaybeLiveLocals`. The example in the docs is now a `mir-dataflow` test: https://github.com/rust-lang/rust/blob/a08c47310c7d49cbdc5d7afb38408ba519967ecd/src/test/ui/mir-dataflow/liveness-ptr.rs#L6-L26
    
    The borrow-checker used the same notion of "defs" and "uses", so I've moved it into a submodule. I would have moved it to `util/def_use.rs`, since it seems generally useful, but there's already a slightly [different version](https://github.com/rust-lang/rust/blob/master/src/librustc_mir/util/def_use.rs) of the same abstraction needed for copy propagation.
    Dylan-DPC committed May 8, 2020
    Configuration menu
    Copy the full SHA
    681d747 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#71999 - crlf0710:mailmap, r=Dylan-DPC

    Add myself to mailmap.
    Dylan-DPC committed May 8, 2020
    Configuration menu
    Copy the full SHA
    8f247c1 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#72001 - mibac138:cfg-version, r=petrochenkov

    Adjust cfg(version) to lang team decision
    
    See rust-lang#64796 (comment) for details
    
    r? @petrochenkov who reviewed the original PR (rust-lang#71314)
    Dylan-DPC committed May 8, 2020
    Configuration menu
    Copy the full SHA
    5cef212 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#72007 - petrochenkov:passcheck3, r=RalfJung

    Fix some tests failing in `--pass check` mode
    
    r? @RalfJung
    Dylan-DPC committed May 8, 2020
    Configuration menu
    Copy the full SHA
    c4c6340 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#72008 - lcnr:patch-3, r=varkor

    Add const-generics test
    
    Taken from rust-lang#71973 as this apparently already compiles.
    
    r? @varkor
    Dylan-DPC committed May 8, 2020
    Configuration menu
    Copy the full SHA
    6789540 View commit details
    Browse the repository at this point in the history