Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions internal/core/subsume/subsume.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,9 @@ func (s *subsumer) getError() (err errors.Error) {
if s.gt != nil && s.lt != nil {
// src := binSrc(token.NoPos, opUnify, s.gt, s.lt)
if s.missing != 0 {
s.errf("missing field %q", s.missing.SelectorString(c))
} else if b, ok := unifyValue(c, s.gt, s.lt).(*adt.Bottom); !ok {
s.errf("value not an instance")
s.errf("field %q not present in %v", s.missing.SelectorString(c), s.lt)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit contains rephrasing of error messages, as well as logic changes. This makes it non-trivial to see which tests change because of what. These should be separated out in different CLs.

} else {
s.errs = errors.Append(s.errs, b.Err)
s.errf("%v does not subsume %v", s.gt, s.lt)
}
}
if s.errs == nil {
Expand Down
Loading