barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #253 from kortschak/redundancy

Browse source 
graph: remove redundant type
This commit is contained in:
Barak Michener 2015-05-05 18:56:52 -04:00
commit 680bb244d2
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
graph/primarykey.go
View file

@ -15,12 +15,13 @@
package graph package graph
import ( import (
"code.google.com/p/go-uuid/uuid"
"encoding/json" "encoding/json"
"errors" "errors"
"github.com/barakmich/glog"
"strconv" "strconv"
"sync" "sync"
"code.google.com/p/go-uuid/uuid"
"github.com/barakmich/glog"
) )
type primaryKeyType uint8 type primaryKeyType uint8
@ -116,9 +117,6 @@ func (p PrimaryKey) MarshalJSON() ([]byte, error) {
} }
} }
//To avoid recursion in the implmentation of the UnmarshalJSON interface below
type primaryKey PrimaryKey
func (p *PrimaryKey) UnmarshalJSON(bytes []byte) error { func (p *PrimaryKey) UnmarshalJSON(bytes []byte) error {
if bytes[0] == '"' { if bytes[0] == '"' {
switch bytes[1] { switch bytes[1] {