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

Jump to bottom

Implement generic text encoding interfaces #163

Closed
wants to merge 2 commits into from
Closed

Implement generic text encoding interfaces #163

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ad3d3b
Implement go-yaml's Marshaler and Unmarshaler interfaces
chrisnovakovic Apr 21, 2021
61ea0cc
Implement generic text encoding interfaces instead
chrisnovakovic Apr 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 9 additions & 11 deletions version.go
View file
Open in desktop
Expand Up @@ -3,7 +3,6 @@ package semver
import (
"bytes"
"database/sql/driver"
"encoding/json"
"errors"
"fmt"
"regexp"
Expand Down Expand Up @@ -412,28 +411,27 @@ func (v *Version) Compare(o *Version) int {
return comparePrerelease(ps, po)
}

// UnmarshalJSON implements JSON.Unmarshaler interface.
func (v *Version) UnmarshalJSON(b []byte) error {
var s string
if err := json.Unmarshal(b, &s); err != nil {
return err
}
temp, err := NewVersion(s)
// UnmarshalText unmarshals the textual representation of a semantic version into
// this Version.
func (v *Version) UnmarshalText(text []byte) error {
temp, err := NewVersion(string(text))
if err != nil {
return err
}

v.major = temp.major
v.minor = temp.minor
v.patch = temp.patch
v.pre = temp.pre
v.metadata = temp.metadata
v.original = temp.original

return nil
}

// MarshalJSON implements JSON.Marshaler interface.
func (v Version) MarshalJSON() ([]byte, error) {
return json.Marshal(v.String())
// MarshalText returns the textual representation of the Version.
func (v Version) MarshalText() ([]byte, error) {
return []byte(v.String()), nil
}

// Scan implements the SQL.Scanner interface.
Expand Down