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

Merged
merged 16 commits into from
Jul 1, 2023
Merged

Rollup of 6 pull requests #113229

merged 16 commits into from
Jul 1, 2023

Commits on Jun 30, 2023

  1. Configuration menu
    Copy the full SHA
    d567e4f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    473c88d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8ad5ea7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    44a8a8d View commit details
    Browse the repository at this point in the history
  5. add typecheck for iterator

    chenyukang committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    4189faa View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f9a4db7 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2023

  1. Configuration menu
    Copy the full SHA
    549f48d View commit details
    Browse the repository at this point in the history
  2. msvc dist extended: clippy is optional

    The windows tarballs and installers expect clippy to be present, but
    it's not always the case. For example, in try builds.
    lqd committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    8a4a6f7 View commit details
    Browse the repository at this point in the history
  3. msvc dist extended: rust-analyzer is optional

    The windows tarballs and installers expect rust-analyzer to be present, but
    it's not always the case. For example, in try builds.
    lqd committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    a158053 View commit details
    Browse the repository at this point in the history
  4. Update cargo

    weihanglo committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    80423fd View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#113168 - bvanjoi:fix-85992, r=petrochenkov

    fix(resolve): skip assertion judgment when NonModule is dummy
    
    Fixes rust-lang#85992
    
    ## Why rust-lang#85992 panic
    
    During `resolve_imports`, the `path_res` of the import `issue_85992_extern_2::Outcome` is pointing to `external::issue_85992_extern_2` instead of `crate::issue_85992_extern_2`. As a result `import.imported_module.set` had been executed.
    
    Attached 1: the state of `early_resolve_ident_in_lexical_scope` during the `resolve_imports` for `use issue_85992_extern_2::Outcome` is as follows:
    
    |iter in `visit_scopes`  | `scope` | `result.binding` |
    | -    | -               | -                                                            |
    | init | -               | -                                                            |
    | 0    | `CrateRoot`     | Err(Determined)     |
    | 1    | `ExternPrelude` | pointing to the `issue_85992_extern_2`(external) |
    
    However, during finalization for `issue_85992_extern_2::Outcome`, the `innermost_result` was pointed to `crate::issue_85992_extern_2` and no ambiguity was generated, leading to a panic.
    
    Attached 2: the state of `early_resolve_ident_in_lexical_scope` during the `finalize_import` for `use issue_85992_extern_2::Outcome` is as follows:
    
    |iter in `visit_scopes`  | `scope` | `result.binding` | `innermost_result` |
    | -    | -               | -                                                            | -                     |
    | init | -               | -                                                            | `None`                |
    | 0    | `CrateRoot`     | pointing to `use crate::issue_85992_extern_2` **(introdcued by dummy)**    | same as `result` but with a `Some` wapper|
    | 1    | `ExternPrelude` | pointing to the `issue_85992_extern_2`(external) | smae as above |
    
    ## Try to solve
    
    Skip assertion judgment when `NonModule` is dummy
    
    r? `@petrochenkov`
    matthiaskrgr committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    b63bc06 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#113174 - chenyukang:yukang-fix-102972-loop-…

    …next, r=compiler-errors
    
    Better messages for next on a iterator inside for loops
    
    Fixes rust-lang#102972
    matthiaskrgr committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    9082287 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#113182 - compiler-errors:rpit-stricter-capt…

    …ures, r=oli-obk
    
    Error when RPITITs' hidden types capture more lifetimes than their trait definitions
    
    This implements a stricter set of captures rules for RPITITs. They now may only capture:
    1. Lifetimes from the impl header (both the self type and any trait substs -- we may want to restrict just to the self type's lifetimes, but the PR makes that easy to do, too)
    2. Lifetimes mentioned by the `impl Trait` in the trait method's definition.
    
    Namely, they may not mention lifetimes from the method (early or late) that are not mentioned in the `impl Trait`.
    
    cc rust-lang#105258 which I think was trying to do this too, though I'm not super familiar with what exactly differs from that or why that one was broken.
    cc rust-lang#112194 (doesn't fix this issue per se, because it's still an open question, but I think this is objectively better than the status quo, and gets us closer to resolving that issue.)
    
    Technically is a fix for the ICE in rust-lang#108580, but it turns that issue into an error now. We can decide separately whether or not nested RPITITs should capture lifetimes from their parents.
    
    r? ``@oli-obk``
    matthiaskrgr committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    ca7e27a View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#113196 - Bryanskiy:assoc_item, r=petrochenkov

    Fix associated items effective visibility calculation for type privacy lints
    
    Fixes rust-lang#113126 (comment).
    matthiaskrgr committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    bcd804b View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#113226 - lqd:win-trys, r=Kobzol

    Fix try builds on the msvc builder
    
    Try builds have been optimized to build less components, however bootstrap was still expecting them to be present on msvc. This PR (extracted from rust-lang#112267) fixes that.
    
    r? `@Kobzol`
    matthiaskrgr committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    f607eb4 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#113227 - weihanglo:update-cargo, r=weihanglo

    Update cargo
    
    6 commits in 03bc66b55c290324bd46eb22e369c8fae1908f91..5b377cece0e0dd0af686cf53ce4637d5d85c2a10
    2023-06-23 23:27:46 +0000 to 2023-06-30 00:01:00 +0000
    - Add READMEs for the credential helpers. (rust-lang/cargo#12322)
    - Add some more documentation for Source download functions. (rust-lang/cargo#12319)
    - Don't try to compile cargo-credential-gnome-secret on non-Linux platforms. (rust-lang/cargo#12321)
    - refactor: use macro to remove duplication of workspace inheritable fields getters (rust-lang/cargo#12317)
    - doc: should be `.cargo-ok` (rust-lang/cargo#12318)
    - refactor(registry): extract and rearrange items to their own modules (rust-lang/cargo#12290)
    
    r? `@ghost`
    matthiaskrgr committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    f67d59b View commit details
    Browse the repository at this point in the history