Skip to content

Commit cd016af

Browse files
committed
go/types: rename NewInterface2 to NewInterfaceType
NewInterface2 was introduced with https://go-review.googlesource.com/114317 which fixed #25301. Changed the name to NewInterfaceType to better match Go naming styles, per discussion with @josharian, @iant, et al. Change-Id: Ifa4708a5efd4f708295b33c3d20fdc5812e1b4fc Reviewed-on: https://go-review.googlesource.com/120875 Reviewed-by: Josh Bleecher Snyder <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent 8997ec1 commit cd016af

File tree

7 files changed

+26
-26
lines changed

7 files changed

+26
-26
lines changed

api/go1.11.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ pkg debug/pe, const IMAGE_FILE_MACHINE_ARM64 = 43620
437437
pkg debug/pe, const IMAGE_FILE_MACHINE_ARM64 ideal-int
438438
pkg go/ast, type CompositeLit struct, Incomplete bool
439439
pkg go/token, method (*File) AddLineColumnInfo(int, string, int, int)
440-
pkg go/types, func NewInterface2([]*Func, []Type) *Interface
440+
pkg go/types, func NewInterfaceType([]*Func, []Type) *Interface
441441
pkg go/types, method (*Interface) EmbeddedType(int) Type
442442
pkg go/types, method (*Var) Embedded() bool
443443
pkg net, method (*ListenConfig) Listen(context.Context, string, string) (Listener, error)

src/go/internal/gccgoimporter/parser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ func (p *parser) parseInterfaceType(pkg *types.Package) types.Type {
600600
}
601601
p.expect('}')
602602

603-
return types.NewInterface2(methods, embeddeds)
603+
return types.NewInterfaceType(methods, embeddeds)
604604
}
605605

606606
// PointerType = "*" ("any" | Type) .

src/go/internal/gcimporter/bimport.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ func (p *importer) typ(parent *types.Package, tname *types.Named) types.Type {
536536
embeddeds = append(embeddeds, p.typ(parent, nil))
537537
}
538538

539-
t := types.NewInterface2(p.methodList(parent, tname), embeddeds)
539+
t := types.NewInterfaceType(p.methodList(parent, tname), embeddeds)
540540
p.interfaceList = append(p.interfaceList, t)
541541
if p.trackAllTypes {
542542
p.typList[n] = t

src/go/internal/gcimporter/iimport.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ func (r *importReader) doType(base *types.Named) types.Type {
535535
methods[i] = types.NewFunc(mpos, r.currPkg, mname, msig)
536536
}
537537

538-
typ := types.NewInterface2(methods, embeddeds)
538+
typ := types.NewInterfaceType(methods, embeddeds)
539539
r.p.interfaceList = append(r.p.interfaceList, typ)
540540
return typ
541541
}

src/go/types/type.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -260,24 +260,24 @@ var markComplete = make([]*Func, 0)
260260
// NewInterface takes ownership of the provided methods and may modify their types by setting
261261
// missing receivers. To compute the method set of the interface, Complete must be called.
262262
//
263-
// Deprecated: Use NewInterface2 instead which allows any (even non-defined) interface types
263+
// Deprecated: Use NewInterfaceType instead which allows any (even non-defined) interface types
264264
// to be embedded. This is necessary for interfaces that embed alias type names referring to
265265
// non-defined (literal) interface types.
266266
func NewInterface(methods []*Func, embeddeds []*Named) *Interface {
267267
tnames := make([]Type, len(embeddeds))
268268
for i, t := range embeddeds {
269269
tnames[i] = t
270270
}
271-
return NewInterface2(methods, tnames)
271+
return NewInterfaceType(methods, tnames)
272272
}
273273

274-
// NewInterface2 returns a new (incomplete) interface for the given methods and embedded types.
274+
// NewInterfaceType returns a new (incomplete) interface for the given methods and embedded types.
275275
// Each embedded type must have an underlying type of interface type (this property is not
276276
// verified for defined types, which may be in the process of being set up and which don't
277277
// have a valid underlying type yet).
278-
// NewInterface2 takes ownership of the provided methods and may modify their types by setting
278+
// NewInterfaceType takes ownership of the provided methods and may modify their types by setting
279279
// missing receivers. To compute the method set of the interface, Complete must be called.
280-
func NewInterface2(methods []*Func, embeddeds []Type) *Interface {
280+
func NewInterfaceType(methods []*Func, embeddeds []Type) *Interface {
281281
typ := new(Interface)
282282

283283
if len(methods) == 0 && len(embeddeds) == 0 {
@@ -344,9 +344,9 @@ func (t *Interface) Method(i int) *Func { return t.allMethods[i] }
344344
func (t *Interface) Empty() bool { return len(t.allMethods) == 0 }
345345

346346
// Complete computes the interface's method set. It must be called by users of
347-
// NewInterface after the interface's embedded types are fully defined and
348-
// before using the interface type in any way other than to form other types.
349-
// Complete returns the receiver.
347+
// NewInterfaceType and NewInterface after the interface's embedded types are
348+
// fully defined and before using the interface type in any way other than to
349+
// form other types. Complete returns the receiver.
350350
func (t *Interface) Complete() *Interface {
351351
if t.allMethods != nil {
352352
return t

src/go/types/typestring_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -162,19 +162,19 @@ func TestIncompleteInterfaces(t *testing.T) {
162162
{NewInterface(nil, []*Named{newDefined(NewInterface([]*Func{m}, nil).Complete())}), "interface{T /* incomplete */}"},
163163
{NewInterface(nil, []*Named{newDefined(NewInterface([]*Func{m}, nil).Complete())}).Complete(), "interface{T}"},
164164

165-
{NewInterface2(nil, nil), "interface{/* incomplete */}"},
166-
{NewInterface2(nil, nil).Complete(), "interface{}"},
167-
{NewInterface2([]*Func{}, nil), "interface{/* incomplete */}"},
168-
{NewInterface2([]*Func{}, nil).Complete(), "interface{}"},
169-
{NewInterface2(nil, []Type{}), "interface{/* incomplete */}"},
170-
{NewInterface2(nil, []Type{}).Complete(), "interface{}"},
171-
{NewInterface2([]*Func{m}, nil), "interface{m() /* incomplete */}"},
172-
{NewInterface2([]*Func{m}, nil).Complete(), "interface{m()}"},
173-
{NewInterface2(nil, []Type{new(Interface).Complete()}), "interface{interface{} /* incomplete */}"},
174-
{NewInterface2(nil, []Type{new(Interface).Complete()}).Complete(), "interface{interface{}}"},
175-
{NewInterface2(nil, []Type{NewInterface2([]*Func{m}, nil)}), "interface{interface{m() /* incomplete */} /* incomplete */}"},
176-
{NewInterface2(nil, []Type{NewInterface2([]*Func{m}, nil).Complete()}), "interface{interface{m()} /* incomplete */}"},
177-
{NewInterface2(nil, []Type{NewInterface2([]*Func{m}, nil).Complete()}).Complete(), "interface{interface{m()}}"},
165+
{NewInterfaceType(nil, nil), "interface{/* incomplete */}"},
166+
{NewInterfaceType(nil, nil).Complete(), "interface{}"},
167+
{NewInterfaceType([]*Func{}, nil), "interface{/* incomplete */}"},
168+
{NewInterfaceType([]*Func{}, nil).Complete(), "interface{}"},
169+
{NewInterfaceType(nil, []Type{}), "interface{/* incomplete */}"},
170+
{NewInterfaceType(nil, []Type{}).Complete(), "interface{}"},
171+
{NewInterfaceType([]*Func{m}, nil), "interface{m() /* incomplete */}"},
172+
{NewInterfaceType([]*Func{m}, nil).Complete(), "interface{m()}"},
173+
{NewInterfaceType(nil, []Type{new(Interface).Complete()}), "interface{interface{} /* incomplete */}"},
174+
{NewInterfaceType(nil, []Type{new(Interface).Complete()}).Complete(), "interface{interface{}}"},
175+
{NewInterfaceType(nil, []Type{NewInterfaceType([]*Func{m}, nil)}), "interface{interface{m() /* incomplete */} /* incomplete */}"},
176+
{NewInterfaceType(nil, []Type{NewInterfaceType([]*Func{m}, nil).Complete()}), "interface{interface{m()} /* incomplete */}"},
177+
{NewInterfaceType(nil, []Type{NewInterfaceType([]*Func{m}, nil).Complete()}).Complete(), "interface{interface{m()}}"},
178178
} {
179179
got := test.typ.String()
180180
if got != test.want {

src/go/types/universe.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func defPredeclaredTypes() {
8080
res := NewVar(token.NoPos, nil, "", Typ[String])
8181
sig := &Signature{results: NewTuple(res)}
8282
err := NewFunc(token.NoPos, nil, "Error", sig)
83-
typ := &Named{underlying: NewInterface2([]*Func{err}, nil).Complete()}
83+
typ := &Named{underlying: NewInterfaceType([]*Func{err}, nil).Complete()}
8484
sig.recv = NewVar(token.NoPos, nil, "", typ)
8585
def(NewTypeName(token.NoPos, nil, "error", typ))
8686
}

0 commit comments

Comments
 (0)