Skip to content

Commit 52dfb42

Browse files
committed
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 <[email protected]> Run-TryBot: Russ Cox <[email protected]> Website-Publish: Russ Cox <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 1852500 commit 52dfb42

30 files changed

+60
-60
lines changed

go.dev/cmd/frontend/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"os"
1313
"strings"
1414

15-
"golang.org/x/go.dev/cmd/internal/site"
15+
"golang.org/x/website/go.dev/cmd/internal/site"
1616
)
1717

1818
var discoveryHosts = map[string]string{

go.dev/cmd/frontend/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"strings"
1212
"testing"
1313

14-
"golang.org/x/go.dev/cmd/internal/site"
14+
"golang.org/x/website/go.dev/cmd/internal/site"
1515
)
1616

1717
var testHosts = map[string]string{

go.dev/cmd/internal/fmtsort/sort_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"testing"
1313
"unsafe"
1414

15-
"golang.org/x/go.dev/cmd/internal/fmtsort"
15+
"golang.org/x/website/go.dev/cmd/internal/fmtsort"
1616
)
1717

1818
var compareTests = [][]reflect.Value{

go.dev/cmd/internal/html/template/clone_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"sync"
1414
"testing"
1515

16-
"golang.org/x/go.dev/cmd/internal/text/template/parse"
16+
"golang.org/x/website/go.dev/cmd/internal/text/template/parse"
1717
)
1818

1919
func TestAddParseTreeHTML(t *testing.T) {

go.dev/cmd/internal/html/template/content_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ func TestTypedContent(t *testing.T) {
216216
},
217217
{
218218
// Not treated as JS. The output is same as for <div>{{.}}</div>
219-
`<script type="golang.org/x/go.dev/cmd/internal/text/template">{{.}}</script>`,
219+
`<script type="golang.org/x/website/go.dev/cmd/internal/text/template">{{.}}</script>`,
220220
[]string{
221221
`&lt;b&gt; &#34;foo%&#34; O&#39;Reilly &amp;bar;`,
222222
`a[href =~ &#34;//example.com&#34;]#foo`,

go.dev/cmd/internal/html/template/context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package template
77
import (
88
"fmt"
99

10-
"golang.org/x/go.dev/cmd/internal/text/template/parse"
10+
"golang.org/x/website/go.dev/cmd/internal/text/template/parse"
1111
)
1212

1313
// context describes the state an HTML parser must be in when it reaches the

go.dev/cmd/internal/html/template/doc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ provided below.
3434
3535
Example
3636
37-
import "golang.org/x/go.dev/cmd/internal/text/template"
37+
import "golang.org/x/website/go.dev/cmd/internal/text/template"
3838
...
3939
t, err := template.New("foo").Parse(`{{define "T"}}Hello, {{.}}!{{end}}`)
4040
err = t.ExecuteTemplate(out, "T", "<script>alert('you have been pwned')</script>")
@@ -45,7 +45,7 @@ produces
4545
4646
but the contextual autoescaping in html/template
4747
48-
import "golang.org/x/go.dev/cmd/internal/html/template"
48+
import "golang.org/x/website/go.dev/cmd/internal/html/template"
4949
...
5050
t, err := template.New("foo").Parse(`{{define "T"}}Hello, {{.}}!{{end}}`)
5151
err = t.ExecuteTemplate(out, "T", "<script>alert('you have been pwned')</script>")

go.dev/cmd/internal/html/template/error.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package template
77
import (
88
"fmt"
99

10-
"golang.org/x/go.dev/cmd/internal/text/template/parse"
10+
"golang.org/x/website/go.dev/cmd/internal/text/template/parse"
1111
)
1212

1313
// Error describes a problem encountered during template Escaping.
@@ -218,13 +218,13 @@ func (e *Error) Error() string {
218218
switch {
219219
case e.Node != nil:
220220
loc, _ := (*parse.Tree)(nil).ErrorContext(e.Node)
221-
return fmt.Sprintf("golang.org/x/go.dev/cmd/internal/html/template:%s: %s", loc, e.Description)
221+
return fmt.Sprintf("golang.org/x/website/go.dev/cmd/internal/html/template:%s: %s", loc, e.Description)
222222
case e.Line != 0:
223-
return fmt.Sprintf("golang.org/x/go.dev/cmd/internal/html/template:%s:%d: %s", e.Name, e.Line, e.Description)
223+
return fmt.Sprintf("golang.org/x/website/go.dev/cmd/internal/html/template:%s:%d: %s", e.Name, e.Line, e.Description)
224224
case e.Name != "":
225-
return fmt.Sprintf("golang.org/x/go.dev/cmd/internal/html/template:%s: %s", e.Name, e.Description)
225+
return fmt.Sprintf("golang.org/x/website/go.dev/cmd/internal/html/template:%s: %s", e.Name, e.Description)
226226
}
227-
return "golang.org/x/go.dev/cmd/internal/html/template: " + e.Description
227+
return "golang.org/x/website/go.dev/cmd/internal/html/template: " + e.Description
228228
}
229229

230230
// errorf creates an error given a format string f and args.

go.dev/cmd/internal/html/template/escape.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"html"
1111
"io"
1212

13-
"golang.org/x/go.dev/cmd/internal/text/template"
14-
"golang.org/x/go.dev/cmd/internal/text/template/parse"
13+
"golang.org/x/website/go.dev/cmd/internal/text/template"
14+
"golang.org/x/website/go.dev/cmd/internal/text/template/parse"
1515
)
1616

1717
// escapeTemplate rewrites the named template, which must be

go.dev/cmd/internal/html/template/escape_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"strings"
1313
"testing"
1414

15-
"golang.org/x/go.dev/cmd/internal/text/template"
16-
"golang.org/x/go.dev/cmd/internal/text/template/parse"
15+
"golang.org/x/website/go.dev/cmd/internal/text/template"
16+
"golang.org/x/website/go.dev/cmd/internal/text/template/parse"
1717
)
1818

1919
type badMarshaler struct{}
@@ -1047,7 +1047,7 @@ func TestErrors(t *testing.T) {
10471047
},
10481048
{
10491049
"<a class=`foo>",
1050-
"golang.org/x/go.dev/cmd/internal/html/template:z: \"`\" in unquoted attr: \"`foo\"",
1050+
"golang.org/x/website/go.dev/cmd/internal/html/template:z: \"`\" in unquoted attr: \"`foo\"",
10511051
},
10521052
{
10531053
`<a style=font:'Arial'>`,
@@ -1505,7 +1505,7 @@ func TestEscapeText(t *testing.T) {
15051505
context{state: stateText},
15061506
},
15071507
{
1508-
`<script type="golang.org/x/go.dev/cmd/internal/text/template">`,
1508+
`<script type="golang.org/x/website/go.dev/cmd/internal/text/template">`,
15091509
context{state: stateText},
15101510
},
15111511
// covering issue 19968
@@ -1515,7 +1515,7 @@ func TestEscapeText(t *testing.T) {
15151515
},
15161516
// covering issue 19965
15171517
{
1518-
`<script TYPE="golang.org/x/go.dev/cmd/internal/text/template">`,
1518+
`<script TYPE="golang.org/x/website/go.dev/cmd/internal/text/template">`,
15191519
context{state: stateText},
15201520
},
15211521
{

go.dev/cmd/internal/html/template/example_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"os"
1111
"strings"
1212

13-
"golang.org/x/go.dev/cmd/internal/html/template"
13+
"golang.org/x/website/go.dev/cmd/internal/html/template"
1414
)
1515

1616
func Example() {

go.dev/cmd/internal/html/template/examplefiles_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"os"
1212
"path/filepath"
1313

14-
"golang.org/x/go.dev/cmd/internal/text/template"
14+
"golang.org/x/website/go.dev/cmd/internal/text/template"
1515
)
1616

1717
// templateFile defines the contents of a template to be stored in a file, for testing.

go.dev/cmd/internal/html/template/exec_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"sync"
1818
"testing"
1919

20-
"golang.org/x/go.dev/cmd/internal/text/template"
20+
"golang.org/x/website/go.dev/cmd/internal/text/template"
2121
)
2222

2323
var debug = flag.Bool("debug", false, "show the errors produced by the tests")

go.dev/cmd/internal/html/template/multi_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"bytes"
1111
"testing"
1212

13-
"golang.org/x/go.dev/cmd/internal/text/template/parse"
13+
"golang.org/x/website/go.dev/cmd/internal/text/template/parse"
1414
)
1515

1616
var multiExecTests = []execTest{

go.dev/cmd/internal/html/template/template.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111
"path/filepath"
1212
"sync"
1313

14-
"golang.org/x/go.dev/cmd/internal/text/template"
15-
"golang.org/x/go.dev/cmd/internal/text/template/parse"
14+
"golang.org/x/website/go.dev/cmd/internal/text/template"
15+
"golang.org/x/website/go.dev/cmd/internal/text/template/parse"
1616
)
1717

18-
// Template is a specialized Template from "golang.org/x/go.dev/cmd/internal/text/template" that produces a safe
18+
// Template is a specialized Template from "golang.org/x/website/go.dev/cmd/internal/text/template" that produces a safe
1919
// HTML document fragment.
2020
type Template struct {
2121
// Sticky error if escaping fails, or escapeOK if succeeded.
@@ -86,7 +86,7 @@ func (t *Template) checkCanParse() error {
8686
t.nameSpace.mu.Lock()
8787
defer t.nameSpace.mu.Unlock()
8888
if t.nameSpace.escaped {
89-
return fmt.Errorf("golang.org/x/go.dev/cmd/internal/html/template: cannot Parse after Execute")
89+
return fmt.Errorf("golang.org/x/website/go.dev/cmd/internal/html/template: cannot Parse after Execute")
9090
}
9191
return nil
9292
}
@@ -147,16 +147,16 @@ func (t *Template) lookupAndEscapeTemplate(name string) (tmpl *Template, err err
147147
t.nameSpace.escaped = true
148148
tmpl = t.set[name]
149149
if tmpl == nil {
150-
return nil, fmt.Errorf("golang.org/x/go.dev/cmd/internal/html/template: %q is undefined", name)
150+
return nil, fmt.Errorf("golang.org/x/website/go.dev/cmd/internal/html/template: %q is undefined", name)
151151
}
152152
if tmpl.escapeErr != nil && tmpl.escapeErr != escapeOK {
153153
return nil, tmpl.escapeErr
154154
}
155155
if tmpl.text.Tree == nil || tmpl.text.Root == nil {
156-
return nil, fmt.Errorf("golang.org/x/go.dev/cmd/internal/html/template: %q is an incomplete template", name)
156+
return nil, fmt.Errorf("golang.org/x/website/go.dev/cmd/internal/html/template: %q is an incomplete template", name)
157157
}
158158
if t.text.Lookup(name) == nil {
159-
panic("golang.org/x/go.dev/cmd/internal/html/template internal error: template escaping out of sync")
159+
panic("golang.org/x/website/go.dev/cmd/internal/html/template internal error: template escaping out of sync")
160160
}
161161
if tmpl.escapeErr == nil {
162162
err = escapeTemplate(tmpl, tmpl.text.Root, name)
@@ -246,7 +246,7 @@ func (t *Template) Clone() (*Template, error) {
246246
t.nameSpace.mu.Lock()
247247
defer t.nameSpace.mu.Unlock()
248248
if t.escapeErr != nil {
249-
return nil, fmt.Errorf("golang.org/x/go.dev/cmd/internal/html/template: cannot Clone %q after it has executed", t.Name())
249+
return nil, fmt.Errorf("golang.org/x/website/go.dev/cmd/internal/html/template: cannot Clone %q after it has executed", t.Name())
250250
}
251251
textClone, err := t.text.Clone()
252252
if err != nil {
@@ -265,7 +265,7 @@ func (t *Template) Clone() (*Template, error) {
265265
name := x.Name()
266266
src := t.set[name]
267267
if src == nil || src.escapeErr != nil {
268-
return nil, fmt.Errorf("golang.org/x/go.dev/cmd/internal/html/template: cannot Clone %q after it has executed", t.Name())
268+
return nil, fmt.Errorf("golang.org/x/website/go.dev/cmd/internal/html/template: cannot Clone %q after it has executed", t.Name())
269269
}
270270
x.Tree = x.Tree.Copy()
271271
ret.set[name] = &Template{
@@ -332,8 +332,8 @@ func (t *Template) Name() string {
332332
// return values of which the second has type error. In that case, if the
333333
// second (error) argument evaluates to non-nil during execution, execution
334334
// terminates and Execute returns that error. FuncMap has the same base type
335-
// as FuncMap in "golang.org/x/go.dev/cmd/internal/text/template", copied here so clients need not import
336-
// "golang.org/x/go.dev/cmd/internal/text/template".
335+
// as FuncMap in "golang.org/x/website/go.dev/cmd/internal/text/template", copied here so clients need not import
336+
// "golang.org/x/website/go.dev/cmd/internal/text/template".
337337
type FuncMap map[string]interface{}
338338

339339
// Funcs adds the elements of the argument map to the template's function map.
@@ -409,7 +409,7 @@ func parseFiles(t *Template, readFile func(string) (string, []byte, error), file
409409

410410
if len(filenames) == 0 {
411411
// Not really a problem, but be consistent.
412-
return nil, fmt.Errorf("golang.org/x/go.dev/cmd/internal/html/template: no files named in call to ParseFiles")
412+
return nil, fmt.Errorf("golang.org/x/website/go.dev/cmd/internal/html/template: no files named in call to ParseFiles")
413413
}
414414
for _, filename := range filenames {
415415
name, b, err := readFile(filename)
@@ -477,7 +477,7 @@ func parseGlob(t *Template, pattern string) (*Template, error) {
477477
return nil, err
478478
}
479479
if len(filenames) == 0 {
480-
return nil, fmt.Errorf("golang.org/x/go.dev/cmd/internal/html/template: pattern matches no files: %#q", pattern)
480+
return nil, fmt.Errorf("golang.org/x/website/go.dev/cmd/internal/html/template: pattern matches no files: %#q", pattern)
481481
}
482482
return parseFiles(t, readFileOS, filenames...)
483483
}

go.dev/cmd/internal/html/template/template_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"strings"
1111
"testing"
1212

13-
. "golang.org/x/go.dev/cmd/internal/html/template"
14-
"golang.org/x/go.dev/cmd/internal/text/template/parse"
13+
. "golang.org/x/website/go.dev/cmd/internal/html/template"
14+
"golang.org/x/website/go.dev/cmd/internal/text/template/parse"
1515
)
1616

1717
func TestTemplateClone(t *testing.T) {

go.dev/cmd/internal/site/md.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"github.com/yuin/goldmark/renderer/html"
1717
"github.com/yuin/goldmark/text"
1818
"github.com/yuin/goldmark/util"
19-
"golang.org/x/go.dev/cmd/internal/html/template"
20-
"golang.org/x/go.dev/cmd/internal/tmplfunc"
19+
"golang.org/x/website/go.dev/cmd/internal/html/template"
20+
"golang.org/x/website/go.dev/cmd/internal/tmplfunc"
2121
)
2222

2323
// markdownToHTML converts markdown to HTML using the renderer and settings that Hugo uses.

go.dev/cmd/internal/site/page.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"strings"
1313
"time"
1414

15-
"golang.org/x/go.dev/cmd/internal/tmplfunc"
15+
"golang.org/x/website/go.dev/cmd/internal/tmplfunc"
1616
"gopkg.in/yaml.v3"
1717
)
1818

go.dev/cmd/internal/site/site.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"strings"
2121
"time"
2222

23-
"golang.org/x/go.dev/cmd/internal/html/template"
23+
"golang.org/x/website/go.dev/cmd/internal/html/template"
2424
"gopkg.in/yaml.v3"
2525
)
2626

go.dev/cmd/internal/site/tmpl.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"reflect"
1010
"strings"
1111

12-
"golang.org/x/go.dev/cmd/internal/html/template"
13-
"golang.org/x/go.dev/cmd/internal/tmplfunc"
12+
"golang.org/x/website/go.dev/cmd/internal/html/template"
13+
"golang.org/x/website/go.dev/cmd/internal/tmplfunc"
1414
"gopkg.in/yaml.v3"
1515
)
1616

go.dev/cmd/internal/text/template/example_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"os"
1010
"strings"
1111

12-
"golang.org/x/go.dev/cmd/internal/text/template"
12+
"golang.org/x/website/go.dev/cmd/internal/text/template"
1313
)
1414

1515
func ExampleTemplate() {

go.dev/cmd/internal/text/template/examplefiles_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"os"
1212
"path/filepath"
1313

14-
"golang.org/x/go.dev/cmd/internal/text/template"
14+
"golang.org/x/website/go.dev/cmd/internal/text/template"
1515
)
1616

1717
// templateFile defines the contents of a template to be stored in a file, for testing.

go.dev/cmd/internal/text/template/examplefunc_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"os"
1010
"strings"
1111

12-
"golang.org/x/go.dev/cmd/internal/text/template"
12+
"golang.org/x/website/go.dev/cmd/internal/text/template"
1313
)
1414

1515
// This example demonstrates a custom function to process template text.

go.dev/cmd/internal/text/template/exec.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"runtime"
1313
"strings"
1414

15-
"golang.org/x/go.dev/cmd/internal/fmtsort"
16-
"golang.org/x/go.dev/cmd/internal/text/template/parse"
15+
"golang.org/x/website/go.dev/cmd/internal/fmtsort"
16+
"golang.org/x/website/go.dev/cmd/internal/text/template/parse"
1717
)
1818

1919
// maxExecDepth specifies the maximum stack depth of templates within

go.dev/cmd/internal/text/template/multi_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"fmt"
1212
"testing"
1313

14-
"golang.org/x/go.dev/cmd/internal/text/template/parse"
14+
"golang.org/x/website/go.dev/cmd/internal/text/template/parse"
1515
)
1616

1717
const (

go.dev/cmd/internal/text/template/template.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"reflect"
99
"sync"
1010

11-
"golang.org/x/go.dev/cmd/internal/text/template/parse"
11+
"golang.org/x/website/go.dev/cmd/internal/text/template/parse"
1212
)
1313

1414
// common holds the information shared by related templates.

go.dev/cmd/internal/tmplfunc/func.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import (
1111
"regexp"
1212
"strings"
1313

14-
"golang.org/x/go.dev/cmd/internal/text/template/parse"
14+
"golang.org/x/website/go.dev/cmd/internal/text/template/parse"
1515

16-
htmltemplate "golang.org/x/go.dev/cmd/internal/html/template"
17-
texttemplate "golang.org/x/go.dev/cmd/internal/text/template"
16+
htmltemplate "golang.org/x/website/go.dev/cmd/internal/html/template"
17+
texttemplate "golang.org/x/website/go.dev/cmd/internal/text/template"
1818
)
1919

2020
var validNameRE = regexp.MustCompile(`\A[_\pL][_\pL\p{Nd}]*\z`)

0 commit comments

Comments
 (0)