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 15 pull requests #48510

Merged
merged 47 commits into from
Feb 24, 2018
Merged

Rollup of 15 pull requests #48510

merged 47 commits into from
Feb 24, 2018

Commits on Feb 9, 2018

  1. Remove "static item recursion checking" in favor of relying on cycle …

    …checks in the query engine
    Zoxc committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    ae46434 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2018

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

Commits on Feb 13, 2018

  1. incr.comp.: Don't keep RefCells in on-disk-cache borrowed in order to…

    … allow for recursive invocations.
    michaelwoerister committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    335e25f View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2018

  1. Configuration menu
    Copy the full SHA
    75f72c0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    70e1f4f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f1fbf79 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    dbacf0c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d4b8475 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9e9c55f View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2018

  1. mir: Gather move at SwitchInt, Assert terminators

    Previously, "_1" was not marked as "definitely uninitialized" after a "switchInt(move _1)" terminator.
    
    Related discussion: https://internals.rust-lang.org/t/why-is-2-definitely-initialized-after-switchint-move-2/6760
    fpoli committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    fe0260f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b9fa2da View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2018

  1. save-analysis: power through bracket mis-counts

    Closes rust-lang#47981
    
    This is pretty unsatisfying since it is working around a span bug. However, I can't track down the span bug and it could be in the parser, proc macro expansion, the user macro, or Syn (or any other library that can manipulate spans). Given that user code can cause this error, I think we need to be more robust here.
    nrc committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    10fbdb8 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2018

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

Commits on Feb 19, 2018

  1. Configuration menu
    Copy the full SHA
    d5ed655 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    15ff0ad View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8ff633c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1be7f96 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    89b3ef3 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2018

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

Commits on Feb 21, 2018

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

Commits on Feb 22, 2018

  1. support unit tests with return values that implement Terminaton

    Extend `Termination` trait with a method to determine what happens
    with a unit test.
    
    This commit incorporates work by Bastian Köcher <git@kchr.de>.
    nikomatsakis committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    1eab1b1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0625d4c View commit details
    Browse the repository at this point in the history
  3. put the "unit test" logic into libtest

    Also make `std::termination` module public and rename feature.
    
    The lib feature needs a different name from the language feature.
    nikomatsakis committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    e446f70 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5f1e78f View commit details
    Browse the repository at this point in the history
  5. remove tokenstream

    nikomatsakis committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    8f35141 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2018

  1. Configuration menu
    Copy the full SHA
    067c2e3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e0ed88d View commit details
    Browse the repository at this point in the history
  3. delete this test file: it also appears as

    src/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs
    nikomatsakis committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    a0562ec View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0a5f4ae View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    068e383 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    10f7c11 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    380e388 View commit details
    Browse the repository at this point in the history
  8. update tests and reference files

    The type checker invokes the borrow checker for closures it finds, so
    removing the NLL type checker affects ordering of errors somewhat.
    nikomatsakis committed Feb 23, 2018
    Configuration menu
    Copy the full SHA
    2370b60 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    bcd9968 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2018

  1. Rollup merge of rust-lang#47987 - Zoxc:rm-recursion-checking, r=eddyb

    Remove "static item recursion checking" in favor of relying on cycle checks in the query engine
    
    Tests are changed to use the cycle check error message instead. Some duplicate tests are removed.
    
    r? @eddyb
    Manishearth committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    25ec810 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#48084 - cramertj:impl-trait-errors, r=nikom…

    …atsakis
    
    Error on nested impl Trait and path projections from impl Trait
    
    cc rust-lang#34511
    
    r? @nikomatsakis
    Manishearth committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    a79e5e2 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#48143 - nikomatsakis:termination_trait_in_t…

    …ests, r=eddyb
    
    Termination trait in tests
    
    Support the `Termination` trait in unit tests (cc rust-lang#43301)
    
    Also, a drive-by fix for rust-lang#47075.
    
    This is joint work with @bkchr.
    Manishearth committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    b52b33a View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#48185 - michaelwoerister:recursive-cache-de…

    …coding, r=nikomatsakis
    
    incr.comp.: Don't keep RefCells in on-disk-cache borrowed in order to allow for recursive invocations.
    
    Fixes rust-lang#47972.
    
    r? @nikomatsakis
    Manishearth committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    e966993 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#48206 - michaelwoerister:colors-array, r=ni…

    …komatsakis
    
    incr.comp.: Store DepNode colors in a dense array instead of a hashmap.
    
    Implements half of rust-lang#47293.
    
    r? @nikomatsakis
    Manishearth committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    111af8f View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#48232 - fpoli:master, r=pnkfelix

    mir: Gather move at SwitchInt, Assert terminators
    
    Previously, `_1` was not marked as "definitely uninitialized" after a `switchInt(move _1)` terminator.
    
    I think the same goes for the `assert` terminator.
    
    Related discussion: https://internals.rust-lang.org/t/why-is-2-definitely-initialized-after-switchint-move-2/6760
    Manishearth committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    8fdad6f View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#48246 - estebank:ice, r=nikomatsakis

    Avoid ICE in arg mistmatch error for tuple variants
    
    Fix rust-lang#47706.
    Manishearth committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    387d177 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#48258 - nrc:save-proc-nested, r=eddyb

    save-analysis: power through bracket mis-counts
    
    Closes rust-lang#47981
    
    This is pretty unsatisfying since it is working around a span bug. However, I can't track down the span bug and it could be in the parser, proc macro expansion, the user macro, or Syn (or any other library that can manipulate spans). Given that user code can cause this error, I think we need to be more robust here.
    
    r? @eddyb
    Manishearth committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    b3f85fd View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#48317 - ExpHP:unused-unsafe-is-no-fn, r=est…

    …ebank
    
    unused_unsafe: don't label irrelevant fns
    
    Fixes rust-lang#48131
    
    Diagnostic bugfix to remove an errant note.  Stops the search for an enclosing unsafe scope at the first safe fn encountered.
    
    ```rust
    pub unsafe fn outer() {
        fn inner() {
            unsafe { /* unnecessary */ }
        }
    
        inner()
    }
    ```
    
    **Before:**
    
    ```
    warning: unnecessary `unsafe` block
     --> src/main.rs:3:9
      |
    1 | pub unsafe fn outer() {
      | --------------------- because it's nested under this `unsafe` fn
    2 |     fn inner() {
    3 |         unsafe { /* unnecessary */ }
      |         ^^^^^^ unnecessary `unsafe` block
      |
      = note: #[warn(unused_unsafe)] on by default
    ```
    
    **After:**
    
    ```
    warning: unnecessary `unsafe` block
     --> src/main.rs:3:9
      |
    3 |         unsafe { /* unnecessary */ }
      |         ^^^^^^ unnecessary `unsafe` block
      |
      = note: #[warn(unused_unsafe)] on by default
    ```
    Manishearth committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    a1a1409 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#48353 - michaelwoerister:monoitem-static-de…

    …fid, r=eddyb
    
    Allow for instantiating statics from upstream crates
    
    This PR makes the infrastructure around translating statics a bit more flexible so that it can also instantiate statics from upstream crates if the need arises. This is preparatory work for a MIR-only RLIBs prototype, where the instantiation of a `static` may be deferred until a leaf crate.
    
    r? @eddyb (feel free to assign to someone else if you're busy)
    Manishearth committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    2483d84 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#48356 - estebank:unsafe-without-braces, r=n…

    …ikomatsakis
    
    When encountering invalid token after `unsafe`, mention `{`
    
    Fix rust-lang#37158.
    Manishearth committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    fc7caed View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#48402 - eddyb:y-u-no-inline, r=nikomatsakis

    rustc_data_structures: add missing #[inline].
    
    r? @nikomatsakis
    Manishearth committed Feb 24, 2018
    Configuration menu
    Copy the full SHA
    6ec5dc3 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    182f882 View commit details
    Browse the repository at this point in the history