teamcity: failed tests on master: lint/TestStyle, lint/TestStyle/TestErrCheck, lint/TestStyle/TestReturnCheck, lint/TestStyle/TestMetacheck

[cockroach-teamcity]

The following tests appear to have failed:

#276593:

--- FAIL: lint/TestStyle (29.470s)
null
--- FAIL: lint/TestStyle/TestErrCheck (8.820s)
style_test.go:601: err=exit status 2, stderr=/go/src/github.com/cockroachdb/cockroach/pkg/sql/distsqlrun/sorter_test.go:235:38: unknown field Kind in struct literal
	/go/src/github.com/cockroachdb/cockroach/pkg/sql/distsqlrun/sorter_test.go:276:38: unknown field Kind in struct literal
	error: failed to check packages: could not type check: couldn't load packages due to errors: github.com/cockroachdb/cockroach/pkg/sql/distsqlrun
--- FAIL: lint/TestStyle/TestReturnCheck (11.630s)
style_test.go:625: err=exit status 1, stderr=/go/src/github.com/cockroachdb/cockroach/pkg/sql/distsqlrun/sorter_test.go:235:38: unknown field Kind in struct literal
	/go/src/github.com/cockroachdb/cockroach/pkg/sql/distsqlrun/sorter_test.go:276:38: unknown field Kind in struct literal
--- FAIL: lint/TestStyle/TestMetacheck (9.020s)
style_test.go:804: err=exit status 1, stderr=/go/src/github.com/cockroachdb/cockroach/pkg/sql/distsqlrun/sorter_test.go:235:38: unknown field Kind in struct literal
	/go/src/github.com/cockroachdb/cockroach/pkg/sql/distsqlrun/sorter_test.go:276:38: unknown field Kind in struct literal
	couldn't load packages due to errors: github.com/cockroachdb/cockroach/pkg/sql/distsqlrun

Please assign, take a look and update the issue accordingly.

[a-robinson]

Looks like #16606 might have hit some merge skew.

[eisenstatdavid]

Yep, #16421 was merged around the same time and needs a Kind -> SemanticType rename.