Tree.Marshal returns the TOML encoding of Tree #306
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pelletier
reviewed
Sep 25, 2019
| @@ -445,8 +445,11 @@ func (t *Tree) Unmarshal(v interface{}) error { | |||
| // See Marshal() documentation for types mapping table. | |||
| func (t *Tree) Marshal() ([]byte, error) { | |||
| var buf bytes.Buffer | |||
| err := NewEncoder(&buf).Encode(t) | |||
| return buf.Bytes(), err | |||
| _, err := t.WriteTo(&buf) | |||
There was a problem hiding this comment.
Given that this is now basically the same code as ToTomlString(), mind replacing it with something like
func (t *Tree) ToTomlString() (string, error) {
b, err := t.Marshal()
if err != nil {
return "", err
}
return string(b), nil
}to avoid duplication, please?
pelletier
reviewed
Sep 25, 2019
The Tree.Marshal tried to marshal the Tree struct itself rather than the nodes being part of the tree. Fixes pelletier#295
b1cca1f to
40b28d3
Compare
pelletier
approved these changes
Sep 26, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue: #295
The
Tree.Marshalmethod tried to marshal theTreestruct itself rather than the nodes being part of the tree. TheTreestruct doesn't export any fields so the result was empty. Regardless, the output would not represent the TOML structure inside the tree.