Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
zerosnake0 committed Oct 8, 2020
2 parents 4c4977c + 9fae222 commit e36baef
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 19 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[![Go Report Card](https://goreportcard.com/badge/github.com/zerosnake0/jzon)](https://goreportcard.com/report/github.com/zerosnake0/jzon)
[![PkgGoDev](https://pkg.go.dev/badge/github.com/zerosnake0/jzon)](https://pkg.go.dev/github.com/zerosnake0/jzon)
[![Build Status](https://travis-ci.org/zerosnake0/jzon.svg?branch=master)](https://travis-ci.org/zerosnake0/jzon)
[![codecov](https://codecov.io/gh/zerosnake0/jzon/branch/master/graph/badge.svg)](https://codecov.io/gh/zerosnake0/jzon)
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
Expand Down
10 changes: 5 additions & 5 deletions struct.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package jzon

/* see encoding/json
* - some additional comments may be added
* - some code may be slightly modified
*/

import (
"reflect"
"sort"
)

/* see encoding/json
* - some additional comments may be added
* - some code may be slightly modified
*/

func describeStruct(st reflect.Type, tagKey string, onlyTaggedField bool) structFields {
// Anonymous fields to explore at the current level and the next.
var current []field
Expand Down
8 changes: 4 additions & 4 deletions struct_field.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package jzon

import (
"reflect"
)

/* see encoding/json
* - some additional comments may be added
* - some code may be slightly modified
*/

import (
"reflect"
)

type offset struct {
val uintptr
rtype rtype
Expand Down
10 changes: 5 additions & 5 deletions struct_field_fold.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package jzon

/* see encoding/json
* - some additional comments may be added
* - some code may be slightly modified
*/

import (
"bytes"
"unicode/utf8"
)

/* see encoding/json
* - some additional comments may be added
* - some code may be slightly modified
*/

const (
caseMask = ^byte(0x20) // Mask to ignore case in ASCII.
kelvin = '\u212a'
Expand Down
10 changes: 5 additions & 5 deletions struct_tag.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package jzon

/* see encoding/json
* - some additional comments may be added
* - some code may be slightly modified
*/

import (
"strings"
"unicode"
)

/* see encoding/json
* - some additional comments may be added
* - some code may be slightly modified
*/

// tagOptions is the string following a comma in a struct field's "json"
// tag, or the empty string. It does not include the leading comma.
type tagOptions string
Expand Down

0 comments on commit e36baef

Please sign in to comment.