Vendor github.com/braydonk/yaml

The `yaml.v3` package upstream is now archived. This means there is no
hope of my patches ever being committed upstream. As such, there is
nothing to gain by maintaining this library in a separate repo. It will
be easier for people to contribute to if it's in this repo.

I will keep github.com/braydonk/yaml alive purely for the select few who
pull the package for the couple of patches that upstream never merged.

Author: braydonk

cmd/yamlfmt/config.go

@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/braydonk/yaml"
+	"github.com/google/yamlfmt/pkg/yaml"
 	"github.com/google/yamlfmt"
 	"github.com/google/yamlfmt/command"
 	"github.com/google/yamlfmt/engine"

command/command.go

@@ -23,9 +23,8 @@ import (
 
 	"github.com/google/yamlfmt"
 	"github.com/google/yamlfmt/engine"
+	"github.com/google/yamlfmt/pkg/yaml"
 	"github.com/mitchellh/mapstructure"
-
-	"github.com/braydonk/yaml"
 )
 
 type FormatterConfig struct {

docs/config-file.md

@@ -105,5 +105,5 @@ This hotfix is flaky. It is very hard to reconstruct data like this without pars
 
 In addition, while with this feature the `%YAML` directive may work, the formatter very specifically supports only the [YAML 1.2 spec](https://yaml.org/spec/1.2.2/). So the `%YAML:1.0` directive won't have the desired effect when passing a file through `yamlfmt`, and if you have 1.0-only syntax in your document the formatter may end up failing in other ways that will be unfixable.
 
-[1]: https://www.github.com/braydonk/yaml
+[1]: ../pkg/yaml/
 [Specifying Paths]: ./paths.md

formatters/basic/anchors/check.go

@@ -18,7 +18,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/braydonk/yaml"
+	"github.com/google/yamlfmt/pkg/yaml"
 )
 
 func Check(n yaml.Node) error {

formatters/basic/anchors/check_test.go

@@ -18,7 +18,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/braydonk/yaml"
+	"github.com/google/yamlfmt/pkg/yaml"
 	"github.com/google/yamlfmt/formatters/basic/anchors"
 )
 

formatters/basic/features.go

@@ -15,7 +15,7 @@
 package basic
 
 import (
-	"github.com/braydonk/yaml"
+	"github.com/google/yamlfmt/pkg/yaml"
 	"github.com/google/yamlfmt"
 	"github.com/google/yamlfmt/formatters/basic/anchors"
 	"github.com/google/yamlfmt/internal/features"

formatters/basic/formatter.go

@@ -20,7 +20,7 @@ import (
 	"errors"
 	"io"
 
-	"github.com/braydonk/yaml"
+	"github.com/google/yamlfmt/pkg/yaml"
 	"github.com/google/yamlfmt"
 	"github.com/mitchellh/mapstructure"
 )

go.mod

@@ -4,11 +4,11 @@ go 1.21
 
 require (
 	github.com/bmatcuk/doublestar/v4 v4.7.1
-	github.com/braydonk/yaml v0.9.0
 	github.com/google/go-cmp v0.6.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
 	github.com/santhosh-tekuri/jsonschema/v6 v6.0.1
+	gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405
 )
 
 require golang.org/x/text v0.14.0 // indirect

go.sum

@@ -1,7 +1,5 @@
 github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=
 github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
-github.com/braydonk/yaml v0.9.0 h1:ewGMrVmEVpsm3VwXQDR388sLg5+aQ8Yihp6/hc4m+h4=
-github.com/braydonk/yaml v0.9.0/go.mod h1:hcm3h581tudlirk8XEUPDBAimBPbmnL0Y45hCRl47N4=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=

pkg/yaml

@@ -0,0 +1 @@
+Subproject commit d2c6b1441102e4758d57a6340a02b67312228fa0