From 52dfb42446bf328c5d2967627b65df376a7237ef Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 2 Jun 2021 17:10:13 -0400 Subject: go.dev: fix module path to make trybots happy For golang/go#46501. Change-Id: Ie2adbc3536570e66ffda1227ffd4431fe4bf870a Reviewed-on: https://go-review.googlesource.com/c/website/+/324411 Trust: Russ Cox Run-TryBot: Russ Cox Website-Publish: Russ Cox Reviewed-by: Dmitri Shuralyov --- go.dev/cmd/frontend/main.go | 2 +- go.dev/cmd/frontend/main_test.go | 2 +- go.dev/cmd/internal/fmtsort/sort_test.go | 2 +- go.dev/cmd/internal/html/template/clone_test.go | 2 +- go.dev/cmd/internal/html/template/content_test.go | 2 +- go.dev/cmd/internal/html/template/context.go | 2 +- go.dev/cmd/internal/html/template/doc.go | 4 ++-- go.dev/cmd/internal/html/template/error.go | 10 ++++----- go.dev/cmd/internal/html/template/escape.go | 4 ++-- go.dev/cmd/internal/html/template/escape_test.go | 10 ++++----- go.dev/cmd/internal/html/template/example_test.go | 2 +- .../internal/html/template/examplefiles_test.go | 2 +- go.dev/cmd/internal/html/template/exec_test.go | 2 +- go.dev/cmd/internal/html/template/multi_test.go | 2 +- go.dev/cmd/internal/html/template/template.go | 26 +++++++++++----------- go.dev/cmd/internal/html/template/template_test.go | 4 ++-- go.dev/cmd/internal/site/md.go | 4 ++-- go.dev/cmd/internal/site/page.go | 2 +- go.dev/cmd/internal/site/site.go | 2 +- go.dev/cmd/internal/site/tmpl.go | 4 ++-- go.dev/cmd/internal/text/template/example_test.go | 2 +- .../internal/text/template/examplefiles_test.go | 2 +- .../cmd/internal/text/template/examplefunc_test.go | 2 +- go.dev/cmd/internal/text/template/exec.go | 4 ++-- go.dev/cmd/internal/text/template/multi_test.go | 2 +- go.dev/cmd/internal/text/template/template.go | 2 +- go.dev/cmd/internal/tmplfunc/func.go | 6 ++--- go.dev/cmd/internal/tmplfunc/tmpl.go | 4 ++-- go.dev/cmd/internal/tmplfunc/tmplfunc_test.go | 4 ++-- go.dev/go.mod | 2 +- 30 files changed, 60 insertions(+), 60 deletions(-) diff --git a/go.dev/cmd/frontend/main.go b/go.dev/cmd/frontend/main.go index 3d9e0a40..895cce3e 100644 --- a/go.dev/cmd/frontend/main.go +++ b/go.dev/cmd/frontend/main.go @@ -12,7 +12,7 @@ import ( "os" "strings" - "golang.org/x/go.dev/cmd/internal/site" + "golang.org/x/website/go.dev/cmd/internal/site" ) var discoveryHosts = map[string]string{ diff --git a/go.dev/cmd/frontend/main_test.go b/go.dev/cmd/frontend/main_test.go index 8f25d394..61c7d0f0 100644 --- a/go.dev/cmd/frontend/main_test.go +++ b/go.dev/cmd/frontend/main_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "golang.org/x/go.dev/cmd/internal/site" + "golang.org/x/website/go.dev/cmd/internal/site" ) var testHosts = map[string]string{ diff --git a/go.dev/cmd/internal/fmtsort/sort_test.go b/go.dev/cmd/internal/fmtsort/sort_test.go index 93b7b3f6..5c73fcef 100644 --- a/go.dev/cmd/internal/fmtsort/sort_test.go +++ b/go.dev/cmd/internal/fmtsort/sort_test.go @@ -12,7 +12,7 @@ import ( "testing" "unsafe" - "golang.org/x/go.dev/cmd/internal/fmtsort" + "golang.org/x/website/go.dev/cmd/internal/fmtsort" ) var compareTests = [][]reflect.Value{ diff --git a/go.dev/cmd/internal/html/template/clone_test.go b/go.dev/cmd/internal/html/template/clone_test.go index ef68dc71..c42d241b 100644 --- a/go.dev/cmd/internal/html/template/clone_test.go +++ b/go.dev/cmd/internal/html/template/clone_test.go @@ -13,7 +13,7 @@ import ( "sync" "testing" - "golang.org/x/go.dev/cmd/internal/text/template/parse" + "golang.org/x/website/go.dev/cmd/internal/text/template/parse" ) func TestAddParseTreeHTML(t *testing.T) { diff --git a/go.dev/cmd/internal/html/template/content_test.go b/go.dev/cmd/internal/html/template/content_test.go index bb1667b9..70cbd4eb 100644 --- a/go.dev/cmd/internal/html/template/content_test.go +++ b/go.dev/cmd/internal/html/template/content_test.go @@ -216,7 +216,7 @@ func TestTypedContent(t *testing.T) { }, { // Not treated as JS. The output is same as for
{{.}}
- ``, + ``, []string{ `<b> "foo%" O'Reilly &bar;`, `a[href =~ "//example.com"]#foo`, diff --git a/go.dev/cmd/internal/html/template/context.go b/go.dev/cmd/internal/html/template/context.go index 850022a8..9b74fe71 100644 --- a/go.dev/cmd/internal/html/template/context.go +++ b/go.dev/cmd/internal/html/template/context.go @@ -7,7 +7,7 @@ package template import ( "fmt" - "golang.org/x/go.dev/cmd/internal/text/template/parse" + "golang.org/x/website/go.dev/cmd/internal/text/template/parse" ) // context describes the state an HTML parser must be in when it reaches the diff --git a/go.dev/cmd/internal/html/template/doc.go b/go.dev/cmd/internal/html/template/doc.go index 2abc215b..fb3f173b 100644 --- a/go.dev/cmd/internal/html/template/doc.go +++ b/go.dev/cmd/internal/html/template/doc.go @@ -34,7 +34,7 @@ provided below. Example - import "golang.org/x/go.dev/cmd/internal/text/template" + import "golang.org/x/website/go.dev/cmd/internal/text/template" ... t, err := template.New("foo").Parse(`{{define "T"}}Hello, {{.}}!{{end}}`) err = t.ExecuteTemplate(out, "T", "") @@ -45,7 +45,7 @@ produces but the contextual autoescaping in html/template - import "golang.org/x/go.dev/cmd/internal/html/template" + import "golang.org/x/website/go.dev/cmd/internal/html/template" ... t, err := template.New("foo").Parse(`{{define "T"}}Hello, {{.}}!{{end}}`) err = t.ExecuteTemplate(out, "T", "") diff --git a/go.dev/cmd/internal/html/template/error.go b/go.dev/cmd/internal/html/template/error.go index 49f0a436..c8a041f9 100644 --- a/go.dev/cmd/internal/html/template/error.go +++ b/go.dev/cmd/internal/html/template/error.go @@ -7,7 +7,7 @@ package template import ( "fmt" - "golang.org/x/go.dev/cmd/internal/text/template/parse" + "golang.org/x/website/go.dev/cmd/internal/text/template/parse" ) // Error describes a problem encountered during template Escaping. @@ -218,13 +218,13 @@ func (e *Error) Error() string { switch { case e.Node != nil: loc, _ := (*parse.Tree)(nil).ErrorContext(e.Node) - return fmt.Sprintf("golang.org/x/go.dev/cmd/internal/html/template:%s: %s", loc, e.Description) + return fmt.Sprintf("golang.org/x/website/go.dev/cmd/internal/html/template:%s: %s", loc, e.Description) case e.Line != 0: - return fmt.Sprintf("golang.org/x/go.dev/cmd/internal/html/template:%s:%d: %s", e.Name, e.Line, e.Description) + return fmt.Sprintf("golang.org/x/website/go.dev/cmd/internal/html/template:%s:%d: %s", e.Name, e.Line, e.Description) case e.Name != "": - return fmt.Sprintf("golang.org/x/go.dev/cmd/internal/html/template:%s: %s", e.Name, e.Description) + return fmt.Sprintf("golang.org/x/website/go.dev/cmd/internal/html/template:%s: %s", e.Name, e.Description) } - return "golang.org/x/go.dev/cmd/internal/html/template: " + e.Description + return "golang.org/x/website/go.dev/cmd/internal/html/template: " + e.Description } // errorf creates an error given a format string f and args. diff --git a/go.dev/cmd/internal/html/template/escape.go b/go.dev/cmd/internal/html/template/escape.go index 2ad5996d..959c8716 100644 --- a/go.dev/cmd/internal/html/template/escape.go +++ b/go.dev/cmd/internal/html/template/escape.go @@ -10,8 +10,8 @@ import ( "html" "io" - "golang.org/x/go.dev/cmd/internal/text/template" - "golang.org/x/go.dev/cmd/internal/text/template/parse" + "golang.org/x/website/go.dev/cmd/internal/text/template" + "golang.org/x/website/go.dev/cmd/internal/text/template/parse" ) // escapeTemplate rewrites the named template, which must be diff --git a/go.dev/cmd/internal/html/template/escape_test.go b/go.dev/cmd/internal/html/template/escape_test.go index 8ead4f74..8152ca20 100644 --- a/go.dev/cmd/internal/html/template/escape_test.go +++ b/go.dev/cmd/internal/html/template/escape_test.go @@ -12,8 +12,8 @@ import ( "strings" "testing" - "golang.org/x/go.dev/cmd/internal/text/template" - "golang.org/x/go.dev/cmd/internal/text/template/parse" + "golang.org/x/website/go.dev/cmd/internal/text/template" + "golang.org/x/website/go.dev/cmd/internal/text/template/parse" ) type badMarshaler struct{} @@ -1047,7 +1047,7 @@ func TestErrors(t *testing.T) { }, { "", - "golang.org/x/go.dev/cmd/internal/html/template:z: \"`\" in unquoted attr: \"`foo\"", + "golang.org/x/website/go.dev/cmd/internal/html/template:z: \"`\" in unquoted attr: \"`foo\"", }, { ``, @@ -1505,7 +1505,7 @@ func TestEscapeText(t *testing.T) { context{state: stateText}, }, { - `