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

Fix tmerge for (partially) const types with undef fields #43812

Merged
merged 3 commits into from
Jan 19, 2022
Merged

Fix tmerge for (partially) const types with undef fields #43812

merged 3 commits into from
Jan 19, 2022

Commits on Jan 14, 2022

  1. Fix tmerge for (partially) const types with undef fields 

    When `tmerge` is applied to `Const`/`PartialStruct` and a field is
`Const` in one of the types and `Union{}` (i.e. undef) in the other,
the resulting field type must not be `Const` (as the resursively called
`tmerge` produces).

Fixes #43784.
    @martinholters
    martinholters committed Jan 14, 2022
    Configuration menu
    Copy the full SHA
    9116078 View commit details
    Browse the repository at this point in the history

  2. Use === in a comparison to Union{} 

    Co-authored-by: Simeon Schaub <schaub@mit.edu>
    @martinholters @simeonschaub
    martinholters and simeonschaub authored Jan 14, 2022
    Configuration menu
    Copy the full SHA
    73d4651 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2022

  1. Fix test for #43784 

    Co-authored-by: Shuhei Kadowaki <40514306+aviatesk@users.noreply.github.com>
    @martinholters @aviatesk
    martinholters and aviatesk authored Jan 15, 2022
    Configuration menu
    Copy the full SHA
    c7ef143 View commit details
    Browse the repository at this point in the history