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

Closed
wants to merge 24 commits into from

Commits on Jan 22, 2023

  1. --wip-- [skip ci]

    --wip-- [skip ci]
    
    get the generic text and put it int he suggestion, but suggestion not working on derive subdiagnostic
    
    refactor away from derives and use span_suggestion() instead. Show's the correct(?) generic contents, but overwrites the fn name :(
    
    x fmt
    
    drop commented code and s/todo/fixme
    
    get the correct diagnostic for functions, at least
    
    x fmt
    
    remove some debugs
    
    remove format
    
    remove debugs
    
    remove useless change
    
    remove useless change
    
    remove legacy approach
    
    correct lookahead + error message contains the ident name
    
    fmt
    
    refactor code
    
    tests
    
    add tests
    
    remoev debug
    
    remove comment
    SpanishPear committed Jan 22, 2023
    Configuration menu
    Copy the full SHA
    e813132 View commit details
    Browse the repository at this point in the history
  2. Apply automatic suggestions from code review

    Co-authored-by: Takayuki Maeda <takoyaki0316@gmail.com>
    SpanishPear and TaKO8Ki committed Jan 22, 2023
    Configuration menu
    Copy the full SHA
    5287004 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    655beb4 View commit details
    Browse the repository at this point in the history
  4. revert to previous span

    SpanishPear committed Jan 22, 2023
    Configuration menu
    Copy the full SHA
    4447949 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8292d07 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. move to multipart spans

    SpanishPear committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    70bfcc2 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2023

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

Commits on Feb 3, 2023

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

Commits on Feb 11, 2023

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

Commits on Feb 12, 2023

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

Commits on Feb 13, 2023

  1. Configuration menu
    Copy the full SHA
    5925400 View commit details
    Browse the repository at this point in the history
  2. Store metrics from metrics.json into PGO CI timer

    Co-authored-by: Jakub Beránek <berykubik@gmail.com>
    geordi and Kobzol committed Feb 13, 2023
    Configuration menu
    Copy the full SHA
    d6bc681 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    afe9553 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2023

  1. Configuration menu
    Copy the full SHA
    3180f1c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    826abcc View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#103478 - SpanishPear:spanishpear/issue_1033…

    …66_fix, r=TaKO8Ki
    
     Suggest fix for misplaced generic params on fn item rust-lang#103366
    
    fixes rust-lang#103366
    
    This still has some work to go, but works for 2/3 of the initial base cases described in #1033366
    
    simple fn:
    ```
    error: expected identifier, found `<`
     --> shreys/test_1.rs:1:3
      |
    1 | fn<T> id(x: T) -> T { x }
      |   ^ expected identifier
      |
    help: help: place the generic parameter list after the function name:
      |
    1 | fn id<T>(x: T) -> T { x }
      |    ~~~~
    
    ```
    
    Complicated bounds
    ```
    error: expected identifier, found `<`
     --> spanishpear/test_2.rs:1:3
      |
    1 | fn<'a, B: 'a + std::ops::Add<Output = u32>> f(_x: B) { }
      |   ^ expected identifier
      |
    help: help: place the generic parameter list after the function name:
      |
    1 | fn f<'a, B: 'a + std::ops::Add<Output = u32>>(_x: B) { }
      |    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    ```
    
    Opening a draft PR for comments on approach, particularly I have the following questions:
     -  [x]  Is it okay to be using `err.span_suggestion` over struct derives? I struggled to get the initial implementation (particularly the correct suggestion message) on struct derives, although I think given what I've learned since starting, I could attempt re-doing it with that approach.
      -  [x] in the case where the snippet cannot be obtained from a span, is the `help` but no suggestion okay? I think yes (also, when does this case occur?)
      -  [x] are there any red flags for the generalisation of this work for relevant item kinds (i.e. `struct`, `enum`, `trait`, and `union`). My basic testing indicates it does work for those types except the help tip is currently hardcoded to `after the function name` - which should change dependent on the item.
      - [x] I am planning to not show the suggestion if there is already a `<` after the item identifier, (i.e. if there are already generics, as after a function name per the original issue). Any major objections?
      - [x] Is the style of error okay? I wasn't sure if there was a way to make it display nicer, or if thats handled by span_suggestion
    
    These aren't blocking questions, and I will keep working on:
      - check if there is a `<` after the ident (and if so, not showing the suggestion)
      - generalize the help message
      - figuring out how to write/run/etc ui tests (including reading the docs for them)
      - logic cleanups
    matthiaskrgr authored Feb 14, 2023
    Configuration menu
    Copy the full SHA
    85ad2af View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#107173 - clubby789:suggest-array-length, r=…

    …compiler-errors
    
    Suggest the correct array length on mismatch
    
    Fixes rust-lang#107156
    
    I wasn't able to find a way to get the `Span` for the actual array size unfortunately, so this suggestion can't be applied automatically.
    
    `@rustbot` label +A-diagnostics
    matthiaskrgr authored Feb 14, 2023
    Configuration menu
    Copy the full SHA
    121b911 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#107573 - cuviper:drop-llvm-13, r=nagisa

    Update the minimum external LLVM to 14
    
    With this change, we'll have stable support for LLVM 14 through 16 (pending release).
    For reference, the previous increase to LLVM 13 was rust-lang#100460.
    matthiaskrgr authored Feb 14, 2023
    Configuration menu
    Copy the full SHA
    f28191e View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#107626 - jyn514:x-fix, r=Mark-Simulacrum

    Fix `x fix` on the standard library itself
    
    Fixes rust-lang#107501
    matthiaskrgr authored Feb 14, 2023
    Configuration menu
    Copy the full SHA
    589bcdc View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#107733 - Kobzol:opt-build-metrics, r=Mark-S…

    …imulacrum
    
    Store metrics from `metrics.json` to CI PGO timer
    
    With this change, we'll be able to easily see how long does it take to compile LLVM vs `rustc`.
    
    r? `@Mark-Simulacrum`
    matthiaskrgr authored Feb 14, 2023
    Configuration menu
    Copy the full SHA
    2d7e59b View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#107972 - saethlin:fix-test-ub, r=michaelwoe…

    …rister
    
    Fix unintentional UB in ui tests
    
    ``@matthiaskrgr`` found UB in a bunch of the ui tests. This PR fixes a batch of miscellaneous tests I didn't think needed reviewers from a particular part of the project.
    matthiaskrgr authored Feb 14, 2023
    Configuration menu
    Copy the full SHA
    0367b5c View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#108003 - chenyukang:yukang/fix-107998, r=co…

    …mpiler-errors
    
    Avoid ICE when the generic_span is empty
    
    Fixes rust-lang#107998
    r? ``@TaKO8Ki``
    matthiaskrgr authored Feb 14, 2023
    Configuration menu
    Copy the full SHA
    514bc13 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#108023 - JulianKnodt:smaller_benchmark, r=w…

    …orkingjubilee
    
    Shrink size of array benchmarks
    
    Might've overdone it with the size of these benchmarks, as there's no need for them to be quite as large.
    
    Fixes rust-lang#108011
    matthiaskrgr authored Feb 14, 2023
    Configuration menu
    Copy the full SHA
    d5efe29 View commit details
    Browse the repository at this point in the history