Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 65de9dd18c |
@@ -5,7 +5,7 @@ Thank you for your pull request!
|
|||||||
Please read the Code changes section of the CONTRIBUTING.md file,
|
Please read the Code changes section of the CONTRIBUTING.md file,
|
||||||
and make sure you have followed the instructions.
|
and make sure you have followed the instructions.
|
||||||
|
|
||||||
https://git.ostiwe.com/ostiwe/go-toml/blob/v2/CONTRIBUTING.md#code-changes
|
https://github.com/pelletier/go-toml/blob/v2/CONTRIBUTING.md#code-changes
|
||||||
|
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,6 @@ jobs:
|
|||||||
- name: Setup go
|
- name: Setup go
|
||||||
uses: actions/setup-go@v6
|
uses: actions/setup-go@v6
|
||||||
with:
|
with:
|
||||||
go-version: "1.26"
|
go-version: "1.25"
|
||||||
- name: Run tests with coverage
|
- name: Run tests with coverage
|
||||||
run: ./ci.sh coverage -d "${GITHUB_BASE_REF-HEAD}"
|
run: ./ci.sh coverage -d "${GITHUB_BASE_REF-HEAD}"
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ jobs:
|
|||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v4
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
- name: Run Go versions compatibility test
|
- name: Run Go versions compatibility test
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ jobs:
|
|||||||
- name: Setup go
|
- name: Setup go
|
||||||
uses: actions/setup-go@v6
|
uses: actions/setup-go@v6
|
||||||
with:
|
with:
|
||||||
go-version: "1.26"
|
go-version: "1.24"
|
||||||
- name: Run golangci-lint
|
- name: Run golangci-lint
|
||||||
uses: golangci/golangci-lint-action@v9
|
uses: golangci/golangci-lint-action@v9
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -22,9 +22,9 @@ jobs:
|
|||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
uses: actions/setup-go@v6
|
uses: actions/setup-go@v6
|
||||||
with:
|
with:
|
||||||
go-version: "1.26"
|
go-version: "1.25"
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@v4
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ jobs:
|
|||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [ 'ubuntu-latest', 'windows-latest', 'macos-latest', 'macos-14' ]
|
os: [ 'ubuntu-latest', 'windows-latest', 'macos-latest', 'macos-14' ]
|
||||||
go: [ '1.25', '1.26' ]
|
go: [ '1.24', '1.25' ]
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
name: ${{ matrix.go }}/${{ matrix.os }}
|
name: ${{ matrix.go }}/${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
+6
-6
@@ -21,7 +21,7 @@ improvement, or new features that weren't envisioned before. Sometimes, a
|
|||||||
seemingly innocent question leads to the fix of a bug. Don't hesitate and ask
|
seemingly innocent question leads to the fix of a bug. Don't hesitate and ask
|
||||||
away!
|
away!
|
||||||
|
|
||||||
[discussions]: https://git.ostiwe.com/ostiwe/go-toml/discussions
|
[discussions]: https://github.com/pelletier/go-toml/discussions
|
||||||
|
|
||||||
## Improve the documentation
|
## Improve the documentation
|
||||||
|
|
||||||
@@ -224,12 +224,12 @@ Checklist:
|
|||||||
5. If new version is an alpha or beta only, check pre-release box.
|
5. If new version is an alpha or beta only, check pre-release box.
|
||||||
|
|
||||||
|
|
||||||
[issues-tracker]: https://git.ostiwe.com/ostiwe/go-toml/issues
|
[issues-tracker]: https://github.com/pelletier/go-toml/issues
|
||||||
[bug-report]: https://git.ostiwe.com/ostiwe/go-toml/issues/new?template=bug_report.md
|
[bug-report]: https://github.com/pelletier/go-toml/issues/new?template=bug_report.md
|
||||||
[pkg.go.dev]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml
|
[pkg.go.dev]: https://pkg.go.dev/github.com/pelletier/go-toml
|
||||||
[readme]: ./README.md
|
[readme]: ./README.md
|
||||||
[fork]: https://help.github.com/articles/fork-a-repo
|
[fork]: https://help.github.com/articles/fork-a-repo
|
||||||
[pull-request]: https://help.github.com/en/articles/creating-a-pull-request
|
[pull-request]: https://help.github.com/en/articles/creating-a-pull-request
|
||||||
[new-release]: https://git.ostiwe.com/ostiwe/go-toml/releases/new
|
[new-release]: https://github.com/pelletier/go-toml/releases/new
|
||||||
[gh]: https://github.com/cli/cli
|
[gh]: https://github.com/cli/cli
|
||||||
[pr-labels]: https://git.ostiwe.com/ostiwe/go-toml/blob/v2/.github/release.yml
|
[pr-labels]: https://github.com/pelletier/go-toml/blob/v2/.github/release.yml
|
||||||
|
|||||||
@@ -4,21 +4,21 @@ Go library for the [TOML](https://toml.io/en/) format.
|
|||||||
|
|
||||||
This library supports [TOML v1.0.0](https://toml.io/en/v1.0.0).
|
This library supports [TOML v1.0.0](https://toml.io/en/v1.0.0).
|
||||||
|
|
||||||
[🐞 Bug Reports](https://git.ostiwe.com/ostiwe/go-toml/issues)
|
[🐞 Bug Reports](https://github.com/pelletier/go-toml/issues)
|
||||||
|
|
||||||
[💬 Anything else](https://git.ostiwe.com/ostiwe/go-toml/discussions)
|
[💬 Anything else](https://github.com/pelletier/go-toml/discussions)
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
Full API, examples, and implementation notes are available in the Go
|
Full API, examples, and implementation notes are available in the Go
|
||||||
documentation.
|
documentation.
|
||||||
|
|
||||||
[](https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2)
|
[](https://pkg.go.dev/github.com/pelletier/go-toml/v2)
|
||||||
|
|
||||||
## Import
|
## Import
|
||||||
|
|
||||||
```go
|
```go
|
||||||
import "git.ostiwe.com/ostiwe/go-toml/v2"
|
import "github.com/pelletier/go-toml/v2"
|
||||||
```
|
```
|
||||||
|
|
||||||
See [Modules](#Modules).
|
See [Modules](#Modules).
|
||||||
@@ -41,7 +41,7 @@ operations should not be shockingly slow. See [benchmarks](#benchmarks).
|
|||||||
the TOML document was not present in the target structure. This is a great way
|
the TOML document was not present in the target structure. This is a great way
|
||||||
to check for typos. [See example in the documentation][strict].
|
to check for typos. [See example in the documentation][strict].
|
||||||
|
|
||||||
[strict]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#example-Decoder.DisallowUnknownFields
|
[strict]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#example-Decoder.DisallowUnknownFields
|
||||||
|
|
||||||
### Contextualized errors
|
### Contextualized errors
|
||||||
|
|
||||||
@@ -56,7 +56,7 @@ example:
|
|||||||
3| port = 50
|
3| port = 50
|
||||||
```
|
```
|
||||||
|
|
||||||
[decode-err]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#DecodeError
|
[decode-err]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#DecodeError
|
||||||
|
|
||||||
### Local date and time support
|
### Local date and time support
|
||||||
|
|
||||||
@@ -68,9 +68,9 @@ making them convenient yet unambiguous structures for their respective TOML
|
|||||||
representation.
|
representation.
|
||||||
|
|
||||||
[ldt]: https://toml.io/en/v1.0.0#local-date-time
|
[ldt]: https://toml.io/en/v1.0.0#local-date-time
|
||||||
[tld]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#LocalDate
|
[tld]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#LocalDate
|
||||||
[tlt]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#LocalTime
|
[tlt]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#LocalTime
|
||||||
[tldt]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#LocalDateTime
|
[tldt]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#LocalDateTime
|
||||||
|
|
||||||
### Commented config
|
### Commented config
|
||||||
|
|
||||||
@@ -90,7 +90,7 @@ port = 4242
|
|||||||
# version = 'TLS 1.3'
|
# version = 'TLS 1.3'
|
||||||
```
|
```
|
||||||
|
|
||||||
[comments-example]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#example-Marshal-Commented
|
[comments-example]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#example-Marshal-Commented
|
||||||
|
|
||||||
## Getting started
|
## Getting started
|
||||||
|
|
||||||
@@ -135,7 +135,7 @@ fmt.Println("tags:", cfg.Tags)
|
|||||||
// tags: [go toml]
|
// tags: [go toml]
|
||||||
```
|
```
|
||||||
|
|
||||||
[unmarshal]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#Unmarshal
|
[unmarshal]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#Unmarshal
|
||||||
|
|
||||||
|
|
||||||
Here is an example using tables with some simple nesting:
|
Here is an example using tables with some simple nesting:
|
||||||
@@ -217,7 +217,7 @@ fmt.Println(string(b))
|
|||||||
// Tags = ['go', 'toml']
|
// Tags = ['go', 'toml']
|
||||||
```
|
```
|
||||||
|
|
||||||
[marshal]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#Marshal
|
[marshal]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#Marshal
|
||||||
|
|
||||||
## Unstable API
|
## Unstable API
|
||||||
|
|
||||||
@@ -228,24 +228,24 @@ API subject to change.
|
|||||||
### Parser
|
### Parser
|
||||||
|
|
||||||
Parser is the unstable API that allows iterative parsing of a TOML document at
|
Parser is the unstable API that allows iterative parsing of a TOML document at
|
||||||
the AST level. See https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2/unstable.
|
the AST level. See https://pkg.go.dev/github.com/pelletier/go-toml/v2/unstable.
|
||||||
|
|
||||||
## Benchmarks
|
## Benchmarks
|
||||||
|
|
||||||
Execution time speedup compared to other Go TOML libraries:
|
Execution time speedup compared to other Go TOML libraries:
|
||||||
|
|
||||||
<table>
|
<table>
|
||||||
<thead>
|
<thead>
|
||||||
<tr><th>Benchmark</th><th>go-toml v1</th><th>BurntSushi/toml</th></tr>
|
<tr><th>Benchmark</th><th>go-toml v1</th><th>BurntSushi/toml</th></tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr><td>Marshal/HugoFrontMatter-2</td><td>2.1x</td><td>2.0x</td></tr>
|
<tr><td>Marshal/HugoFrontMatter-2</td><td>1.9x</td><td>2.2x</td></tr>
|
||||||
<tr><td>Marshal/ReferenceFile/map-2</td><td>2.0x</td><td>2.0x</td></tr>
|
<tr><td>Marshal/ReferenceFile/map-2</td><td>1.7x</td><td>2.1x</td></tr>
|
||||||
<tr><td>Marshal/ReferenceFile/struct-2</td><td>2.3x</td><td>2.5x</td></tr>
|
<tr><td>Marshal/ReferenceFile/struct-2</td><td>2.2x</td><td>3.0x</td></tr>
|
||||||
<tr><td>Unmarshal/HugoFrontMatter-2</td><td>3.3x</td><td>2.8x</td></tr>
|
<tr><td>Unmarshal/HugoFrontMatter-2</td><td>2.9x</td><td>2.7x</td></tr>
|
||||||
<tr><td>Unmarshal/ReferenceFile/map-2</td><td>2.9x</td><td>3.0x</td></tr>
|
<tr><td>Unmarshal/ReferenceFile/map-2</td><td>2.6x</td><td>2.7x</td></tr>
|
||||||
<tr><td>Unmarshal/ReferenceFile/struct-2</td><td>4.8x</td><td>5.0x</td></tr>
|
<tr><td>Unmarshal/ReferenceFile/struct-2</td><td>4.6x</td><td>5.1x</td></tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<details><summary>See more</summary>
|
<details><summary>See more</summary>
|
||||||
<p>The table above has the results of the most common use-cases. The table below
|
<p>The table above has the results of the most common use-cases. The table below
|
||||||
@@ -253,22 +253,22 @@ contains the results of all benchmarks, including unrealistic ones. It is
|
|||||||
provided for completeness.</p>
|
provided for completeness.</p>
|
||||||
|
|
||||||
<table>
|
<table>
|
||||||
<thead>
|
<thead>
|
||||||
<tr><th>Benchmark</th><th>go-toml v1</th><th>BurntSushi/toml</th></tr>
|
<tr><th>Benchmark</th><th>go-toml v1</th><th>BurntSushi/toml</th></tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr><td>Marshal/SimpleDocument/map-2</td><td>2.0x</td><td>2.9x</td></tr>
|
<tr><td>Marshal/SimpleDocument/map-2</td><td>1.8x</td><td>2.7x</td></tr>
|
||||||
<tr><td>Marshal/SimpleDocument/struct-2</td><td>2.5x</td><td>3.6x</td></tr>
|
<tr><td>Marshal/SimpleDocument/struct-2</td><td>2.7x</td><td>3.8x</td></tr>
|
||||||
<tr><td>Unmarshal/SimpleDocument/map-2</td><td>4.2x</td><td>3.4x</td></tr>
|
<tr><td>Unmarshal/SimpleDocument/map-2</td><td>3.8x</td><td>3.0x</td></tr>
|
||||||
<tr><td>Unmarshal/SimpleDocument/struct-2</td><td>5.9x</td><td>4.4x</td></tr>
|
<tr><td>Unmarshal/SimpleDocument/struct-2</td><td>5.6x</td><td>4.1x</td></tr>
|
||||||
<tr><td>UnmarshalDataset/example-2</td><td>3.2x</td><td>2.9x</td></tr>
|
<tr><td>UnmarshalDataset/example-2</td><td>3.0x</td><td>3.2x</td></tr>
|
||||||
<tr><td>UnmarshalDataset/code-2</td><td>2.4x</td><td>2.8x</td></tr>
|
<tr><td>UnmarshalDataset/code-2</td><td>2.3x</td><td>2.9x</td></tr>
|
||||||
<tr><td>UnmarshalDataset/twitter-2</td><td>2.7x</td><td>2.5x</td></tr>
|
<tr><td>UnmarshalDataset/twitter-2</td><td>2.6x</td><td>2.7x</td></tr>
|
||||||
<tr><td>UnmarshalDataset/citm_catalog-2</td><td>2.3x</td><td>2.3x</td></tr>
|
<tr><td>UnmarshalDataset/citm_catalog-2</td><td>2.2x</td><td>2.3x</td></tr>
|
||||||
<tr><td>UnmarshalDataset/canada-2</td><td>1.9x</td><td>1.5x</td></tr>
|
<tr><td>UnmarshalDataset/canada-2</td><td>1.8x</td><td>1.5x</td></tr>
|
||||||
<tr><td>UnmarshalDataset/config-2</td><td>5.4x</td><td>3.0x</td></tr>
|
<tr><td>UnmarshalDataset/config-2</td><td>4.1x</td><td>2.9x</td></tr>
|
||||||
<tr><td>geomean</td><td>2.9x</td><td>2.8x</td></tr>
|
<tr><td>geomean</td><td>2.7x</td><td>2.8x</td></tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<p>This table can be generated with <code>./ci.sh benchmark -a -html</code>.</p>
|
<p>This table can be generated with <code>./ci.sh benchmark -a -html</code>.</p>
|
||||||
</details>
|
</details>
|
||||||
@@ -281,7 +281,7 @@ Installation instructions:
|
|||||||
|
|
||||||
- Go ≥ 1.16: Nothing to do. Use the import in your code. The `go` command deals
|
- Go ≥ 1.16: Nothing to do. Use the import in your code. The `go` command deals
|
||||||
with it automatically.
|
with it automatically.
|
||||||
- Go ≥ 1.13: `GO111MODULE=on go get git.ostiwe.com/ostiwe/go-toml/v2`.
|
- Go ≥ 1.13: `GO111MODULE=on go get github.com/pelletier/go-toml/v2`.
|
||||||
|
|
||||||
In case of trouble: [Go Modules FAQ][mod-faq].
|
In case of trouble: [Go Modules FAQ][mod-faq].
|
||||||
|
|
||||||
@@ -294,21 +294,21 @@ Go-toml provides three handy command line tools:
|
|||||||
* `tomljson`: Reads a TOML file and outputs its JSON representation.
|
* `tomljson`: Reads a TOML file and outputs its JSON representation.
|
||||||
|
|
||||||
```
|
```
|
||||||
$ go install git.ostiwe.com/ostiwe/go-toml/v2/cmd/tomljson@latest
|
$ go install github.com/pelletier/go-toml/v2/cmd/tomljson@latest
|
||||||
$ tomljson --help
|
$ tomljson --help
|
||||||
```
|
```
|
||||||
|
|
||||||
* `jsontoml`: Reads a JSON file and outputs a TOML representation.
|
* `jsontoml`: Reads a JSON file and outputs a TOML representation.
|
||||||
|
|
||||||
```
|
```
|
||||||
$ go install git.ostiwe.com/ostiwe/go-toml/v2/cmd/jsontoml@latest
|
$ go install github.com/pelletier/go-toml/v2/cmd/jsontoml@latest
|
||||||
$ jsontoml --help
|
$ jsontoml --help
|
||||||
```
|
```
|
||||||
|
|
||||||
* `tomll`: Lints and reformats a TOML file.
|
* `tomll`: Lints and reformats a TOML file.
|
||||||
|
|
||||||
```
|
```
|
||||||
$ go install git.ostiwe.com/ostiwe/go-toml/v2/cmd/tomll@latest
|
$ go install github.com/pelletier/go-toml/v2/cmd/tomll@latest
|
||||||
$ tomll --help
|
$ tomll --help
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -323,7 +323,7 @@ docker run -i ghcr.io/pelletier/go-toml:v2 tomljson < example.toml
|
|||||||
|
|
||||||
Multiple versions are available on [ghcr.io][docker].
|
Multiple versions are available on [ghcr.io][docker].
|
||||||
|
|
||||||
[docker]: https://git.ostiwe.com/ostiwe/go-toml/pkgs/container/go-toml
|
[docker]: https://github.com/pelletier/go-toml/pkgs/container/go-toml
|
||||||
|
|
||||||
## Migrating from v1
|
## Migrating from v1
|
||||||
|
|
||||||
@@ -344,7 +344,7 @@ This could impact you if you are relying on casing to differentiate two fields,
|
|||||||
and one of them is a not using the `toml` struct tag. The recommended solution
|
and one of them is a not using the `toml` struct tag. The recommended solution
|
||||||
is to be specific about tag names for those fields using the `toml` struct tag.
|
is to be specific about tag names for those fields using the `toml` struct tag.
|
||||||
|
|
||||||
[v1-keys]: https://git.ostiwe.com/ostiwe/go-toml/blob/a2e52561804c6cd9392ebf0048ca64fe4af67a43/marshal.go#L775-L781
|
[v1-keys]: https://github.com/pelletier/go-toml/blob/a2e52561804c6cd9392ebf0048ca64fe4af67a43/marshal.go#L775-L781
|
||||||
|
|
||||||
#### Ignore preexisting value in interface
|
#### Ignore preexisting value in interface
|
||||||
|
|
||||||
@@ -544,7 +544,7 @@ fmt.Println("v2 Encoder:\n" + string(buf.Bytes()))
|
|||||||
// key = 'value'
|
// key = 'value'
|
||||||
```
|
```
|
||||||
|
|
||||||
[sit]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#Encoder.SetIndentTables
|
[sit]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#Encoder.SetIndentTables
|
||||||
|
|
||||||
#### Keys and strings are single quoted
|
#### Keys and strings are single quoted
|
||||||
|
|
||||||
@@ -608,7 +608,7 @@ added to make the encoder behave correctly. Given backward compatibility is not
|
|||||||
a problem anymore, v2 does the right thing by default: it follows the behavior
|
a problem anymore, v2 does the right thing by default: it follows the behavior
|
||||||
of `encoding/json`. `Encoder.PromoteAnonymous` has been removed.
|
of `encoding/json`. `Encoder.PromoteAnonymous` has been removed.
|
||||||
|
|
||||||
[nodoc]: https://git.ostiwe.com/ostiwe/go-toml/discussions/506#discussioncomment-1526038
|
[nodoc]: https://github.com/pelletier/go-toml/discussions/506#discussioncomment-1526038
|
||||||
|
|
||||||
### `query`
|
### `query`
|
||||||
|
|
||||||
@@ -620,7 +620,7 @@ This package has been removed because it was essentially not supported anymore
|
|||||||
(last commit May 2020), increased the complexity of the code base, and more
|
(last commit May 2020), increased the complexity of the code base, and more
|
||||||
complete solutions exist out there.
|
complete solutions exist out there.
|
||||||
|
|
||||||
[query]: https://git.ostiwe.com/ostiwe/go-toml/tree/f99d6bbca119636aeafcf351ee52b3d202782627/query
|
[query]: https://github.com/pelletier/go-toml/tree/f99d6bbca119636aeafcf351ee52b3d202782627/query
|
||||||
[dasel]: https://github.com/TomWright/dasel
|
[dasel]: https://github.com/TomWright/dasel
|
||||||
|
|
||||||
## Versioning
|
## Versioning
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
var benchInputs = []struct {
|
var benchInputs = []struct {
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestUnmarshalSimple(t *testing.T) {
|
func TestUnmarshalSimple(t *testing.T) {
|
||||||
|
|||||||
@@ -117,8 +117,8 @@ coverage() {
|
|||||||
|
|
||||||
target_diff="${output_dir}/target.diff.txt"
|
target_diff="${output_dir}/target.diff.txt"
|
||||||
head_diff="${output_dir}/head.diff.txt"
|
head_diff="${output_dir}/head.diff.txt"
|
||||||
cat "${target_out}" | grep -E '^git.ostiwe.com/ostiwe/go-toml' | tr -s "\t " | cut -f 2,3 | sort > "${target_diff}"
|
cat "${target_out}" | grep -E '^github.com/pelletier/go-toml' | tr -s "\t " | cut -f 2,3 | sort > "${target_diff}"
|
||||||
cat "${head_out}" | grep -E '^git.ostiwe.com/ostiwe/go-toml' | tr -s "\t " | cut -f 2,3 | sort > "${head_diff}"
|
cat "${head_out}" | grep -E '^github.com/pelletier/go-toml' | tr -s "\t " | cut -f 2,3 | sort > "${head_diff}"
|
||||||
|
|
||||||
diff --side-by-side --suppress-common-lines "${target_diff}" "${head_diff}"
|
diff --side-by-side --suppress-common-lines "${target_diff}" "${head_diff}"
|
||||||
return 1
|
return 1
|
||||||
@@ -147,7 +147,7 @@ bench() {
|
|||||||
pushd "$dir"
|
pushd "$dir"
|
||||||
|
|
||||||
if [ "${replace}" != "" ]; then
|
if [ "${replace}" != "" ]; then
|
||||||
find ./benchmark/ -iname '*.go' -exec sed -i -E "s|git.ostiwe.com/ostiwe/go-toml/v2\"|${replace}\"|g" {} \;
|
find ./benchmark/ -iname '*.go' -exec sed -i -E "s|github.com/pelletier/go-toml/v2|${replace}|g" {} \;
|
||||||
go get "${replace}"
|
go get "${replace}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -195,11 +195,6 @@ for line in reversed(lines[2:]):
|
|||||||
"%.1fx" % (float(line[3])/v2), # v1
|
"%.1fx" % (float(line[3])/v2), # v1
|
||||||
"%.1fx" % (float(line[7])/v2), # bs
|
"%.1fx" % (float(line[7])/v2), # bs
|
||||||
])
|
])
|
||||||
|
|
||||||
if not results:
|
|
||||||
print("No benchmark results to display.", file=sys.stderr)
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
# move geomean to the end
|
# move geomean to the end
|
||||||
results.append(results[0])
|
results.append(results[0])
|
||||||
del results[0]
|
del results[0]
|
||||||
@@ -257,9 +252,9 @@ benchmark() {
|
|||||||
shift
|
shift
|
||||||
|
|
||||||
v2stats=`fmktemp go-toml-v2`
|
v2stats=`fmktemp go-toml-v2`
|
||||||
bench HEAD "${v2stats}" "git.ostiwe.com/ostiwe/go-toml/v2"
|
bench HEAD "${v2stats}" "github.com/pelletier/go-toml/v2"
|
||||||
v1stats=`fmktemp go-toml-v1`
|
v1stats=`fmktemp go-toml-v1`
|
||||||
bench HEAD "${v1stats}" "git.ostiwe.com/ostiwe/go-toml"
|
bench HEAD "${v1stats}" "github.com/pelletier/go-toml"
|
||||||
bsstats=`fmktemp bs-toml`
|
bsstats=`fmktemp bs-toml`
|
||||||
bench HEAD "${bsstats}" "github.com/BurntSushi/toml"
|
bench HEAD "${bsstats}" "github.com/BurntSushi/toml"
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/testsuite"
|
"github.com/pelletier/go-toml/v2/internal/testsuite"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/testsuite"
|
"github.com/pelletier/go-toml/v2/internal/testsuite"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
//
|
//
|
||||||
// Using Go:
|
// Using Go:
|
||||||
//
|
//
|
||||||
// go install git.ostiwe.com/ostiwe/go-toml/v2/cmd/jsontoml@latest
|
// go install github.com/pelletier/go-toml/v2/cmd/jsontoml@latest
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -22,8 +22,8 @@ import (
|
|||||||
"flag"
|
"flag"
|
||||||
"io"
|
"io"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/cli"
|
"github.com/pelletier/go-toml/v2/internal/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
const usage = `jsontoml can be used in two ways:
|
const usage = `jsontoml can be used in two ways:
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestConvert(t *testing.T) {
|
func TestConvert(t *testing.T) {
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
//
|
//
|
||||||
// Using Go:
|
// Using Go:
|
||||||
//
|
//
|
||||||
// go install git.ostiwe.com/ostiwe/go-toml/v2/cmd/tomljson@latest
|
// go install github.com/pelletier/go-toml/v2/cmd/tomljson@latest
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -23,8 +23,8 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/cli"
|
"github.com/pelletier/go-toml/v2/internal/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
const usage = `tomljson can be used in two ways:
|
const usage = `tomljson can be used in two ways:
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestConvert(t *testing.T) {
|
func TestConvert(t *testing.T) {
|
||||||
|
|||||||
+3
-3
@@ -14,14 +14,14 @@
|
|||||||
//
|
//
|
||||||
// Using Go:
|
// Using Go:
|
||||||
//
|
//
|
||||||
// go install git.ostiwe.com/ostiwe/go-toml/v2/cmd/tomll@latest
|
// go install github.com/pelletier/go-toml/v2/cmd/tomll@latest
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"io"
|
"io"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/cli"
|
"github.com/pelletier/go-toml/v2/internal/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
const usage = `tomll can be used in two ways:
|
const usage = `tomll can be used in two ways:
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestConvert(t *testing.T) {
|
func TestConvert(t *testing.T) {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
//
|
//
|
||||||
// Within the go-toml package, run `go generate`. Otherwise, use:
|
// Within the go-toml package, run `go generate`. Otherwise, use:
|
||||||
//
|
//
|
||||||
// go run git.ostiwe.com/ostiwe/go-toml/cmd/tomltestgen -o toml_testgen_test.go
|
// go run github.com/pelletier/go-toml/cmd/tomltestgen -o toml_testgen_test.go
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
|
"github.com/pelletier/go-toml/v2/unstable"
|
||||||
)
|
)
|
||||||
|
|
||||||
func parseInteger(b []byte) (int64, error) {
|
func parseInteger(b []byte) (int64, error) {
|
||||||
@@ -258,7 +258,7 @@ func parseLocalTime(b []byte) (LocalTime, []byte, error) {
|
|||||||
// to the supported precision and ignores the
|
// to the supported precision and ignores the
|
||||||
// remaining digits.
|
// remaining digits.
|
||||||
//
|
//
|
||||||
// https://git.ostiwe.com/ostiwe/go-toml/discussions/707
|
// https://github.com/pelletier/go-toml/discussions/707
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
|
"github.com/pelletier/go-toml/v2/unstable"
|
||||||
)
|
)
|
||||||
|
|
||||||
// DecodeError represents an error encountered during the parsing or decoding
|
// DecodeError represents an error encountered during the parsing or decoding
|
||||||
|
|||||||
+2
-8
@@ -7,8 +7,8 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
|
"github.com/pelletier/go-toml/v2/unstable"
|
||||||
)
|
)
|
||||||
|
|
||||||
//nolint:funlen
|
//nolint:funlen
|
||||||
@@ -259,12 +259,6 @@ func TestDecodeError_Position(t *testing.T) {
|
|||||||
expectedRow: 3,
|
expectedRow: 3,
|
||||||
minCol: 5,
|
minCol: 5,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
name: "missing equals on last line without trailing newline",
|
|
||||||
doc: "a = 1\nb = 2\nc",
|
|
||||||
expectedRow: 3,
|
|
||||||
minCol: 1,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, e := range examples {
|
for _, e := range examples {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"log"
|
"log"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
type customInt int
|
type customInt int
|
||||||
|
|||||||
+2
-2
@@ -3,8 +3,8 @@ package toml_test
|
|||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestFastSimpleInt(t *testing.T) {
|
func TestFastSimpleInt(t *testing.T) {
|
||||||
|
|||||||
+2
-2
@@ -5,8 +5,8 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func FuzzUnmarshal(f *testing.F) {
|
func FuzzUnmarshal(f *testing.F) {
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
module git.ostiwe.com/ostiwe/go-toml/v2
|
module github.com/pelletier/go-toml/v2
|
||||||
|
|
||||||
go 1.21.0
|
go 1.21.0
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ConvertFn func(r io.Reader, w io.Writer) error
|
type ConvertFn func(r io.Reader, w io.Writer) error
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func processMain(args []string, input io.Reader, stdout, stderr io.Writer, f ConvertFn) int {
|
func processMain(args []string, input io.Reader, stdout, stderr io.Writer, f ConvertFn) int {
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestDocMarshal(t *testing.T) {
|
func TestDocMarshal(t *testing.T) {
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
type basicMarshalTestStruct struct {
|
type basicMarshalTestStruct struct {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
// addTag adds JSON tags to a data structure as expected by toml-test.
|
// addTag adds JSON tags to a data structure as expected by toml-test.
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Remove JSON tags to a data structure as returned by toml-test.
|
// Remove JSON tags to a data structure as returned by toml-test.
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Marshal is a helper function for calling toml.Marshal
|
// Marshal is a helper function for calling toml.Marshal
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package tracker
|
package tracker
|
||||||
|
|
||||||
import "git.ostiwe.com/ostiwe/go-toml/v2/unstable"
|
import "github.com/pelletier/go-toml/v2/unstable"
|
||||||
|
|
||||||
// KeyTracker is a tracker that keeps track of the current Key as the AST is
|
// KeyTracker is a tracker that keeps track of the current Key as the AST is
|
||||||
// walked.
|
// walked.
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
|
"github.com/pelletier/go-toml/v2/unstable"
|
||||||
)
|
)
|
||||||
|
|
||||||
type keyKind uint8
|
type keyKind uint8
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import (
|
|||||||
"reflect"
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestEntrySize(t *testing.T) {
|
func TestEntrySize(t *testing.T) {
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
|
"github.com/pelletier/go-toml/v2/unstable"
|
||||||
)
|
)
|
||||||
|
|
||||||
// LocalDate represents a calendar day in no specific timezone.
|
// LocalDate represents a calendar day in no specific timezone.
|
||||||
|
|||||||
+2
-2
@@ -4,8 +4,8 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestLocalDate_AsTime(t *testing.T) {
|
func TestLocalDate_AsTime(t *testing.T) {
|
||||||
|
|||||||
+13
-16
@@ -15,7 +15,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
"unicode"
|
"unicode"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/characters"
|
"github.com/pelletier/go-toml/v2/internal/characters"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Marshal serializes a Go value as a TOML document.
|
// Marshal serializes a Go value as a TOML document.
|
||||||
@@ -271,7 +271,7 @@ func (enc *Encoder) encode(b []byte, ctx encoderCtx, v reflect.Value) ([]byte, e
|
|||||||
return append(b, x.String()...), nil
|
return append(b, x.String()...), nil
|
||||||
case json.Number:
|
case json.Number:
|
||||||
if enc.marshalJSONNumbers {
|
if enc.marshalJSONNumbers {
|
||||||
if x == "" { // / Useful zero value.
|
if x == "" { /// Useful zero value.
|
||||||
return append(b, "0"...), nil
|
return append(b, "0"...), nil
|
||||||
} else if v, err := x.Int64(); err == nil {
|
} else if v, err := x.Int64(); err == nil {
|
||||||
return enc.encode(b, ctx, reflect.ValueOf(v))
|
return enc.encode(b, ctx, reflect.ValueOf(v))
|
||||||
@@ -704,18 +704,15 @@ func (enc *Encoder) encodeMap(b []byte, ctx encoderCtx, v reflect.Value) ([]byte
|
|||||||
for iter.Next() {
|
for iter.Next() {
|
||||||
v := iter.Value()
|
v := iter.Value()
|
||||||
|
|
||||||
// Handle nil values: convert nil pointers to zero value,
|
if isNil(v) {
|
||||||
// skip nil interfaces and nil maps.
|
// For nil pointers, convert to zero value of the element type.
|
||||||
switch v.Kind() {
|
// This allows round-trip marshaling of maps with nil pointer values.
|
||||||
case reflect.Ptr:
|
// For nil interfaces and nil maps, skip since we can't derive a type.
|
||||||
if v.IsNil() {
|
if v.Kind() == reflect.Ptr {
|
||||||
v = reflect.Zero(v.Type().Elem())
|
v = reflect.Zero(v.Type().Elem())
|
||||||
}
|
} else {
|
||||||
case reflect.Interface, reflect.Map:
|
|
||||||
if v.IsNil() {
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
default:
|
|
||||||
}
|
}
|
||||||
|
|
||||||
k, err := enc.keyToString(iter.Key())
|
k, err := enc.keyToString(iter.Key())
|
||||||
@@ -939,7 +936,7 @@ func (enc *Encoder) encodeTable(b []byte, ctx encoderCtx, t table) ([]byte, erro
|
|||||||
if shouldOmitEmpty(kv.Options, kv.Value) {
|
if shouldOmitEmpty(kv.Options, kv.Value) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if kv.Options.omitzero && shouldOmitZero(kv.Options, kv.Value) {
|
if shouldOmitZero(kv.Options, kv.Value) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
hasNonEmptyKV = true
|
hasNonEmptyKV = true
|
||||||
@@ -961,7 +958,7 @@ func (enc *Encoder) encodeTable(b []byte, ctx encoderCtx, t table) ([]byte, erro
|
|||||||
if shouldOmitEmpty(table.Options, table.Value) {
|
if shouldOmitEmpty(table.Options, table.Value) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if table.Options.omitzero && shouldOmitZero(table.Options, table.Value) {
|
if shouldOmitZero(table.Options, table.Value) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if first {
|
if first {
|
||||||
@@ -998,7 +995,7 @@ func (enc *Encoder) encodeTableInline(b []byte, ctx encoderCtx, t table) ([]byte
|
|||||||
if shouldOmitEmpty(kv.Options, kv.Value) {
|
if shouldOmitEmpty(kv.Options, kv.Value) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if kv.Options.omitzero && shouldOmitZero(kv.Options, kv.Value) {
|
if shouldOmitZero(kv.Options, kv.Value) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1110,7 +1107,7 @@ func (enc *Encoder) encodeSliceAsArrayTable(b []byte, ctx encoderCtx, v reflect.
|
|||||||
scratch = enc.indent(ctx.indent, scratch)
|
scratch = enc.indent(ctx.indent, scratch)
|
||||||
}
|
}
|
||||||
|
|
||||||
scratch = append(scratch, "["...)
|
scratch = append(scratch, "[["...)
|
||||||
|
|
||||||
for i, k := range ctx.parentKey {
|
for i, k := range ctx.parentKey {
|
||||||
if i > 0 {
|
if i > 0 {
|
||||||
@@ -1120,7 +1117,7 @@ func (enc *Encoder) encodeSliceAsArrayTable(b []byte, ctx encoderCtx, v reflect.
|
|||||||
scratch = enc.encodeKey(scratch, k)
|
scratch = enc.encodeKey(scratch, k)
|
||||||
}
|
}
|
||||||
|
|
||||||
scratch = append(scratch, "]\n"...)
|
scratch = append(scratch, "]]\n"...)
|
||||||
ctx.skipTableHeader = true
|
ctx.skipTableHeader = true
|
||||||
|
|
||||||
b = enc.encodeComment(ctx.indent, ctx.options.comment, b)
|
b = enc.encodeComment(ctx.indent, ctx.options.comment, b)
|
||||||
|
|||||||
+3
-3
@@ -13,8 +13,8 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
type marshalTextKey struct {
|
type marshalTextKey struct {
|
||||||
@@ -2220,7 +2220,7 @@ port = 4242
|
|||||||
|
|
||||||
// TestMarshalIssue975 tests that nil pointer values in maps are marshaled as
|
// TestMarshalIssue975 tests that nil pointer values in maps are marshaled as
|
||||||
// empty tables, allowing round-trip marshaling to work correctly.
|
// empty tables, allowing round-trip marshaling to work correctly.
|
||||||
// See https://git.ostiwe.com/ostiwe/go-toml/issues/975
|
// See https://github.com/pelletier/go-toml/issues/975
|
||||||
func TestMarshalIssue975(t *testing.T) {
|
func TestMarshalIssue975(t *testing.T) {
|
||||||
// Test case from the issue: map[string]*struct{}
|
// Test case from the issue: map[string]*struct{}
|
||||||
oldMap := map[string]*struct{}{
|
oldMap := map[string]*struct{}{
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@ import (
|
|||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
// FuzzToml is the fuzzing target.
|
// FuzzToml is the fuzzing target.
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
package toml
|
package toml
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/tracker"
|
"github.com/pelletier/go-toml/v2/internal/tracker"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
|
"github.com/pelletier/go-toml/v2/unstable"
|
||||||
)
|
)
|
||||||
|
|
||||||
type strict struct {
|
type strict struct {
|
||||||
|
|||||||
+4
-5
@@ -9,7 +9,7 @@ YELLOW='\033[1;33m'
|
|||||||
BLUE='\033[0;34m'
|
BLUE='\033[0;34m'
|
||||||
NC='\033[0m' # No Color
|
NC='\033[0m' # No Color
|
||||||
|
|
||||||
# Go versions to test (1.11 through 1.26)
|
# Go versions to test (1.11 through 1.25)
|
||||||
GO_VERSIONS=(
|
GO_VERSIONS=(
|
||||||
"1.11"
|
"1.11"
|
||||||
"1.12"
|
"1.12"
|
||||||
@@ -26,7 +26,6 @@ GO_VERSIONS=(
|
|||||||
"1.23"
|
"1.23"
|
||||||
"1.24"
|
"1.24"
|
||||||
"1.25"
|
"1.25"
|
||||||
"1.26"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# Default values
|
# Default values
|
||||||
@@ -65,7 +64,7 @@ EXAMPLES:
|
|||||||
$0 # Test all Go versions in parallel
|
$0 # Test all Go versions in parallel
|
||||||
$0 --sequential # Test all Go versions sequentially
|
$0 --sequential # Test all Go versions sequentially
|
||||||
$0 1.21 1.22 1.23 # Test specific versions
|
$0 1.21 1.22 1.23 # Test specific versions
|
||||||
$0 --verbose --output ./results 1.25 1.26 # Verbose output to custom directory
|
$0 --verbose --output ./results 1.24 1.25 # Verbose output to custom directory
|
||||||
|
|
||||||
EXIT CODES:
|
EXIT CODES:
|
||||||
0 Recent Go versions pass (good compatibility)
|
0 Recent Go versions pass (good compatibility)
|
||||||
@@ -137,8 +136,8 @@ fi
|
|||||||
|
|
||||||
# Validate Go versions
|
# Validate Go versions
|
||||||
for version in "${GO_VERSIONS[@]}"; do
|
for version in "${GO_VERSIONS[@]}"; do
|
||||||
if ! [[ "$version" =~ ^1\.(1[1-9]|2[0-6])$ ]]; then
|
if ! [[ "$version" =~ ^1\.(1[1-9]|2[0-5])$ ]]; then
|
||||||
log_error "Invalid Go version: $version. Supported versions: 1.11-1.26"
|
log_error "Invalid Go version: $version. Supported versions: 1.11-1.25"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -8,9 +8,9 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/testsuite"
|
"github.com/pelletier/go-toml/v2/internal/testsuite"
|
||||||
)
|
)
|
||||||
|
|
||||||
func testgenInvalid(t *testing.T, input string) {
|
func testgenInvalid(t *testing.T, input string) {
|
||||||
|
|||||||
+2
-2
@@ -12,8 +12,8 @@ import (
|
|||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/tracker"
|
"github.com/pelletier/go-toml/v2/internal/tracker"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
|
"github.com/pelletier/go-toml/v2/unstable"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Unmarshal deserializes a TOML document into a Go value.
|
// Unmarshal deserializes a TOML document into a Go value.
|
||||||
|
|||||||
+3
-3
@@ -11,9 +11,9 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2"
|
"github.com/pelletier/go-toml/v2"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
|
"github.com/pelletier/go-toml/v2/unstable"
|
||||||
)
|
)
|
||||||
|
|
||||||
type unmarshalTextKey struct {
|
type unmarshalTextKey struct {
|
||||||
|
|||||||
+3
-7
@@ -28,16 +28,12 @@ func (c *Iterator) Next() bool {
|
|||||||
if c.nodes == nil {
|
if c.nodes == nil {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
nodes := *c.nodes
|
|
||||||
if !c.started {
|
if !c.started {
|
||||||
c.started = true
|
c.started = true
|
||||||
} else {
|
} else if c.idx >= 0 {
|
||||||
idx := c.idx
|
c.idx = (*c.nodes)[c.idx].next
|
||||||
if idx >= 0 && int(idx) < len(nodes) {
|
|
||||||
c.idx = nodes[idx].next
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return c.idx >= 0 && int(c.idx) < len(nodes)
|
return c.idx >= 0 && int(c.idx) < len(*c.nodes)
|
||||||
}
|
}
|
||||||
|
|
||||||
// IsLast returns true if the current node of the iterator is the last
|
// IsLast returns true if the current node of the iterator is the last
|
||||||
|
|||||||
+5
-6
@@ -5,7 +5,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"unicode"
|
"unicode"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/characters"
|
"github.com/pelletier/go-toml/v2/internal/characters"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ParserError describes an error relative to the content of the document.
|
// ParserError describes an error relative to the content of the document.
|
||||||
@@ -345,7 +345,7 @@ func (p *Parser) parseKeyval(b []byte) (reference, []byte, error) {
|
|||||||
b = p.parseWhitespace(b)
|
b = p.parseWhitespace(b)
|
||||||
|
|
||||||
if len(b) == 0 {
|
if len(b) == 0 {
|
||||||
return invalidReference, nil, NewParserError(startB[:len(startB)-len(b)], "expected = after a key, but the document ends there")
|
return invalidReference, nil, NewParserError(b, "expected = after a key, but the document ends there")
|
||||||
}
|
}
|
||||||
|
|
||||||
b, err = expect('=', b)
|
b, err = expect('=', b)
|
||||||
@@ -363,10 +363,9 @@ func (p *Parser) parseKeyval(b []byte) (reference, []byte, error) {
|
|||||||
p.builder.Chain(valRef, key)
|
p.builder.Chain(valRef, key)
|
||||||
p.builder.AttachChild(ref, valRef)
|
p.builder.AttachChild(ref, valRef)
|
||||||
|
|
||||||
// Set Raw to span the entire key-value expression.
|
// Set Raw to span the entire key-value expression
|
||||||
// Access the node directly in the slice to avoid the write barrier
|
node := p.builder.NodeAt(ref)
|
||||||
// that NodeAt's nodes-pointer setup would trigger.
|
node.Raw = p.rangeOfToken(startB[:len(startB)-len(b)], b)
|
||||||
p.builder.tree.nodes[ref].Raw = p.rangeOfToken(startB[:len(startB)-len(b)], b)
|
|
||||||
|
|
||||||
return ref, b, err
|
return ref, b, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
|
"github.com/pelletier/go-toml/v2/internal/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestParser_AST_Numbers(t *testing.T) {
|
func TestParser_AST_Numbers(t *testing.T) {
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
package unstable
|
package unstable
|
||||||
|
|
||||||
import "git.ostiwe.com/ostiwe/go-toml/v2/internal/characters"
|
import "github.com/pelletier/go-toml/v2/internal/characters"
|
||||||
|
|
||||||
func scanFollows(b []byte, pattern string) bool {
|
func scanFollows(b []byte, pattern string) bool {
|
||||||
n := len(pattern)
|
n := len(pattern)
|
||||||
|
|||||||
Reference in New Issue
Block a user