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

Closed
wants to merge 18 commits into from

Commits on Jan 15, 2024

  1. Configuration menu
    Copy the full SHA
    999a162 View commit details
    Browse the repository at this point in the history
  2. Update tests

    mu001999 authored Jan 15, 2024
    Configuration menu
    Copy the full SHA
    155ca3d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    65409c4 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. coverage: Add #[rustfmt::skip] to tests with non-standard formatting

    These tests deliberately use non-standard formatting, so that the line
    execution counts reported by `llvm-cov` reveal additional information about
    where code regions begin and end.
    Zalathar committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    f149442 View commit details
    Browse the repository at this point in the history
  2. coverage: Tweak individual tests to be unaffected by rustfmt

    Some of these tests use non-standard formatting that we can simulate by
    strategically adding `//` line comments.
    
    One contains `where` clauses that would be split across multiple lines, which
    we can keep on one line by moving the bounds to the generic type instead.
    Zalathar committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    1f9353a View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Remove box <expr> recovery

    clubby789 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    b9ebeee View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3f7c784 View commit details
    Browse the repository at this point in the history
  3. coverage: Format all remaining tests

    These tests can simply be reformatted as normal, because the resulting changes
    are unimportant.
    Zalathar committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    99797bb View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. Apply suggestions from code review

    Co-authored-by: fee1-dead <ent3rm4n@gmail.com>
    smoelius and fee1-dead authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    96b8eb7 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

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

Commits on Jan 20, 2024

  1. Fix impl stripped in rustdoc HTML whereas it should not be in case th…

    …e impl is implemented on a type alias
    GuillaumeGomez committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    6237beb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0933f48 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#118257 - mu001999:dead_code/trait, r=cjgillot

    Make traits / trait methods detected by the dead code lint
    
    Fixes rust-lang#118139 and rust-lang#41883
    GuillaumeGomez authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    c326059 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#119997 - GuillaumeGomez:fix-stripped-impl-o…

    …n-ty-alias, r=notriddle
    
    Fix impl stripped in rustdoc HTML whereas it should not be in case the impl is implemented on a type alias
    
    Fixes rust-lang#119015.
    
    I talked about it a bit with ``@petrochenkov.`` They might change what `EffectiveVisibilities` return for impl items like this one and make them not only reachable but also re-exported, which would fix this case. It could also potentially break other things, so it'll be done whenever they can and then we can check together.
    
    Surprisingly, this fix is making rustdoc even closer to rustc in term of errors (the CI currently fails because currently accepted broken codes aren't working anymore with this change). Not sure exactly why though. This is linked to rust-lang#110631 from what I could find.
    
    So either I'm missing something here, or we consider it's ok and we consider the failing tests as "should fail" and I'll update `rustdoc-ui` ones.
    
    r? ``@notriddle``
    GuillaumeGomez authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    ba07767 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#120000 - smoelius:fix-clippy, r=fee1-dead

    Ensure `callee_id`s are body owners
    
    This PR makes the `callee_id` argument of Clippy's `implements_trait_with_env` optional, and when it is passed, ensures it is a body owner.
    
    rust-lang#118661 added the `callee_id` parameter to alleviate an ICE. Specifically, the `callee_id` is used to determine an "effect arg" in certain situations.
    
    Frankly, I [do not completely understand](rust-lang#118661 (comment)) what an "effect arg" is. But the code that determines it seems to require that `callee_id` is a body owner:
    - https://github.com/rust-lang/rust/blob/1ead4761e9e2f056385768614c23ffa7acb6a19e/src/tools/clippy/clippy_utils/src/ty.rs#L286-L288
    - https://github.com/rust-lang/rust/blob/1ead4761e9e2f056385768614c23ffa7acb6a19e/compiler/rustc_middle/src/ty/util.rs#L834
    - https://github.com/rust-lang/rust/blob/1ead4761e9e2f056385768614c23ffa7acb6a19e/compiler/rustc_middle/src/hir/map/mod.rs#L372
    
    In the current head, some def ids passed as `callee_id`s are not body owners. This PR fixes that.
    
    cc `@rust-lang/clippy`
    
    r? `@fee1-dead`
    GuillaumeGomez authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    3ee4404 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#120015 - Zalathar:format, r=dtolnay

    coverage: Format all coverage tests with `rustfmt`
    
    As suggested by <rust-lang#119984 (comment)>.
    
    Test files in `tests/` are normally ignored by `x fmt`, but sometimes those files end up being run through `rustfmt` anyway, either by `rust-analyzer` or by hand.
    
    When that happens, it's annoying to have to manually revert formatting changes that are unrelated to the actual changes being made. So it's helpful for the tests in the repository to already have standard formatting beforehand.
    
    However, there are several coverage tests that deliberately use non-standard formatting, so that line counts reveal more information about where code regions begin and end. In those cases, we can use `#[rustfmt::skip]` to prevent that code from being disturbed.
    
    `@rustbot` label +A-code-coverage
    GuillaumeGomez authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    8a52196 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#120063 - clubby789:remove-box-handling, r=N…

    …ilstrieb
    
    Remove special handling of `box` expressions from parser
    
    rust-lang#108471 added a temporary hack to parse `box expr`. It's been almost a year since then, so I think it's safe to remove the special handling.
    
    As a drive-by cleanup, move `parser/removed-syntax*` tests to their own directory.
    GuillaumeGomez authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    8625f36 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#120138 - trevyn:detect-submodules-limit, r=…

    …albertlarsan68
    
    Increase vscode settings.json `git.detectSubmodulesLimit`
    
    The default vscode git integration throws a warning on the rust repository because it has more than the default limit of 10 submodules. This adds an increase to 20 to the settings.json that x.py offers to install on setup.
    
    <img width="461" alt="Screen Shot 2024-01-19 at 11 47 47 PM" src="https://github.com/rust-lang/rust/assets/230691/440dfa4e-32e3-41f7-b8c6-5a07ade7aa14">
    
    Also reported at https://stackoverflow.com/questions/60917209/disable-vs-code-warning-submodules-which-wont-be-opened-automatically
    GuillaumeGomez authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    da2811e View commit details
    Browse the repository at this point in the history