diff --git a/x/model/name.go b/x/model/name.go index 7b6462913..3b816d6e9 100644 --- a/x/model/name.go +++ b/x/model/name.go @@ -280,12 +280,6 @@ func (r Name) Parts() []string { } } -func (r Name) Host() string { return r.host } -func (r Name) Namespace() string { return r.namespace } -func (r Name) Model() string { return r.model } -func (r Name) Tag() string { return r.tag } -func (r Name) Build() string { return r.build } - // EqualFold reports whether r and o are equivalent model names, ignoring // case. func (r Name) EqualFold(o Name) bool { diff --git a/x/model/name_test.go b/x/model/name_test.go index 8b295b2a3..77aba9383 100644 --- a/x/model/name_test.go +++ b/x/model/name_test.go @@ -121,10 +121,10 @@ func TestParseName(t *testing.T) { t.Errorf("String() = %s; want %s", got.String(), baseName) } - if got.Valid() && got.Model() == "" { - t.Errorf("Valid() = true; Model() = %q; want non-empty name", got.Model()) - } else if !got.Valid() && got.Model() != "" { - t.Errorf("Valid() = false; Model() = %q; want empty name", got.Model()) + if got.Valid() && got.model == "" { + t.Errorf("Valid() = true; Model() = %q; want non-empty name", got.model) + } else if !got.Valid() && got.DisplayModel() != "" { + t.Errorf("Valid() = false; Model() = %q; want empty name", got.model) } }) } @@ -223,7 +223,7 @@ func TestNameDisplay(t *testing.T) { if g := p.String(); g != tt.in { t.Errorf("String(%q) = %q; want %q", tt.in, g, tt.in) } - if g := p.Model(); g != tt.wantModel { + if g := p.DisplayModel(); g != tt.wantModel { t.Errorf("Model = %q; want %q", g, tt.wantModel) } if g, w := fmt.Sprintf("%#v", p), p.DisplayComplete(); g != w {