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 8 pull requests #65771

Merged
merged 31 commits into from
Oct 25, 2019
Merged

Rollup of 8 pull requests #65771

merged 31 commits into from
Oct 25, 2019

Commits on Oct 22, 2019

  1. Configuration menu
    Copy the full SHA
    600607f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bbd53de View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    133cd2c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f0e6cd9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9f788f3 View commit details
    Browse the repository at this point in the history
  6. Remove FIXME

    varkor committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    7f13a4a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    2dda8ad View commit details
    Browse the repository at this point in the history
  8. Update cargo

    ehuss committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    fe3dc31 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2019

  1. UI failures fix

    Umesh Kalappa authored and BaoshanPang committed Oct 23, 2019
    Configuration menu
    Copy the full SHA
    eb6d757 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2019

  1. Tweak format string error to point at arguments always

    Add secondary span labels with no text to make it clear when there's a
    mismatch bewteen the positional arguments in a format string and the
    arguments to the macro. This shouldn't affect experienced users, but it
    should make it easier for newcomers to more clearly understand how
    `format!()` and `println!()` are supposed to be used.
    
    ```
    error: 2 positional arguments in format string, but there is 1 argument
     --> file8.rs:2:14
      |
    2 |     format!("{} {}", 1);
      |              ^^ ^^   -
    ```
    
    instead of
    
    ```
    error: 2 positional arguments in format string, but there is 1 argument
     --> file8.rs:2:14
      |
    2 |     format!("{} {}", 1);
      |              ^^ ^^
    ```
    estebank committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    8467cef View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    18d873e View commit details
    Browse the repository at this point in the history
  3. Update hashbrown to 0.6.2

    Pulls in rust-lang/hashbrown#119 which should be a good improvement for
    compile times of hashmap-heavy crates.
    alexcrichton committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    060b6cb View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    184a61f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2c16f84 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    2cda75c View commit details
    Browse the repository at this point in the history
  7. rustc_metadata: Move some code around

    Plugin search doesn't need a crate loader, only crate locator
    petrochenkov committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    175d325 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    222503a View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    fb353f0 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    5fd796a View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    3534ca8 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    c5fee33 View commit details
    Browse the repository at this point in the history
  13. rustc_metadata: Minimize use of Lrc in crate store

    Crate metadatas are still stored as `Lrc<CrateMetadata>` in `CStore` because crate store has to be cloneable due to `Resolver::clone_outputs`.
    petrochenkov committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    9f5a530 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    94216ce View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#65625 - petrochenkov:cstore, r=Mark-Simulac…

    …rum,Zoxc
    
    Turn crate store into a resolver output
    
    Crate store (`CStore`) is a vector of data (`CrateMetadata`) associated with extern crates loaded during the current compilation session.
    
    All crates are loaded in the resolver when resolving either paths pointing to extern prelude or `extern crate` items. (There are also a couple of crates like panic runtime that are loaded kind of like implicit `extern crate`s, but that also happens in resolve.)
    
    The use of `CStore` from `rustc_plugin` (which is outside of the resolver) was unnecessary because legacy plugins are not added to the crate store and don't use `CrateNum`s.
    
    So, `CStore` can be produced by the resolver instead of being kept in some really global data (`rustc_interface::Compiler`) like now.
    
    As a result of crate store being more "local" we can now remove some locks and `Lrc`s.
    Centril authored Oct 24, 2019
    Configuration menu
    Copy the full SHA
    cdb7634 View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#65627 - varkor:const-generics-forbid-non-st…

    …ructural_match, r=petrochenkov
    
    Forbid non-`structural_match` types in const generics
    
    Fixes rust-lang#60286.
    Centril authored Oct 24, 2019
    Configuration menu
    Copy the full SHA
    9c04bd1 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#65710 - ehuss:update-cargo, r=alexcrichton

    Update cargo
    
    6 commits in 3a9abe3f065554a7fbc59f440df2baba4a6e47ee..3ba5f27170db10af7a92f2b682e049397197b8fa
    2019-10-15 15:55:35 +0000 to 2019-10-22 15:05:18 +0000
    - Fix typo in `cargo install --profile` help (rust-lang/cargo#7532)
    - Use stricter -Z flag parsing. (rust-lang/cargo#7531)
    - Set timestamp on generated files in archive to now (rust-lang/cargo#7523)
    - Support rustc's `-Z panic-abort-tests` in Cargo (rust-lang/cargo#7460)
    - rustfmt for nightly changes. (rust-lang/cargo#7526)
    - Allow --all-features in root of virtual workspace. (rust-lang/cargo#7525)
    Centril authored Oct 24, 2019
    Configuration menu
    Copy the full SHA
    0da94a4 View commit details
    Browse the repository at this point in the history
  18. Rollup merge of rust-lang#65729 - Wind-River:master_003, r=alexcrichton

    Update test cases for vxWorks
    Centril authored Oct 24, 2019
    Configuration menu
    Copy the full SHA
    efa5037 View commit details
    Browse the repository at this point in the history
  19. Rollup merge of rust-lang#65746 - estebank:newcomer-format, r=Centril

    Tweak format string error to point at arguments always
    
    Add secondary span labels with no text to make it clear when there's a
    mismatch bewteen the positional arguments in a format string and the
    arguments to the macro. This shouldn't affect experienced users, but it
    should make it easier for newcomers to more clearly understand how
    `format!()` and `println!()` are supposed to be used.
    
    ```
    error: 2 positional arguments in format string, but there is 1 argument
     --> file8.rs:2:14
      |
    2 |     format!("{} {}", 1);
      |              ^^ ^^   -
    ```
    
    instead of
    
    ```
    error: 2 positional arguments in format string, but there is 1 argument
     --> file8.rs:2:14
      |
    2 |     format!("{} {}", 1);
      |              ^^ ^^
    ```
    
    r? @Centril
    Centril authored Oct 24, 2019
    Configuration menu
    Copy the full SHA
    1e4a2ee View commit details
    Browse the repository at this point in the history
  20. Rollup merge of rust-lang#65753 - csmoe:derive_fold, r=Centril

    Don't assert for different instance on impl trait alias
    
    Closes rust-lang#65679
    r? @Centril @nikomatsakis
    Centril authored Oct 24, 2019
    Configuration menu
    Copy the full SHA
    1b03671 View commit details
    Browse the repository at this point in the history
  21. Rollup merge of rust-lang#65755 - estebank:icicle, r=davidtwco

    Avoid ICE when adjusting bad self ty
    
    Fix rust-lang#65611.
    Centril authored Oct 24, 2019
    Configuration menu
    Copy the full SHA
    7b3896f View commit details
    Browse the repository at this point in the history
  22. Rollup merge of rust-lang#65766 - alexcrichton:less-inline-hashbrown,…

    … r=Mark-Simulacrum
    
    Update hashbrown to 0.6.2
    
    Pulls in rust-lang/hashbrown#119 which should be a good improvement for
    compile times of hashmap-heavy crates.
    Centril authored Oct 24, 2019
    Configuration menu
    Copy the full SHA
    fd6795b View commit details
    Browse the repository at this point in the history