cue: advance deprecation of Iterator methods

Iterator.Label had been hidden and slated for deprecation since 2021,
so it's time to formally deprecate it now.

Iterator.IsHidden and Iterator.IsDefinition have been hidden and
deprecated since 2021, so they can be removed at this point.

Signed-off-by: Daniel Martí <[email protected]>
Change-Id: I1a236ff0e26d145010f291f2e30310e2b0af0670
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1202284
TryBot-Result: CUEcueckoo <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>
Reviewed-by: Roger Peppe <[email protected]>

cue/types.go

@@ -259,7 +259,7 @@ func (i *Iterator) Selector() Selector {
 // Label reports the label of the value if i iterates over struct fields and ""
 // otherwise.
 //
-// Slated to be deprecated: use [Iterator.Selector] and [Selector.String].
+// Deprecated: use [Iterator.Selector] and [Selector.String].
 // Note that this will give more accurate string representations.
 func (i *hiddenIterator) Label() string {
 	if i.f == 0 {
@@ -268,13 +268,6 @@ func (i *hiddenIterator) Label() string {
 	return i.idx.LabelStr(i.f)
 }
 
-// IsHidden reports if a field is hidden from the data model.
-//
-// Deprecated: use i.Selector().PkgPath() != ""
-func (i *hiddenIterator) IsHidden() bool {
-	return i.f.IsHidden()
-}
-
 // IsOptional reports if a field is optional.
 func (i *Iterator) IsOptional() bool {
 	return i.arcType == adt.ArcOptional
@@ -285,13 +278,6 @@ func (i *Iterator) FieldType() SelectorType {
 	return featureToSelType(i.f, i.arcType)
 }
 
-// IsDefinition reports if a field is a definition.
-//
-// Deprecated: use i.Selector().IsDefinition()
-func (i *hiddenIterator) IsDefinition() bool {
-	return i.f.IsDef()
-}
-
 // marshalJSON iterates over the list and generates JSON output. HasNext
 // will return false after this operation.
 func listAppendJSON(b []byte, l *Iterator) ([]byte, error) {

encoding/openapi/openapi.go

@@ -146,7 +146,7 @@ func (c *Config) compose(inst cue.InstanceOrValue, schemas *ast.StructLit) (x *a
 	var info *ast.StructLit
 
 	for i, _ := val.Fields(cue.Definitions(true)); i.Next(); {
-		if i.IsDefinition() {
+		if i.Selector().IsDefinition() {
 			continue
 		}
 		label := i.Label()