Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ go get github.com/google/uuid

Full `go doc` style documentation for the package can be viewed online without
installing this package by using the GoDoc site here:
http://pkg.go.dev/github.com/google/uuid
https://pkg.go.dev/github.com/google/uuid
4 changes: 2 additions & 2 deletions null_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,10 @@ func TestNullUUIDUnmarshalJSON(t *testing.T) {
var nu NullUUID
err := json.Unmarshal(jsonNull, &nu)
if err != nil || nu.Valid {
t.Errorf("expected nil when unmarshaling null, got %s", err)
t.Errorf("expected nil when unmarshalling null, got %s", err)
}
err = json.Unmarshal(jsonUUID, &nu)
if err != nil || !nu.Valid {
t.Errorf("expected nil when unmarshaling null, got %s", err)
t.Errorf("expected nil when unmarshalling null, got %s", err)
}
}
2 changes: 1 addition & 1 deletion version7.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ var lastV7time int64
const nanoPerMilli = 1000000

// getV7Time returns the time in milliseconds and nanoseconds / 256.
// The returned (milli << 12 + seq) is guarenteed to be greater than
// The returned (milli << 12 + seq) is guaranteed to be greater than
// (milli << 12 + seq) returned by any previous call to getV7Time.
func getV7Time() (milli, seq int64) {
timeMu.Lock()
Expand Down