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

Merged
merged 23 commits into from
May 17, 2019
Merged

Rollup of 6 pull requests #60898

merged 23 commits into from
May 17, 2019

Commits on May 9, 2019

  1. Switch to SPDX 2.1 license expression

    According to the Cargo Reference:
    https://doc.rust-lang.org/cargo/reference/manifest.html
    
    > This is an SPDX 2.1 license expression for this package. Currently
    > crates.io will validate the license provided against a whitelist of
    > known license and exception identifiers from the SPDX license list
    > 2.4. Parentheses are not currently supported.
    >
    > Multiple licenses can be separated with a `/`, although that usage
    > is deprecated. Instead, use a license expression with AND and OR
    > operators to get more explicit semantics.
    dtolnay committed May 9, 2019
    Configuration menu
    Copy the full SHA
    08cd34e View commit details
    Browse the repository at this point in the history
  2. Fix .natvis visualizers.

    Updated to handle these changes:
      - `core::ptr::*` lost their `__0` elements and are just plain pointers
      - `core::ptr::*` probably shouldn't dereference in `DisplayString` s
      - `VecDeque` and `Vec` use `core::ptr::*` s
      - `VecDeque` and `LinkedList` moved modules again.
    
    Retested - still working fine, left alone:
      - `String`, `&str`, `Option`
    MaulingMonkey committed May 9, 2019
    1 Configuration menu
    Copy the full SHA
    7c55b48 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2019

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

Commits on May 15, 2019

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

Commits on May 16, 2019

  1. Configuration menu
    Copy the full SHA
    d763faf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ee02661 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    01c6689 View commit details
    Browse the repository at this point in the history
  4. tidy fix

    estebank committed May 16, 2019
    Configuration menu
    Copy the full SHA
    91c36c4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c616605 View commit details
    Browse the repository at this point in the history
  6. readd match await test case

    estebank committed May 16, 2019
    Configuration menu
    Copy the full SHA
    0183a57 View commit details
    Browse the repository at this point in the history
  7. Review comments

    - Change wording of suggestion
    - Move recovery logic to `diagnostics.rs`
    - Reduce ammount of code duplication
    estebank committed May 16, 2019
    Configuration menu
    Copy the full SHA
    b9d6fe3 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    27a2881 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    4117c6d View commit details
    Browse the repository at this point in the history
  10. Add entry-like methods to HashSet

    * `HashSet::get_or_insert`
    * `HashSet::get_or_insert_with`
    
    These provide a simplification of the `Entry` API for `HashSet`, with
    names chosen to match the similar methods on `Option`.
    cuviper committed May 16, 2019
    Configuration menu
    Copy the full SHA
    5f93834 View commit details
    Browse the repository at this point in the history
  11. review comments

    estebank committed May 16, 2019
    Configuration menu
    Copy the full SHA
    c084d0e View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    5e2c9d3 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    9161a4d View commit details
    Browse the repository at this point in the history

Commits on May 17, 2019

  1. Rollup merge of rust-lang#60685 - dtolnay:spdx, r=nikomatsakis

    Switch to SPDX 2.1 license expression
    
    [According to the Cargo Reference:](https://doc.rust-lang.org/cargo/reference/manifest.html)
    
    > This is an SPDX 2.1 license expression for this package. Currently crates.io will validate the license provided against a whitelist of known license and exception identifiers from the SPDX license list 2.4. Parentheses are not currently supported.
    >
    > Multiple licenses can be separated with a \`/\`, although that usage is deprecated. Instead, use a license expression with AND and OR operators to get more explicit semantics.
    
    The notation with slashes is deprecated in favor of explicit AND or OR.
    
    As I understand it, Rust's license is MIT *OR* Apache-2.0 matching the meaning of *OR* defined by [SPDX Specification 2.1](https://spdx.org/spdx-specification-21-web-version):
    
    > If presented with a choice between two or more licenses, use the disjunctive binary "OR" operator to construct a new license expression, where both the left and right operands are valid license expression values.
    Centril committed May 17, 2019
    Configuration menu
    Copy the full SHA
    5972408 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#60687 - MaulingMonkey:pr-fix-natvis-files, …

    …r=alexcrichton
    
    Fix .natvis visualizers.
    
    ### Updated to handle these changes:
      - `core::ptr::*` lost their `__0` elements and are just plain pointers
      - `core::ptr::*` probably shouldn't dereference in `DisplayString` s
      - `VecDeque` probably *should* dereference it's buf pointer to display individual items.
      - `VecDeque` and `Vec` use `core::ptr::*` s
      - `VecDeque` and `LinkedList` moved modules again.
    
    ### Retested - still working fine, left alone:
      - `String`, `&str`, `Option`
    
    ### Side Chatter
      - Props to Alex for pointing out this was broken in the `#ides-and-editors` Discord channel
      - It'd be nice if there was a sane way to automate unit testing these visualizers.
        (I assume COM automation of Visual Studio would be a no go on the build servers, and probably really incredibly painful to write too!  Suggestions welcome...)
    Centril committed May 17, 2019
    Configuration menu
    Copy the full SHA
    a925973 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#60805 - euclio:filetime-dep, r=Mark-Simulacrum

    remove compiletest's dependency on `filetime`
    Centril committed May 17, 2019
    Configuration menu
    Copy the full SHA
    23d91e2 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#60862 - spastorino:get-ty-from-local_decls,…

    … r=oli-obk
    
    Get ty from local_decls instead of using Place
    
    r? @oli-obk This is from one of your review on Place 2.0
    Centril committed May 17, 2019
    Configuration menu
    Copy the full SHA
    71cd93a View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#60873 - estebank:bad-await, r=Centril

    Parse alternative incorrect uses of await and recover
    
    Fix rust-lang#60613.
    
    r? @Centril
    Centril committed May 17, 2019
    Configuration menu
    Copy the full SHA
    70b38d1 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#60894 - cuviper:hash_set_entry, r=cramertj,…

    …Centril
    
    Add entry-like methods to HashSet
    
    * `HashSet::get_or_insert`
    * `HashSet::get_or_insert_with`
    
    These provide a simplification of the `Entry` API for `HashSet`, with
    names chosen to match the similar methods on `Option`.
    Centril committed May 17, 2019
    Configuration menu
    Copy the full SHA
    a80a1d0 View commit details
    Browse the repository at this point in the history