.github/workflows/cifuzz.yml

@@ -0,0 +1,26 @@
+name: CIFuzz
+on: [pull_request]
+jobs:
+  Fuzzing:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Build Fuzzers
+      id: build
+      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
+      with:
+        oss-fuzz-project-name: 'burntsushi-toml'
+        dry-run: false
+        language: go
+    - name: Run Fuzzers
+      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
+      with:
+        oss-fuzz-project-name: 'burntsushi-toml'
+        fuzz-seconds: 300
+        dry-run: false
+        language: go
+    - name: Upload Crash
+      uses: actions/upload-artifact@v4
+      if: failure() && steps.build.outcome == 'success'
+      with:
+        name: artifacts
+        path: ./out/artifacts

.github/workflows/test.yml

@@ -5,7 +5,7 @@
     "test": {
       "strategy": {
         "matrix": {
-          "go-version": ["1.13.x", "1.20.x"],
+          "go-version": ["1.18.x", "1.22.x"],
           "os":         ["ubuntu-latest", "macos-latest", "windows-latest"]
         }
       },

README.md

@@ -9,7 +9,7 @@ See the [releases page](https://github.com/BurntSushi/toml/releases) for a
 changelog; this information is also in the git tag annotations (e.g. `git show
 v0.4.0`).
 
-This library requires Go 1.13 or newer; add it to your go.mod with:
+This library requires Go 1.18 or newer; add it to your go.mod with:
 
     % go get github.com/BurntSushi/toml@latest
 

_example/example.toml

@@ -23,7 +23,7 @@ times = [
 # Durations.
 duration = ["4m49s", "8m03s", "1231h15m55s"]
 
-# Table with inline tables.
+# Array with inline tables.
 distros = [
 	{name = "Arch Linux", packages = "pacman"},
 	{name = "Void Linux", packages = "xbps"},

bench_test.go

@@ -1,12 +1,8 @@
-//go:build go1.16
-// +build go1.16
-
 package toml_test
 
 import (
 	"bytes"
 	"io/fs"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
@@ -48,30 +44,30 @@ func BenchmarkDecode(b *testing.B) {
 			b.ResetTimer()
 			for n := 0; n < b.N; n++ {
 				for _, f := range tt.toml {
-					var val map[string]interface{}
+					var val map[string]any
 					toml.Decode(f, &val)
 				}
 			}
 		})
 	}
 
 	b.Run("large-doc", func(b *testing.B) {
-		d, err := os.ReadFile("testdata/ja-JP.toml")
+		d, err := os.ReadFile("testdata/Cargo.toml")
 		if err != nil {
 			b.Fatal(err)
 		}
 		doc := string(d)
 
 		b.ResetTimer()
 		for n := 0; n < b.N; n++ {
-			var val map[string]interface{}
+			var val map[string]any
 			toml.Decode(doc, &val)
 		}
 	})
 }
 
 func BenchmarkEncode(b *testing.B) {
-	files := make(map[string][]map[string]interface{})
+	files := make(map[string][]map[string]any)
 	fs.WalkDir(tomltest.EmbeddedTests(), ".", func(path string, d fs.DirEntry, err error) error {
 		if strings.HasPrefix(path, "valid/") && strings.HasSuffix(path, ".toml") {
 			d, _ := fs.ReadFile(tomltest.EmbeddedTests(), path)
@@ -88,7 +84,7 @@ func BenchmarkEncode(b *testing.B) {
 				return nil
 			}
 
-			var dec map[string]interface{}
+			var dec map[string]any
 			_, err := toml.Decode(string(d), &dec)
 			if err != nil {
 				b.Fatalf("decode %q: %s", path, err)
@@ -108,7 +104,7 @@ func BenchmarkEncode(b *testing.B) {
 
 	type test struct {
 		group string
-		data  []map[string]interface{}
+		data  []map[string]any
 	}
 	tests := make([]test, 0, len(files))
 	for k, v := range files {
@@ -132,7 +128,7 @@ func BenchmarkEncode(b *testing.B) {
 }
 
 func BenchmarkExample(b *testing.B) {
-	d, err := ioutil.ReadFile("_example/example.toml")
+	d, err := os.ReadFile("_example/example.toml")
 	if err != nil {
 		b.Fatal(err)
 	}

cmd/toml-test-decoder/main.go

@@ -30,7 +30,7 @@ func main() {
 		flag.Usage()
 	}
 
-	var decoded interface{}
+	var decoded any
 	if _, err := toml.NewDecoder(os.Stdin).Decode(&decoded); err != nil {
 		log.Fatalf("Error decoding TOML: %s", err)
 	}

cmd/toml-test-encoder/main.go

@@ -30,7 +30,7 @@ func main() {
 		flag.Usage()
 	}
 
-	var tmp interface{}
+	var tmp any
 	if err := json.NewDecoder(os.Stdin).Decode(&tmp); err != nil {
 		log.Fatalf("Error decoding JSON: %s", err)
 	}

cmd/tomlv/main.go

@@ -2,24 +2,30 @@
 package main
 
 import (
+	"encoding/json"
 	"flag"
 	"fmt"
 	"log"
 	"os"
 	"path"
 	"strings"
 	"text/tabwriter"
+	"time"
 
 	"github.com/BurntSushi/toml"
 )
 
 var (
 	flagTypes = false
+	flagJSON  = false
+	flagTime  = false
 )
 
 func init() {
 	log.SetFlags(0)
 	flag.BoolVar(&flagTypes, "types", flagTypes, "Show the types for every key.")
+	flag.BoolVar(&flagTime, "time", flagTypes, "Show how long the parsing took.")
+	flag.BoolVar(&flagJSON, "json", flagTypes, "Output parsed document as JSON.")
 	flag.Usage = usage
 	flag.Parse()
 }
@@ -35,14 +41,24 @@ func main() {
 		flag.Usage()
 	}
 	for _, f := range flag.Args() {
-		var tmp interface{}
+		var tmp any
+		start := time.Now()
 		md, err := toml.DecodeFile(f, &tmp)
 		if err != nil {
 			log.Fatalf("Error in '%s': %s", f, err)
 		}
+		if flagTime {
+			fmt.Printf("%f\n", time.Now().Sub(start).Seconds())
+		}
 		if flagTypes {
 			printTypes(md)
 		}
+		if flagJSON {
+			enc := json.NewEncoder(os.Stdout)
+			enc.SetEscapeHTML(false)
+			enc.SetIndent("", "  ")
+			enc.Encode(tmp)
+		}
 	}
 }