From eb7924864bdbe0bf2e8260554fcd480150c6c29e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20F=2E=20R=C3=B8dseth?= Date: Fri, 13 Sep 2024 09:16:29 +0200 Subject: [PATCH] Update dependencies --- v2/go.mod | 2 +- v2/go.sum | 4 ++-- v2/vendor/github.com/ianlancetaylor/demangle/demangle.go | 8 ++++++++ v2/vendor/modules.txt | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/v2/go.mod b/v2/go.mod index 598fdec7..5f8f5539 100644 --- a/v2/go.mod +++ b/v2/go.mod @@ -7,7 +7,7 @@ require ( github.com/felixge/fgtrace v0.2.0 github.com/fsnotify/fsnotify v1.7.0 github.com/gomarkdown/markdown v0.0.0-20240730141124-034f12af3bf6 - github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca + github.com/ianlancetaylor/demangle v0.0.0-20240912202439-0a2b6291aafd github.com/jung-kurt/gofpdf v1.16.2 github.com/sajari/fuzzy v1.0.0 github.com/spf13/pflag v1.0.5 diff --git a/v2/go.sum b/v2/go.sum index 9c46d891..3965d635 100644 --- a/v2/go.sum +++ b/v2/go.sum @@ -17,8 +17,8 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/gomarkdown/markdown v0.0.0-20240730141124-034f12af3bf6 h1:ZPy+2XJ8u0bB3sNFi+I72gMEMS7MTg7aZCCXPOjV8iw= github.com/gomarkdown/markdown v0.0.0-20240730141124-034f12af3bf6/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= -github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca h1:T54Ema1DU8ngI+aef9ZhAhNGQhcRTrWxVeG07F+c/Rw= -github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw= +github.com/ianlancetaylor/demangle v0.0.0-20240912202439-0a2b6291aafd h1:EVX1s+XNss9jkRW9K6XGJn2jL2lB1h5H804oKPsxOec= +github.com/ianlancetaylor/demangle v0.0.0-20240912202439-0a2b6291aafd/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw= github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M= github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= diff --git a/v2/vendor/github.com/ianlancetaylor/demangle/demangle.go b/v2/vendor/github.com/ianlancetaylor/demangle/demangle.go index 90b339d6..dc238e07 100644 --- a/v2/vendor/github.com/ianlancetaylor/demangle/demangle.go +++ b/v2/vendor/github.com/ianlancetaylor/demangle/demangle.go @@ -3152,6 +3152,7 @@ func (st *state) closureTypeName() AST { // templateParamDecl parses: // // ::= Ty # type parameter +// ::= Tk [] # constrained type parameter // ::= Tn # non-type parameter // ::= Tt * E # template parameter // ::= Tp # parameter pack @@ -3181,6 +3182,13 @@ func (st *state) templateParamDecl() (AST, AST) { } return tp, name case 'k': + // We don't track enclosing template parameter levels. + // Don't try to demangle template parameter substitutions + // in constraints. + hold := st.parsingConstraint + st.parsingConstraint = true + defer func() { st.parsingConstraint = hold }() + st.advance(2) constraint, _ := st.name() name := mk("$T", &st.typeTemplateParamCount) diff --git a/v2/vendor/modules.txt b/v2/vendor/modules.txt index d7321453..ee3c35c3 100644 --- a/v2/vendor/modules.txt +++ b/v2/vendor/modules.txt @@ -23,7 +23,7 @@ github.com/gomarkdown/markdown github.com/gomarkdown/markdown/ast github.com/gomarkdown/markdown/html github.com/gomarkdown/markdown/parser -# github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca +# github.com/ianlancetaylor/demangle v0.0.0-20240912202439-0a2b6291aafd ## explicit; go 1.13 github.com/ianlancetaylor/demangle # github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25