update module

* Reduce marshal and unmarshal overhead

Targeted optimizations to reduce performance overhead introduced by
recent feature additions and the unsafe removal.

Unmarshal:
- parseKeyval: access the node directly in the builder's slice to set
  Raw, bypassing NodeAt which triggers a GC write barrier for the
  nodes-pointer on every key-value expression.
- Iterator.Next: cache the *nodes slice dereference in a local variable
  to avoid repeated pointer-to-slice indirection in the hot loop.

Marshal:
- Guard shouldOmitZero calls with an inlineable options.omitzero check.
  shouldOmitZero has inlining cost 1145 (budget 80), so avoiding the
  function call when omitzero is not set removes per-field overhead.
- Inline the isNil check in encodeMap. isNil has inlining cost 93
  (budget 80), so expanding it at the single hot call site avoids
  per-map-entry function call overhead.

Update README benchmarks.

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,7 +5,7 @@ Thank you for your pull request!
 Please read the Code changes section of the CONTRIBUTING.md file,
 and make sure you have followed the instructions.
 
-https://github.com/pelletier/go-toml/blob/v2/CONTRIBUTING.md#code-changes
+https://git.ostiwe.com/ostiwe/go-toml/blob/v2/CONTRIBUTING.md#code-changes
 
 -->
 

.github/workflows/cifuzz.yml

@@ -19,7 +19,7 @@ jobs:
         dry-run: false
         language: go
     - name: Upload Crash
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

.github/workflows/coverage.yml

@@ -15,6 +15,6 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v6
         with:
-          go-version: "1.25"
+          go-version: "1.26"
       - name: Run tests with coverage
         run: ./ci.sh coverage -d "${GITHUB_BASE_REF-HEAD}"

.github/workflows/go-versions-test.yml

@@ -20,7 +20,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Run Go versions compatibility test
         run: |
@@ -28,7 +28,7 @@ jobs:
           ./test-go-versions.sh --output ./test-results $VERSIONS
 
       - name: Upload test results
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: go-versions-test-results
           path: |

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v6
         with:
-          go-version: "1.24"
+          go-version: "1.26"
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v9
         with:

.github/workflows/release.yml

@@ -22,15 +22,15 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
-          go-version: "1.25"
+          go-version: "1.26"
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v6
+        uses: goreleaser/goreleaser-action@v7
         with:
           distribution: goreleaser
           version: '~> v2'

.github/workflows/workflow.yml

@@ -10,9 +10,10 @@ on:
 jobs:
   build:
     strategy:
+      fail-fast: false
       matrix:
         os: [ 'ubuntu-latest', 'windows-latest', 'macos-latest', 'macos-14' ]
-        go: [ '1.24', '1.25' ]
+        go: [ '1.25', '1.26' ]
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.go }}/${{ matrix.os }}
     steps:

.goreleaser.yaml

@@ -22,7 +22,6 @@ builds:
       - linux_riscv64
       - windows_amd64
       - windows_arm64
-      - windows_arm
       - darwin_amd64
       - darwin_arm64
   - id: tomljson
@@ -42,7 +41,6 @@ builds:
       - linux_riscv64
       - windows_amd64
       - windows_arm64
-      - windows_arm
       - darwin_amd64
       - darwin_arm64
   - id: jsontoml
@@ -62,7 +60,6 @@ builds:
       - linux_arm
       - windows_amd64
       - windows_arm64
-      - windows_arm
       - darwin_amd64
       - darwin_arm64
 universal_binaries:

CONTRIBUTING.md

@@ -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
 away!
 
-[discussions]: https://github.com/pelletier/go-toml/discussions
+[discussions]: https://git.ostiwe.com/ostiwe/go-toml/discussions
 
 ## Improve the documentation
 
@@ -224,12 +224,12 @@ Checklist:
 5. If new version is an alpha or beta only, check pre-release box.
 
 
-[issues-tracker]: https://github.com/pelletier/go-toml/issues
+[issues-tracker]: https://git.ostiwe.com/ostiwe/go-toml/issues
-[bug-report]: https://github.com/pelletier/go-toml/issues/new?template=bug_report.md
+[bug-report]: https://git.ostiwe.com/ostiwe/go-toml/issues/new?template=bug_report.md
-[pkg.go.dev]: https://pkg.go.dev/github.com/pelletier/go-toml
+[pkg.go.dev]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml
 [readme]: ./README.md
 [fork]: https://help.github.com/articles/fork-a-repo
 [pull-request]: https://help.github.com/en/articles/creating-a-pull-request
-[new-release]: https://github.com/pelletier/go-toml/releases/new
+[new-release]: https://git.ostiwe.com/ostiwe/go-toml/releases/new
 [gh]: https://github.com/cli/cli
-[pr-labels]: https://github.com/pelletier/go-toml/blob/v2/.github/release.yml
+[pr-labels]: https://git.ostiwe.com/ostiwe/go-toml/blob/v2/.github/release.yml

README.md

@@ -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).
 
-[🐞 Bug Reports](https://github.com/pelletier/go-toml/issues)
+[🐞 Bug Reports](https://git.ostiwe.com/ostiwe/go-toml/issues)
 
-[💬 Anything else](https://github.com/pelletier/go-toml/discussions)
+[💬 Anything else](https://git.ostiwe.com/ostiwe/go-toml/discussions)
 
 ## Documentation
 
 Full API, examples, and implementation notes are available in the Go
 documentation.
 
-[![Go Reference](https://pkg.go.dev/badge/github.com/pelletier/go-toml/v2.svg)](https://pkg.go.dev/github.com/pelletier/go-toml/v2)
+[![Go Reference](https://pkg.go.dev/badge/git.ostiwe.com/ostiwe/go-toml/v2.svg)](https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2)
 
 ## Import
 
 ```go
-import "github.com/pelletier/go-toml/v2"
+import "git.ostiwe.com/ostiwe/go-toml/v2"
 ```
 
 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
 to check for typos. [See example in the documentation][strict].
 
-[strict]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#example-Decoder.DisallowUnknownFields
+[strict]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#example-Decoder.DisallowUnknownFields
 
 ### Contextualized errors
 
@@ -56,7 +56,7 @@ example:
 3| port = 50
 ```
 
-[decode-err]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#DecodeError
+[decode-err]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#DecodeError
 
 ### Local date and time support
 
@@ -68,9 +68,9 @@ making them convenient yet unambiguous structures for their respective TOML
 representation.
 
 [ldt]: https://toml.io/en/v1.0.0#local-date-time
-[tld]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#LocalDate
+[tld]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#LocalDate
-[tlt]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#LocalTime
+[tlt]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#LocalTime
-[tldt]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#LocalDateTime
+[tldt]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#LocalDateTime
 
 ### Commented config
 
@@ -90,7 +90,7 @@ port = 4242
 # version = 'TLS 1.3'
 ```
 
-[comments-example]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#example-Marshal-Commented
+[comments-example]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#example-Marshal-Commented
 
 ## Getting started
 
@@ -135,7 +135,7 @@ fmt.Println("tags:", cfg.Tags)
 // tags: [go toml]
 ```
 
-[unmarshal]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#Unmarshal
+[unmarshal]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#Unmarshal
 
 
 Here is an example using tables with some simple nesting:
@@ -217,7 +217,7 @@ fmt.Println(string(b))
 // Tags = ['go', 'toml']
 ```
 
-[marshal]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#Marshal
+[marshal]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#Marshal
 
 ## Unstable API
 
@@ -228,7 +228,7 @@ API subject to change.
 ### Parser
 
 Parser is the unstable API that allows iterative parsing of a TOML document at
-the AST level. See https://pkg.go.dev/github.com/pelletier/go-toml/v2/unstable.
+the AST level. See https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2/unstable.
 
 ## Benchmarks
 
@@ -239,12 +239,12 @@ Execution time speedup compared to other Go TOML libraries:
         <tr><th>Benchmark</th><th>go-toml v1</th><th>BurntSushi/toml</th></tr>
     </thead>
     <tbody>
-		<tr><td>Marshal/HugoFrontMatter-2</td><td>1.9x</td><td>2.2x</td></tr>
+        <tr><td>Marshal/HugoFrontMatter-2</td><td>2.1x</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/map-2</td><td>2.0x</td><td>2.0x</td></tr>
-		<tr><td>Marshal/ReferenceFile/struct-2</td><td>2.2x</td><td>3.0x</td></tr>
+        <tr><td>Marshal/ReferenceFile/struct-2</td><td>2.3x</td><td>2.5x</td></tr>
-		<tr><td>Unmarshal/HugoFrontMatter-2</td><td>2.9x</td><td>2.7x</td></tr>
+        <tr><td>Unmarshal/HugoFrontMatter-2</td><td>3.3x</td><td>2.8x</td></tr>
-		<tr><td>Unmarshal/ReferenceFile/map-2</td><td>2.6x</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/struct-2</td><td>4.6x</td><td>5.1x</td></tr>
+        <tr><td>Unmarshal/ReferenceFile/struct-2</td><td>4.8x</td><td>5.0x</td></tr>
      </tbody>
 </table>
 <details><summary>See more</summary>
@@ -257,17 +257,17 @@ provided for completeness.</p>
         <tr><th>Benchmark</th><th>go-toml v1</th><th>BurntSushi/toml</th></tr>
     </thead>
     <tbody>
-		<tr><td>Marshal/SimpleDocument/map-2</td><td>1.8x</td><td>2.7x</td></tr>
+        <tr><td>Marshal/SimpleDocument/map-2</td><td>2.0x</td><td>2.9x</td></tr>
-		<tr><td>Marshal/SimpleDocument/struct-2</td><td>2.7x</td><td>3.8x</td></tr>
+        <tr><td>Marshal/SimpleDocument/struct-2</td><td>2.5x</td><td>3.6x</td></tr>
-		<tr><td>Unmarshal/SimpleDocument/map-2</td><td>3.8x</td><td>3.0x</td></tr>
+        <tr><td>Unmarshal/SimpleDocument/map-2</td><td>4.2x</td><td>3.4x</td></tr>
-		<tr><td>Unmarshal/SimpleDocument/struct-2</td><td>5.6x</td><td>4.1x</td></tr>
+        <tr><td>Unmarshal/SimpleDocument/struct-2</td><td>5.9x</td><td>4.4x</td></tr>
-		<tr><td>UnmarshalDataset/example-2</td><td>3.0x</td><td>3.2x</td></tr>
+        <tr><td>UnmarshalDataset/example-2</td><td>3.2x</td><td>2.9x</td></tr>
-		<tr><td>UnmarshalDataset/code-2</td><td>2.3x</td><td>2.9x</td></tr>
+        <tr><td>UnmarshalDataset/code-2</td><td>2.4x</td><td>2.8x</td></tr>
-		<tr><td>UnmarshalDataset/twitter-2</td><td>2.6x</td><td>2.7x</td></tr>
+        <tr><td>UnmarshalDataset/twitter-2</td><td>2.7x</td><td>2.5x</td></tr>
-		<tr><td>UnmarshalDataset/citm_catalog-2</td><td>2.2x</td><td>2.3x</td></tr>
+        <tr><td>UnmarshalDataset/citm_catalog-2</td><td>2.3x</td><td>2.3x</td></tr>
-		<tr><td>UnmarshalDataset/canada-2</td><td>1.8x</td><td>1.5x</td></tr>
+        <tr><td>UnmarshalDataset/canada-2</td><td>1.9x</td><td>1.5x</td></tr>
-		<tr><td>UnmarshalDataset/config-2</td><td>4.1x</td><td>2.9x</td></tr>
+        <tr><td>UnmarshalDataset/config-2</td><td>5.4x</td><td>3.0x</td></tr>
-		<tr><td>geomean</td><td>2.7x</td><td>2.8x</td></tr>
+        <tr><td>geomean</td><td>2.9x</td><td>2.8x</td></tr>
      </tbody>
 </table>
 <p>This table can be generated with <code>./ci.sh benchmark -a -html</code>.</p>
@@ -281,7 +281,7 @@ Installation instructions:
 
 - Go ≥ 1.16: Nothing to do. Use the import in your code. The `go` command deals
   with it automatically.
-- Go ≥ 1.13: `GO111MODULE=on go get github.com/pelletier/go-toml/v2`.
+- Go ≥ 1.13: `GO111MODULE=on go get git.ostiwe.com/ostiwe/go-toml/v2`.
 
 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.
 
 	```
-	$ go install github.com/pelletier/go-toml/v2/cmd/tomljson@latest
+	$ go install git.ostiwe.com/ostiwe/go-toml/v2/cmd/tomljson@latest
 	$ tomljson --help
 	```
 
  * `jsontoml`: Reads a JSON file and outputs a TOML representation.
 
 	```
-	$ go install github.com/pelletier/go-toml/v2/cmd/jsontoml@latest
+	$ go install git.ostiwe.com/ostiwe/go-toml/v2/cmd/jsontoml@latest
 	$ jsontoml --help
 	```
 
  * `tomll`: Lints and reformats a TOML file.
 
 	```
-	$ go install github.com/pelletier/go-toml/v2/cmd/tomll@latest
+	$ go install git.ostiwe.com/ostiwe/go-toml/v2/cmd/tomll@latest
 	$ 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].
 
-[docker]: https://github.com/pelletier/go-toml/pkgs/container/go-toml
+[docker]: https://git.ostiwe.com/ostiwe/go-toml/pkgs/container/go-toml
 
 ## 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
 is to be specific about tag names for those fields using the `toml` struct tag.
 
-[v1-keys]: https://github.com/pelletier/go-toml/blob/a2e52561804c6cd9392ebf0048ca64fe4af67a43/marshal.go#L775-L781
+[v1-keys]: https://git.ostiwe.com/ostiwe/go-toml/blob/a2e52561804c6cd9392ebf0048ca64fe4af67a43/marshal.go#L775-L781
 
 #### Ignore preexisting value in interface
 
@@ -544,7 +544,7 @@ fmt.Println("v2 Encoder:\n" + string(buf.Bytes()))
 //   key = 'value'
 ```
 
-[sit]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#Encoder.SetIndentTables
+[sit]: https://pkg.go.dev/git.ostiwe.com/ostiwe/go-toml/v2#Encoder.SetIndentTables
 
 #### 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
 of `encoding/json`. `Encoder.PromoteAnonymous` has been removed.
 
-[nodoc]: https://github.com/pelletier/go-toml/discussions/506#discussioncomment-1526038
+[nodoc]: https://git.ostiwe.com/ostiwe/go-toml/discussions/506#discussioncomment-1526038
 
 ### `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
 complete solutions exist out there.
 
-[query]: https://github.com/pelletier/go-toml/tree/f99d6bbca119636aeafcf351ee52b3d202782627/query
+[query]: https://git.ostiwe.com/ostiwe/go-toml/tree/f99d6bbca119636aeafcf351ee52b3d202782627/query
 [dasel]: https://github.com/TomWright/dasel
 
 ## Versioning

benchmark/bench_datasets_test.go

@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
 )
 
 var benchInputs = []struct {

benchmark/benchmark_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
 )
 
 func TestUnmarshalSimple(t *testing.T) {

ci.sh

@@ -117,8 +117,8 @@ coverage() {
 
             target_diff="${output_dir}/target.diff.txt"
             head_diff="${output_dir}/head.diff.txt"
-            cat "${target_out}" | grep -E '^github.com/pelletier/go-toml' | tr -s "\t " | cut -f 2,3 | sort > "${target_diff}"
+            cat "${target_out}" | grep -E '^git.ostiwe.com/ostiwe/go-toml' | tr -s "\t " | cut -f 2,3 | sort > "${target_diff}"
-            cat "${head_out}" | grep -E '^github.com/pelletier/go-toml' | tr -s "\t " | cut -f 2,3 | sort > "${head_diff}"
+            cat "${head_out}" | grep -E '^git.ostiwe.com/ostiwe/go-toml' | tr -s "\t " | cut -f 2,3 | sort > "${head_diff}"
 
             diff --side-by-side --suppress-common-lines "${target_diff}" "${head_diff}"
 		    return 1
@@ -147,7 +147,7 @@ bench() {
     pushd "$dir"
 
     if [ "${replace}" != "" ]; then
-        find ./benchmark/ -iname '*.go' -exec sed -i -E "s|github.com/pelletier/go-toml/v2|${replace}|g" {} \;
+        find ./benchmark/ -iname '*.go' -exec sed -i -E "s|git.ostiwe.com/ostiwe/go-toml/v2\"|${replace}\"|g" {} \;
         go get "${replace}"
     fi
 
@@ -195,6 +195,11 @@ for line in reversed(lines[2:]):
         "%.1fx" % (float(line[3])/v2),  # v1
         "%.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
 results.append(results[0])
 del results[0]
@@ -252,9 +257,9 @@ benchmark() {
         shift
 
         v2stats=`fmktemp go-toml-v2`
-        bench HEAD "${v2stats}" "github.com/pelletier/go-toml/v2"
+        bench HEAD "${v2stats}" "git.ostiwe.com/ostiwe/go-toml/v2"
         v1stats=`fmktemp go-toml-v1`
-        bench HEAD "${v1stats}" "github.com/pelletier/go-toml"
+        bench HEAD "${v1stats}" "git.ostiwe.com/ostiwe/go-toml"
         bsstats=`fmktemp bs-toml`
         bench HEAD "${bsstats}" "github.com/BurntSushi/toml"
 

cmd/gotoml-test-decoder/main.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/pelletier/go-toml/v2/internal/testsuite"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/testsuite"
 )
 
 func main() {

cmd/gotoml-test-encoder/main.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/pelletier/go-toml/v2/internal/testsuite"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/testsuite"
 )
 
 func main() {

cmd/jsontoml/main.go

@@ -14,7 +14,7 @@
 //
 // Using Go:
 //
-//	go install github.com/pelletier/go-toml/v2/cmd/jsontoml@latest
+//	go install git.ostiwe.com/ostiwe/go-toml/v2/cmd/jsontoml@latest
 package main
 
 import (
@@ -22,8 +22,8 @@ import (
 	"flag"
 	"io"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
-	"github.com/pelletier/go-toml/v2/internal/cli"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/cli"
 )
 
 const usage = `jsontoml can be used in two ways:

cmd/jsontoml/main_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
 )
 
 func TestConvert(t *testing.T) {

cmd/tomljson/main.go

@@ -14,7 +14,7 @@
 //
 // Using Go:
 //
-//	go install github.com/pelletier/go-toml/v2/cmd/tomljson@latest
+//	go install git.ostiwe.com/ostiwe/go-toml/v2/cmd/tomljson@latest
 package main
 
 import (
@@ -23,8 +23,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
-	"github.com/pelletier/go-toml/v2/internal/cli"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/cli"
 )
 
 const usage = `tomljson can be used in two ways:

cmd/tomljson/main_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
 )
 
 func TestConvert(t *testing.T) {

cmd/tomll/main.go

@@ -14,14 +14,14 @@
 //
 // Using Go:
 //
-//	go install github.com/pelletier/go-toml/v2/cmd/tomll@latest
+//	go install git.ostiwe.com/ostiwe/go-toml/v2/cmd/tomll@latest
 package main
 
 import (
 	"io"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
-	"github.com/pelletier/go-toml/v2/internal/cli"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/cli"
 )
 
 const usage = `tomll can be used in two ways:

cmd/tomll/main_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
 )
 
 func TestConvert(t *testing.T) {

cmd/tomltestgen/main.go

@@ -3,7 +3,7 @@
 //
 // Within the go-toml package, run `go generate`.  Otherwise, use:
 //
-//	go run github.com/pelletier/go-toml/cmd/tomltestgen -o toml_testgen_test.go
+//	go run git.ostiwe.com/ostiwe/go-toml/cmd/tomltestgen -o toml_testgen_test.go
 package main
 
 import (

decode.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/pelletier/go-toml/v2/unstable"
+	"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
 )
 
 func parseInteger(b []byte) (int64, error) {
@@ -258,7 +258,7 @@ func parseLocalTime(b []byte) (LocalTime, []byte, error) {
 				// to the supported precision and ignores the
 				// remaining digits.
 				//
-				// https://github.com/pelletier/go-toml/discussions/707
+				// https://git.ostiwe.com/ostiwe/go-toml/discussions/707
 				continue
 			}
 

errors.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/pelletier/go-toml/v2/unstable"
+	"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
 )
 
 // DecodeError represents an error encountered during the parsing or decoding

errors_test.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
-	"github.com/pelletier/go-toml/v2/unstable"
+	"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
 )
 
 //nolint:funlen
@@ -259,6 +259,12 @@ func TestDecodeError_Position(t *testing.T) {
 			expectedRow: 3,
 			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 {

example_text_marshaling_test.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
 )
 
 type customInt int

fast_test.go

@@ -3,8 +3,8 @@ package toml_test
 import (
 	"testing"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
 )
 
 func TestFastSimpleInt(t *testing.T) {

fuzz_test.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
 )
 
 func FuzzUnmarshal(f *testing.F) {

go.mod

@@ -1,3 +1,3 @@
-module github.com/pelletier/go-toml/v2
+module git.ostiwe.com/ostiwe/go-toml/v2
 
 go 1.21.0

internal/cli/cli.go

@@ -9,7 +9,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
 )
 
 type ConvertFn func(r io.Reader, w io.Writer) error

internal/cli/cli_test.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
 )
 
 func processMain(args []string, input io.Reader, stdout, stderr io.Writer, f ConvertFn) int {

internal/imported_tests/marshal_imported_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
 )
 
 func TestDocMarshal(t *testing.T) {

internal/imported_tests/unmarshal_imported_test.go

@@ -15,8 +15,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
 )
 
 type basicMarshalTestStruct struct {

internal/testsuite/add.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
 )
 
 // addTag adds JSON tags to a data structure as expected by toml-test.

internal/testsuite/rm.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
 )
 
 // Remove JSON tags to a data structure as returned by toml-test.

internal/testsuite/testsuite.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
 )
 
 // Marshal is a helper function for calling toml.Marshal

internal/tracker/key.go

@@ -1,6 +1,6 @@
 package tracker
 
-import "github.com/pelletier/go-toml/v2/unstable"
+import "git.ostiwe.com/ostiwe/go-toml/v2/unstable"
 
 // KeyTracker is a tracker that keeps track of the current Key as the AST is
 // walked.

internal/tracker/seen.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/pelletier/go-toml/v2/unstable"
+	"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
 )
 
 type keyKind uint8

internal/tracker/seen_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
 )
 
 func TestEntrySize(t *testing.T) {

localtime.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pelletier/go-toml/v2/unstable"
+	"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
 )
 
 // LocalDate represents a calendar day in no specific timezone.

localtime_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
 )
 
 func TestLocalDate_AsTime(t *testing.T) {

marshaler.go

@@ -15,7 +15,7 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/pelletier/go-toml/v2/internal/characters"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/characters"
 )
 
 // 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
 	case json.Number:
 		if enc.marshalJSONNumbers {
-			if x == "" { /// Useful zero value.
+			if x == "" { // / Useful zero value.
 				return append(b, "0"...), nil
 			} else if v, err := x.Int64(); err == nil {
 				return enc.encode(b, ctx, reflect.ValueOf(v))
@@ -704,15 +704,18 @@ func (enc *Encoder) encodeMap(b []byte, ctx encoderCtx, v reflect.Value) ([]byte
 	for iter.Next() {
 		v := iter.Value()
 
-		if isNil(v) {
+		// Handle nil values: convert nil pointers to zero value,
-			// For nil pointers, convert to zero value of the element type.
+		// skip nil interfaces and nil maps.
-			// This allows round-trip marshaling of maps with nil pointer values.
+		switch v.Kind() {
-			// For nil interfaces and nil maps, skip since we can't derive a type.
+		case reflect.Ptr:
-			if v.Kind() == reflect.Ptr {
+			if v.IsNil() {
 				v = reflect.Zero(v.Type().Elem())
-			} else {
+			}
+		case reflect.Interface, reflect.Map:
+			if v.IsNil() {
 				continue
 			}
+		default:
 		}
 
 		k, err := enc.keyToString(iter.Key())
@@ -936,7 +939,7 @@ func (enc *Encoder) encodeTable(b []byte, ctx encoderCtx, t table) ([]byte, erro
 		if shouldOmitEmpty(kv.Options, kv.Value) {
 			continue
 		}
-		if shouldOmitZero(kv.Options, kv.Value) {
+		if kv.Options.omitzero && shouldOmitZero(kv.Options, kv.Value) {
 			continue
 		}
 		hasNonEmptyKV = true
@@ -958,7 +961,7 @@ func (enc *Encoder) encodeTable(b []byte, ctx encoderCtx, t table) ([]byte, erro
 		if shouldOmitEmpty(table.Options, table.Value) {
 			continue
 		}
-		if shouldOmitZero(table.Options, table.Value) {
+		if table.Options.omitzero && shouldOmitZero(table.Options, table.Value) {
 			continue
 		}
 		if first {
@@ -995,7 +998,7 @@ func (enc *Encoder) encodeTableInline(b []byte, ctx encoderCtx, t table) ([]byte
 		if shouldOmitEmpty(kv.Options, kv.Value) {
 			continue
 		}
-		if shouldOmitZero(kv.Options, kv.Value) {
+		if kv.Options.omitzero && shouldOmitZero(kv.Options, kv.Value) {
 			continue
 		}
 
@@ -1107,7 +1110,7 @@ func (enc *Encoder) encodeSliceAsArrayTable(b []byte, ctx encoderCtx, v reflect.
 		scratch = enc.indent(ctx.indent, scratch)
 	}
 
-	scratch = append(scratch, "[["...)
+	scratch = append(scratch, "["...)
 
 	for i, k := range ctx.parentKey {
 		if i > 0 {
@@ -1117,7 +1120,7 @@ func (enc *Encoder) encodeSliceAsArrayTable(b []byte, ctx encoderCtx, v reflect.
 		scratch = enc.encodeKey(scratch, k)
 	}
 
-	scratch = append(scratch, "]]\n"...)
+	scratch = append(scratch, "]\n"...)
 	ctx.skipTableHeader = true
 
 	b = enc.encodeComment(ctx.indent, ctx.options.comment, b)

marshaler_test.go

@@ -13,8 +13,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
 )
 
 type marshalTextKey struct {
@@ -2220,7 +2220,7 @@ port = 4242
 
 // TestMarshalIssue975 tests that nil pointer values in maps are marshaled as
 // empty tables, allowing round-trip marshaling to work correctly.
-// See https://github.com/pelletier/go-toml/issues/975
+// See https://git.ostiwe.com/ostiwe/go-toml/issues/975
 func TestMarshalIssue975(t *testing.T) {
 	// Test case from the issue: map[string]*struct{}
 	oldMap := map[string]*struct{}{

ossfuzz/fuzz.go

@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
 )
 
 // FuzzToml is the fuzzing target.

strict.go

@@ -1,8 +1,8 @@
 package toml
 
 import (
-	"github.com/pelletier/go-toml/v2/internal/tracker"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/tracker"
-	"github.com/pelletier/go-toml/v2/unstable"
+	"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
 )
 
 type strict struct {

test-go-versions.sh

@@ -9,7 +9,7 @@ YELLOW='\033[1;33m'
 BLUE='\033[0;34m'
 NC='\033[0m' # No Color
 
-# Go versions to test (1.11 through 1.25)
+# Go versions to test (1.11 through 1.26)
 GO_VERSIONS=(
     "1.11"
     "1.12"
@@ -26,6 +26,7 @@ GO_VERSIONS=(
     "1.23"
     "1.24"
     "1.25"
+    "1.26"
 )
 
 # Default values
@@ -64,7 +65,7 @@ EXAMPLES:
     $0                          # Test all Go versions in parallel
     $0 --sequential             # Test all Go versions sequentially
     $0 1.21 1.22 1.23          # Test specific versions
-    $0 --verbose --output ./results 1.24 1.25  # Verbose output to custom directory
+    $0 --verbose --output ./results 1.25 1.26  # Verbose output to custom directory
 
 EXIT CODES:
     0                   Recent Go versions pass (good compatibility)
@@ -136,8 +137,8 @@ fi
 
 # Validate Go versions
 for version in "${GO_VERSIONS[@]}"; do
-    if ! [[ "$version" =~ ^1\.(1[1-9]|2[0-5])$ ]]; then
+    if ! [[ "$version" =~ ^1\.(1[1-9]|2[0-6])$ ]]; then
-        log_error "Invalid Go version: $version. Supported versions: 1.11-1.25"
+        log_error "Invalid Go version: $version. Supported versions: 1.11-1.26"
         exit 1
     fi
 done

toml_testgen_support_test.go

@@ -8,9 +8,9 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
-	"github.com/pelletier/go-toml/v2/internal/testsuite"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/testsuite"
 )
 
 func testgenInvalid(t *testing.T, input string) {

unmarshaler.go

@@ -12,8 +12,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/pelletier/go-toml/v2/internal/tracker"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/tracker"
-	"github.com/pelletier/go-toml/v2/unstable"
+	"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
 )
 
 // Unmarshal deserializes a TOML document into a Go value.

unmarshaler_test.go

@@ -11,9 +11,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pelletier/go-toml/v2"
+	"git.ostiwe.com/ostiwe/go-toml/v2"
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
-	"github.com/pelletier/go-toml/v2/unstable"
+	"git.ostiwe.com/ostiwe/go-toml/v2/unstable"
 )
 
 type unmarshalTextKey struct {
@@ -4554,266 +4554,10 @@ func (c *customTable873) UnmarshalTOML(data []byte) error {
 		c.Keys = append(c.Keys, key)
 		c.Values[key] = string(valueBytes)
 	}
+
 	return nil
 }
 
-func TestIssue873_TableUnmarshaler(t *testing.T) {
-	type Config struct {
-		Section customTable873 `toml:"section"`
-	}
-
-	doc := `
-[section]
-key1 = "value1"
-key2 = "value2"
-key3 = "value3"
-`
-
-	var cfg Config
-	err := toml.NewDecoder(bytes.NewReader([]byte(doc))).
-		EnableUnmarshalerInterface().
-		Decode(&cfg)
-
-	assert.NoError(t, err)
-	assert.Equal(t, []string{"key1", "key2", "key3"}, cfg.Section.Keys)
-	assert.Equal(t, "value1", cfg.Section.Values["key1"])
-	assert.Equal(t, "value2", cfg.Section.Values["key2"])
-	assert.Equal(t, "value3", cfg.Section.Values["key3"])
-}
-
-func TestIssue873_TableUnmarshaler_EmptyTable(t *testing.T) {
-	type Config struct {
-		Section customTable873 `toml:"section"`
-	}
-
-	doc := `
-[section]
-`
-
-	var cfg Config
-	err := toml.NewDecoder(bytes.NewReader([]byte(doc))).
-		EnableUnmarshalerInterface().
-		Decode(&cfg)
-
-	assert.NoError(t, err)
-	assert.Equal(t, []string{}, cfg.Section.Keys)
-}
-
-func TestIssue873_ArrayTableUnmarshaler(t *testing.T) {
-	type Config struct {
-		Items []customTable873 `toml:"items"`
-	}
-
-	doc := `
-[[items]]
-name = "first"
-id = "1"
-
-[[items]]
-name = "second"
-id = "2"
-`
-
-	var cfg Config
-	err := toml.NewDecoder(bytes.NewReader([]byte(doc))).
-		EnableUnmarshalerInterface().
-		Decode(&cfg)
-
-	assert.NoError(t, err)
-	assert.Equal(t, 2, len(cfg.Items))
-	assert.Equal(t, []string{"name", "id"}, cfg.Items[0].Keys)
-	assert.Equal(t, "first", cfg.Items[0].Values["name"])
-	assert.Equal(t, "1", cfg.Items[0].Values["id"])
-	assert.Equal(t, []string{"name", "id"}, cfg.Items[1].Keys)
-	assert.Equal(t, "second", cfg.Items[1].Values["name"])
-	assert.Equal(t, "2", cfg.Items[1].Values["id"])
-}
-
-func TestIssue873_NestedTableUnmarshaler(t *testing.T) {
-	type Config struct {
-		Outer struct {
-			Inner customTable873 `toml:"inner"`
-		} `toml:"outer"`
-	}
-
-	doc := `
-[outer.inner]
-a = "A"
-b = "B"
-`
-
-	var cfg Config
-	err := toml.NewDecoder(bytes.NewReader([]byte(doc))).
-		EnableUnmarshalerInterface().
-		Decode(&cfg)
-
-	assert.NoError(t, err)
-	assert.Equal(t, []string{"a", "b"}, cfg.Outer.Inner.Keys)
-	assert.Equal(t, "A", cfg.Outer.Inner.Values["a"])
-	assert.Equal(t, "B", cfg.Outer.Inner.Values["b"])
-}
-
-func TestIssue873_TableUnmarshaler_MultipleTables(t *testing.T) {
-	type Config struct {
-		First  customTable873 `toml:"first"`
-		Second customTable873 `toml:"second"`
-	}
-
-	doc := `
-[first]
-key1 = "value1"
-
-[second]
-key2 = "value2"
-`
-
-	var cfg Config
-	err := toml.NewDecoder(bytes.NewReader([]byte(doc))).
-		EnableUnmarshalerInterface().
-		Decode(&cfg)
-
-	assert.NoError(t, err)
-	assert.Equal(t, []string{"key1"}, cfg.First.Keys)
-	assert.Equal(t, "value1", cfg.First.Values["key1"])
-	assert.Equal(t, []string{"key2"}, cfg.Second.Keys)
-	assert.Equal(t, "value2", cfg.Second.Values["key2"])
-}
-
-// Test that regular struct fields still work alongside Unmarshaler tables
-func TestIssue873_MixedWithRegularFields(t *testing.T) {
-	type Config struct {
-		Name    string         `toml:"name"`
-		Section customTable873 `toml:"section"`
-		Count   int            `toml:"count"`
-	}
-
-	doc := `
-name = "test"
-count = 42
-
-[section]
-foo = "bar"
-`
-
-	var cfg Config
-	err := toml.NewDecoder(bytes.NewReader([]byte(doc))).
-		EnableUnmarshalerInterface().
-		Decode(&cfg)
-
-	assert.NoError(t, err)
-	assert.Equal(t, "test", cfg.Name)
-	assert.Equal(t, 42, cfg.Count)
-	assert.Equal(t, []string{"foo"}, cfg.Section.Keys)
-	assert.Equal(t, "bar", cfg.Section.Values["foo"])
-}
-
-// Test that pointer to Unmarshaler type works
-func TestIssue873_PointerToUnmarshaler(t *testing.T) {
-	type Config struct {
-		Section *customTable873 `toml:"section"`
-	}
-
-	doc := `
-[section]
-hello = "world"
-`
-
-	var cfg Config
-	err := toml.NewDecoder(bytes.NewReader([]byte(doc))).
-		EnableUnmarshalerInterface().
-		Decode(&cfg)
-
-	assert.NoError(t, err)
-	assert.True(t, cfg.Section != nil)
-	assert.Equal(t, []string{"hello"}, cfg.Section.Keys)
-	assert.Equal(t, "world", cfg.Section.Values["hello"])
-}
-
-// Test table with sub-tables defined separately
-func TestIssue873_TableWithSubTables(t *testing.T) {
-	type Config struct {
-		Parent customTable873 `toml:"parent"`
-	}
-
-	doc := `
-[parent]
-name = "root"
-
-[parent.child]
-name = "nested"
-`
-
-	var cfg Config
-	err := toml.NewDecoder(bytes.NewReader([]byte(doc))).
-		EnableUnmarshalerInterface().
-		Decode(&cfg)
-
-	// The parent should only get the keys directly under [parent],
-	// not the [parent.child] sub-table
-	assert.NoError(t, err)
-	assert.Equal(t, []string{"name"}, cfg.Parent.Keys)
-	assert.Equal(t, "root", cfg.Parent.Values["name"])
-}
-
-// Test for issue #994 follow-up - tables defined piece-wise
-// This addresses the maintainer's comment: "It doesn't deal with tables defined piece-wise yet"
-func TestIssue994_TablesPieceWise(t *testing.T) {
-	// Test with piece-wise table definition (using [table] syntax)
-	// The customTable873 type captures key-value pairs in order,
-	// which is useful for use cases like maintaining map ordering
-	doc := `
-[section]
-first = "1"
-second = "2"
-third = "3"
-`
-
-	type Config struct {
-		Section customTable873 `toml:"section"`
-	}
-
-	var cfg Config
-	err := toml.NewDecoder(bytes.NewReader([]byte(doc))).
-		EnableUnmarshalerInterface().
-		Decode(&cfg)
-
-	assert.NoError(t, err)
-	// Verify ordering is preserved (keys are collected in document order)
-	assert.Equal(t, []string{"first", "second", "third"}, cfg.Section.Keys)
-	assert.Equal(t, "1", cfg.Section.Values["first"])
-	assert.Equal(t, "2", cfg.Section.Values["second"])
-	assert.Equal(t, "3", cfg.Section.Values["third"])
-}
-
-// Test root-level struct with tables - combines #994 fix with #873 enhancement
-func TestIssue994_RootWithTables(t *testing.T) {
-	type rootDoc struct {
-		Tables []customTable873 `toml:"tables"`
-	}
-
-	doc := `
-[[tables]]
-name = "first"
-value = "one"
-
-[[tables]]
-name = "second"
-value = "two"
-`
-
-	var d rootDoc
-	err := toml.NewDecoder(bytes.NewReader([]byte(doc))).
-		EnableUnmarshalerInterface().
-		Decode(&d)
-
-	assert.NoError(t, err)
-	assert.Equal(t, 2, len(d.Tables))
-	assert.Equal(t, "first", d.Tables[0].Values["name"])
-	assert.Equal(t, "one", d.Tables[0].Values["value"])
-	assert.Equal(t, "second", d.Tables[1].Values["name"])
-	assert.Equal(t, "two", d.Tables[1].Values["value"])
-}
-
 // Test for split tables - when the same parent table is defined in multiple places
 // This is a key requirement for issue #873: if type A implements Unmarshaler,
 // and [a.b] and [a.d] are defined with another table [x] in between,

unstable/ast.go

@@ -28,12 +28,16 @@ func (c *Iterator) Next() bool {
 	if c.nodes == nil {
 		return false
 	}
+	nodes := *c.nodes
 	if !c.started {
 		c.started = true
-	} else if c.idx >= 0 {
+	} else {
-		c.idx = (*c.nodes)[c.idx].next
+		idx := c.idx
+		if idx >= 0 && int(idx) < len(nodes) {
+			c.idx = nodes[idx].next
 		}
-	return c.idx >= 0 && int(c.idx) < len(*c.nodes)
+	}
+	return c.idx >= 0 && int(c.idx) < len(nodes)
 }
 
 // IsLast returns true if the current node of the iterator is the last

unstable/parser.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"unicode"
 
-	"github.com/pelletier/go-toml/v2/internal/characters"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/characters"
 )
 
 // 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)
 
 	if len(b) == 0 {
-		return invalidReference, nil, NewParserError(b, "expected = after a key, but the document ends there")
+		return invalidReference, nil, NewParserError(startB[:len(startB)-len(b)], "expected = after a key, but the document ends there")
 	}
 
 	b, err = expect('=', b)
@@ -363,9 +363,10 @@ func (p *Parser) parseKeyval(b []byte) (reference, []byte, error) {
 	p.builder.Chain(valRef, key)
 	p.builder.AttachChild(ref, valRef)
 
-	// Set Raw to span the entire key-value expression
+	// Set Raw to span the entire key-value expression.
-	node := p.builder.NodeAt(ref)
+	// Access the node directly in the slice to avoid the write barrier
-	node.Raw = p.rangeOfToken(startB[:len(startB)-len(b)], b)
+	// that NodeAt's nodes-pointer setup would trigger.
+	p.builder.tree.nodes[ref].Raw = p.rangeOfToken(startB[:len(startB)-len(b)], b)
 
 	return ref, b, err
 }

unstable/parser_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/pelletier/go-toml/v2/internal/assert"
+	"git.ostiwe.com/ostiwe/go-toml/v2/internal/assert"
 )
 
 func TestParser_AST_Numbers(t *testing.T) {

unstable/scanner.go

@@ -1,6 +1,6 @@
 package unstable
 
-import "github.com/pelletier/go-toml/v2/internal/characters"
+import "git.ostiwe.com/ostiwe/go-toml/v2/internal/characters"
 
 func scanFollows(b []byte, pattern string) bool {
 	n := len(pattern)