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

Merged
merged 31 commits into from
Oct 3, 2018
Merged

Rollup of 10 pull requests #54767

merged 31 commits into from
Oct 3, 2018

Commits on Sep 22, 2018

  1. Allow both explicit and elided lifetimes in the same impl header

    (While still prohibiting explicit and in-band in the same header.)
    scottmcm committed Sep 22, 2018
    Configuration menu
    Copy the full SHA
    003c4ff View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2018

  1. Update Cargo's submodule

    Bring in a few updates and fixes, mostly a standard update.
    alexcrichton committed Sep 28, 2018
    Configuration menu
    Copy the full SHA
    d99e7c2 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2018

  1. Configuration menu
    Copy the full SHA
    0a3bd9b View commit details
    Browse the repository at this point in the history
  2. UI test updates

    scottmcm committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    8d6bee3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d4840da View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1b22bef View commit details
    Browse the repository at this point in the history
  5. Re-export getopts so custom drivers can reference it.

    Otherwise, custom drivers will have to use their own copy of `getopts`, which
    won't match the types used in `CompilerCalls`.
    DiamondLovesYou committed Sep 30, 2018
    Configuration menu
    Copy the full SHA
    0b76a97 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1397836 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    4cbfc93 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2018

  1. Configuration menu
    Copy the full SHA
    b871293 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3ced475 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7662523 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    526ca7c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6152144 View commit details
    Browse the repository at this point in the history
  6. Add crate:: to trait suggestions in Rust 2018.

    In the 2018 edition, when suggesting traits to import that implement a
    given method that is being invoked, suggestions will now include the
    `crate::` prefix if the suggested trait is local to the current crate.
    davidtwco committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    9e2d6e1 View commit details
    Browse the repository at this point in the history
  7. Move prelude crate names into Session.

    Avoid hardcoding and special-casing the `std` crate name in the item
    path logic by moving the prelude crate name logic into the `Session`
    type so it can be reused in the item path logic and resolve module.
    davidtwco committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    4cbd397 View commit details
    Browse the repository at this point in the history
  8. Attempt to resolve linking issues.

    This commit takes a different approach to add the `crate::` prefix to
    item paths than previous commits. Previously, recursion was stopped
    after a prelude crate name was pushed to the path. It is theorized that
    this was the cause of the linking issues since the same path logic is
    used for symbol names and that not recursing meant that details were
    being missed that affect symbol names. As of this commit, instead of
    ceasing recursion, a flag is passed through to any subsequent recursive
    calls so that the same effect can be achieved by checking that flag.
    davidtwco committed Oct 1, 2018
    Configuration menu
    Copy the full SHA
    02357e4 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2018

  1. Consolidate pattern check errors

    we are consolidating `cannot bind by-move and by-ref in the same
    pattern` message present on the different lines into single diagnostic
    message.
    
    To do this, we are first gathering those spans into the vector
    after that we are throwing them with the help of MultiSpan in
    a separate block.
    
    Addresses: rust-lang#53840
    PramodBisht committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    e536e64 View commit details
    Browse the repository at this point in the history
  2. move some more tests

    RalfJung committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    454b14a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    092bf2b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e0caaec View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#54269 - PramodBisht:issue/53840, r=estebank

    rust-lang#53840: Consolidate pattern check errors
    
    rust-lang#53840  on this PR we are aggregating `cannot bind by-move and by-ref in the same pattern` message present on the different lines into one diagnostic message. Here we are first gathering those `spans` on `vector` then we are throwing them with the help of `MultiSpan`
    r? @estebank
    
    Addresses: rust-lang#53480
    pietroalbini authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    49d4359 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#54458 - scottmcm:bug-54456, r=nikomatsakis

    Allow both explicit and elided lifetimes in the same impl header
    
    While still prohibiting explicit and in-band in the same header.
    
    Fixes rust-lang#54456
    
    As usual, I don't know the broader context of the code I'm changing, so please let me know whatever I can do better.
    
    Pre-existing test that mixing explicit and in-band remains an error: https://github.com/rust-lang/rust/blob/master/src/test/ui/in-band-lifetimes/E0688.rs
    pietroalbini authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    ab338ea View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#54603 - davidtwco:issue-54559, r=nikomatsakis

    Add `crate::` to trait suggestions in Rust 2018.
    
    Fixes rust-lang#54559.
    
    In the 2018 edition, when suggesting traits to import that implement a
    given method that is being invoked, suggestions will now include the
    `crate::` prefix if the suggested trait is local to the current crate.
    
    r? @nikomatsakis
    pietroalbini authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    f70f6ec View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#54648 - alexcrichton:update-cargo, r=nikoma…

    …tsakis
    
    Update Cargo's submodule
    
    Bring in a few updates and fixes, mostly a standard update.
    pietroalbini authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    662f85e View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#54680 - RalfJung:compile-pass, r=pnkfelix

    make run-pass tests with empty main just compile-pass tests
    
    Many run-pass tests have an empty main, so there is not actually any point in running them. This makes them `compile-pass` tests instead, saving some time (generating the binary and then running it).
    
    For now I did this only for `run-pass/issues`; if there is interest I can also do it for the other directories. I used `^\s*fn\s+main\(\s*\)\s*\{\s*\}` as regexp to identify these files.
    pietroalbini authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    32c1454 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#54687 - scottmcm:more-elision, r=dtolnay

    Use impl_header_lifetime_elision in libcore
    
    The feature is approved for stabilization, so let's use it to remove about 300 `'a`s.
    
    Tracking issue for the feature: rust-lang#15872
    pietroalbini authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    7e571ee View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#54699 - DiamondLovesYou:reexport-getopts, r…

    …=pnkfelix
    
    Re-export `getopts` so custom drivers can reference it.
    
    Otherwise, custom drivers will have to use their own copy of `getopts`, which won't match the types used in `CompilerCalls`.
    pietroalbini authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    958f1c5 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#54702 - RalfJung:fn-ptr-promotion, r=oli-obk

    do not promote comparing function pointers
    
    This *could* break existing code that relied on fn ptr comparison getting promoted to `'static` lifetime.
    
    Fixes rust-lang#54696
    pietroalbini authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    d9d9663 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#54728 - alexcrichton:renumber-issues, r=nik…

    …omatsakis
    
    Renumber `proc_macro` tracking issues
    
    Lots of issue links in the compiler still point to rust-lang#38356 which is a bit of a monster issue that isn't serving much purpose any more. I've split the issue into a number of more fine-grained tracking issues to track stabilizations.
    pietroalbini authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    1826970 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#54745 - abonander:cstr-const, r=oli-obk

    make `CStr::from_bytes_with_nul_unchecked()` a const fn
    
    closes rust-lang#54678
    pietroalbini authored Oct 2, 2018
    Configuration menu
    Copy the full SHA
    00e4b27 View commit details
    Browse the repository at this point in the history