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.

Sign up for GitHub

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

Jump to bottom

Rollup of 4 pull requests #118949

Merged
merged 8 commits into from
Dec 14, 2023
Merged

Rollup of 4 pull requests #118949

merged 8 commits into from
Dec 14, 2023

Commits on Dec 14, 2023

  1. interpret: extend comment on the inhabitedness check in downcast

    @RalfJung
    RalfJung committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    5d87d83 View commit details
    Browse the repository at this point in the history

  2. Use Map instead of Object for source files and search index

    @GuillaumeGomez
    GuillaumeGomez committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    fc72216 View commit details
    Browse the repository at this point in the history

  3. rustc_codegen_ssa: Remove trailing spaces in Display impl for CguReuse 

    Otherwise errors will look like this:

    error: CGU-reuse for `cgu_invalidated_via_import-bar` is `PreLto ` but should be `PostLto `
    @Enselic
    Enselic committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    2ddd8b4 View commit details
    Browse the repository at this point in the history

  4. Unconditionally register alias-relate in projection goal

    @compiler-errors
    compiler-errors committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    929d632 View commit details
    Browse the repository at this point in the history

  5. Rollup merge of rust-lang#118910 - GuillaumeGomez:js-object-to-map, r… 

    …=notriddle

[rustdoc] Use Map instead of Object for source files and search index

It's cleaner and is also easier to manipulate `Map` rather than `Object` types.

r? `@notriddle`
    @matthiaskrgr
    matthiaskrgr authored Dec 14, 2023
    Configuration menu
    Copy the full SHA
    9ec6205 View commit details
    Browse the repository at this point in the history

  6. Rollup merge of rust-lang#118914 - compiler-errors:eager-alias-relate… 

    …, r=lcnr

Unconditionally register alias-relate in projection goal

Follow-up to rust-lang#118725, which subtly broke closure signature inference on combinators like `Result::map` which I noticed in syn.

Essentially, instead of using `eq` which will eagerly infer `?1 := <?2 as Trait>::Assoc`, we can directly emit an alias-relate goal, which will stay ambiguous for as long as `?2` is ambiguous.

This also more closely models the conceptual framing that projects-to acts like an alias-relate when solving, and like a normalizes-to when in a param env.

r? lcnr
    @matthiaskrgr
    matthiaskrgr authored Dec 14, 2023
    Configuration menu
    Copy the full SHA
    accaea2 View commit details
    Browse the repository at this point in the history

  7. Rollup merge of rust-lang#118935 - RalfJung:interpret-downcast, r=sae… 

    …thlin

interpret: extend comment on the inhabitedness check in downcast

Cc rust-lang#115145
r? ``@saethlin``
    @matthiaskrgr
    matthiaskrgr authored Dec 14, 2023
    Configuration menu
    Copy the full SHA
    49a2fc2 View commit details
    Browse the repository at this point in the history

  8. Rollup merge of rust-lang#118945 - Enselic:remove-trailing, r=compile… 

    …r-errors

rustc_codegen_ssa: Remove trailing spaces in Display impl for CguReuse

Otherwise errors will look like this:

    error: CGU-reuse for `cgu_invalidated_via_import-bar` is `PreLto ` but should be `PostLto `

### Background

I noticed that error messages looked wonky while investigating if
https://github.com/rust-lang/rust/blob/529047cfc3f4f7b3ea5aaac054408f368d153727/compiler/rustc_codegen_ssa/src/assert_module_sources.rs#L281-L287
should not be wrapped by `sess.emit_err(...)`. Right now it looks like the error is accidentally ignored. It looks like rust-lang@706452e might have accidentally started ignoring it (by removing the `diag.span_err()` call). I am still investigating, but regardless of the outcome we should fix the trailing whitespace.
    @matthiaskrgr
    matthiaskrgr authored Dec 14, 2023
    Configuration menu
    Copy the full SHA
    4d016c7 View commit details
    Browse the repository at this point in the history