Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix behavior when struct fields conflicted #335

Merged
merged 1 commit into from
Dec 19, 2022
Merged

Fix behavior when struct fields conflicted #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions decode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2804,3 +2804,21 @@ steps:
})
}
}

func TestSameNameInineStruct(t *testing.T) {
type X struct {
X float64 `yaml:"x"`
}

type T struct {
X `yaml:",inline"`
}

var v T
if err := yaml.Unmarshal([]byte(`x: 0.7`), &v); err != nil {
t.Fatal(err)
}
if fmt.Sprint(v.X.X) != "0.7" {
t.Fatalf("failed to decode")
}
}
2 changes: 1 addition & 1 deletion struct.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ type StructFieldMap map[string]*StructField

func (m StructFieldMap) isIncludedRenderName(name string) bool {
for _, v := range m {
if v.RenderName == name {
if !v.IsInline && v.RenderName == name {
return true
}
}
Expand Down