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 5 pull requests #83986

Merged
merged 15 commits into from
Apr 8, 2021
Merged

Rollup of 5 pull requests #83986

merged 15 commits into from
Apr 8, 2021

Commits on Apr 6, 2021

  1. Fix handling of --output-format json flag

    - Don't treat it as deprecated on stable and beta channels. Before, it
      would give confusing and incorrect output:
    
      ```
      warning: the 'output-format' flag is considered deprecated
        |
        = warning: see issue rust-lang#44136 <rust-lang#44136> for more information
    
      error: json output format isn't supported for doc generation
      ```
      Both of those are wrong: output-format isn't deprecated, and json
      output is supported.
    
    - Require -Z unstable-options for `--output-format json`
    
      Previously, it was allowed by default on nightly, which made it hard
      to realize the flag wouldn't be accepted on beta or stable.
      Note that this still allows `--output-format html`, which has been
      stable since 1.0.
    
    - Remove unnecessary double-checking of the feature gate when parsing
      the output format
    - Add custom run-make test since compiletest passes -Zunstable-options
        by default
    jyn514 committed Apr 6, 2021
    Configuration menu
    Copy the full SHA
    ffd7094 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2021

  1. Configuration menu
    Copy the full SHA
    e1efa17 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d326c21 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8bc5581 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    dc71166 View commit details
    Browse the repository at this point in the history
  5. review comments

    estebank committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    2375b8a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    60c7f37 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6e77bcb View commit details
    Browse the repository at this point in the history
  8. rebase and update tests

    estebank committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    64e6288 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    934a30a View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#82497 - jyn514:json, r=CraftSpider

    Fix handling of `--output-format json` flag
    
    - Don't treat it as deprecated on stable and beta channels. Before, it
      would give confusing and incorrect output:
    
      ```
      warning: the 'output-format' flag is considered deprecated
        |
        = warning: see issue rust-lang#44136 <rust-lang#44136> for more information
    
      error: json output format isn't supported for doc generation
      ```
      Both of those are wrong: output-format isn't deprecated, and json
      output is supported.
    
    - Require -Z unstable-options for `--output-format json`
    
      Previously, it was allowed by default on nightly, which made it hard
      to realize the flag wouldn't be accepted on beta or stable.
    
    To get the test working I had to remove `-Z unstable-options`, which x.py passed to compiletest unconditionally. It was first added in rust-lang@8c2ec68 so `-Z miri` would be allowed. -Z miri is no longer passed unconditionally, so hopefully removing it won't break anything.
    
    r? ```@aDotInTheVoid``` cc ```@HeroicKatora``` ```@CraftSpider```
    
    Thanks to ```@memoryruins``` for pointing it out on Discord!
    
    cc ```@Mark-Simulacrum``` for the change to compiletest.
    Dylan-DPC committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    cbe3eba View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#83689 - estebank:cool-bears-hot-tip, r=davi…

    …dtwco
    
    Add more info for common trait resolution and async/await errors
    
    * Suggest `Pin::new`/`Box::new`/`Arc::new`/`Box::pin` in more cases
    * Point at `impl` and type defs introducing requirements on E0277
    Dylan-DPC committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    a113240 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#83952 - estebank:issue-83943, r=petrochenkov

    Account for `ExprKind::Block` when suggesting .into() and deref
    
    Fix rust-lang#83943.
    Dylan-DPC committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    97c50d5 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#83965 - rust-lang:debug-intravisit-fnkind, …

    …r=lqd
    
    Add Debug implementation for hir::intravisit::FnKind
    Dylan-DPC committed Apr 7, 2021
    Configuration menu
    Copy the full SHA
    1ab186a View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#83974 - pierwill:fix-callbacks-names, r=jyn514

    Fix outdated crate names in `rustc_interface::callbacks`
    Dylan-DPC committed Apr 7, 2021
    Configuration menu