Skip to content

golang_org -> golang.org #20468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

golang_org -> golang.org #20468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cmd/api/goapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ func (w *Walker) Import(name string) (*types.Package, error) {
w.imported[name] = &importing

root := w.root
if strings.HasPrefix(name, "golang_org/x/") {
if strings.HasPrefix(name, "golang.org/x/") {
root = filepath.Join(root, "vendor")
}

Expand Down
2 changes: 1 addition & 1 deletion src/crypto/tls/cipher_suites.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"crypto/x509"
"hash"

"golang_org/x/crypto/chacha20poly1305"
"golang.org/x/crypto/chacha20poly1305"
)

// a keyAgreement implements the client and server side of a TLS key agreement
Expand Down
2 changes: 1 addition & 1 deletion src/crypto/tls/key_agreement.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"io"
"math/big"

"golang_org/x/crypto/curve25519"
"golang.org/x/crypto/curve25519"
)

var errClientKeyExchange = errors.New("tls: invalid ClientKeyExchange message")
Expand Down
8 changes: 4 additions & 4 deletions src/go/build/build_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,11 +340,11 @@ func TestImportVendor(t *testing.T) {
testenv.MustHaveGoBuild(t) // really must just have source
ctxt := Default
ctxt.GOPATH = ""
p, err := ctxt.Import("golang_org/x/net/http2/hpack", filepath.Join(ctxt.GOROOT, "src/net/http"), 0)
p, err := ctxt.Import("golang.org/x/net/http2/hpack", filepath.Join(ctxt.GOROOT, "src/net/http"), 0)
if err != nil {
t.Fatalf("cannot find vendored golang_org/x/net/http2/hpack from net/http directory: %v", err)
t.Fatalf("cannot find vendored golang.org/x/net/http2/hpack from net/http directory: %v", err)
}
want := "vendor/golang_org/x/net/http2/hpack"
want := "vendor/golang.org/x/net/http2/hpack"
if p.ImportPath != want {
t.Fatalf("Import succeeded but found %q, want %q", p.ImportPath, want)
}
Expand All @@ -370,7 +370,7 @@ func TestImportVendorParentFailure(t *testing.T) {
ctxt := Default
ctxt.GOPATH = ""
// This import should fail because the vendor/golang.org/x/net/http2 directory has no source code.
p, err := ctxt.Import("golang_org/x/net/http2", filepath.Join(ctxt.GOROOT, "src/net/http"), 0)
p, err := ctxt.Import("golang.org/x/net/http2", filepath.Join(ctxt.GOROOT, "src/net/http"), 0)
if err == nil {
t.Fatalf("found empty parent in %s", p.Dir)
}
Expand Down
22 changes: 11 additions & 11 deletions src/go/build/deps_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ var pkgDeps = map[string][]string{
"context", "math/rand", "os", "reflect", "sort", "syscall", "time",
"internal/nettrace", "internal/poll",
"internal/syscall/windows", "internal/singleflight", "internal/race",
"golang_org/x/net/lif", "golang_org/x/net/route",
"golang.org/x/net/lif", "golang.org/x/net/route",
},

// NET enables use of basic network-related packages.
Expand Down Expand Up @@ -342,9 +342,9 @@ var pkgDeps = map[string][]string{
"crypto/sha1",
"crypto/sha256",
"crypto/sha512",
"golang_org/x/crypto/chacha20poly1305",
"golang_org/x/crypto/curve25519",
"golang_org/x/crypto/poly1305",
"golang.org/x/crypto/chacha20poly1305",
"golang.org/x/crypto/curve25519",
"golang.org/x/crypto/poly1305",
},

// Random byte, number generation.
Expand Down Expand Up @@ -393,12 +393,12 @@ var pkgDeps = map[string][]string{
"context",
"crypto/rand",
"crypto/tls",
"golang_org/x/net/http2/hpack",
"golang_org/x/net/idna",
"golang_org/x/net/lex/httplex",
"golang_org/x/net/proxy",
"golang_org/x/text/unicode/norm",
"golang_org/x/text/width",
"golang.org/x/net/http2/hpack",
"golang.org/x/net/idna",
"golang.org/x/net/lex/httplex",
"golang.org/x/net/proxy",
"golang.org/x/text/unicode/norm",
"golang.org/x/text/width",
"internal/nettrace",
"mime/multipart",
"net/http/httptrace",
Expand Down Expand Up @@ -465,7 +465,7 @@ func listStdPkgs(goroot string) ([]string, error) {
}

name := filepath.ToSlash(path[len(src):])
if name == "builtin" || name == "cmd" || strings.Contains(name, "golang_org") {
if name == "builtin" || name == "cmd" || strings.Contains(name, "golang.org") {
return filepath.SkipDir
}

Expand Down
2 changes: 1 addition & 1 deletion src/go/internal/srcimporter/srcimporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ var importedObjectTests = []struct {
{"math.Pi", "const Pi untyped float"},
{"math.Sin", "func Sin(x float64) float64"},
{"math/big.Int", "type Int struct{neg bool; abs nat}"},
{"golang_org/x/text/unicode/norm.MaxSegmentSize", "const MaxSegmentSize untyped int"},
{"golang.org/x/text/unicode/norm.MaxSegmentSize", "const MaxSegmentSize untyped int"},
}

func TestImportedTypes(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions src/net/http/h2_bundle.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/net/http/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"time"
"unicode/utf8"

"golang_org/x/net/lex/httplex"
"golang.org/x/net/lex/httplex"
)

// maxInt64 is the effective "infinite" value for the Server and
Expand Down
2 changes: 1 addition & 1 deletion src/net/http/request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strings"
"sync"

"golang_org/x/net/idna"
"golang.org/x/net/idna"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion src/net/http/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"sync/atomic"
"time"

"golang_org/x/net/lex/httplex"
"golang.org/x/net/lex/httplex"
)

// Errors used by the HTTP server.
Expand Down
2 changes: 1 addition & 1 deletion src/net/http/transfer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"sync"
"time"

"golang_org/x/net/lex/httplex"
"golang.org/x/net/lex/httplex"
)

// ErrLineTooLong is returned when reading request or response bodies
Expand Down
4 changes: 2 additions & 2 deletions src/net/http/transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"sync/atomic"
"time"

"golang_org/x/net/lex/httplex"
"golang_org/x/net/proxy"
"golang.org/x/net/lex/httplex"
"golang.org/x/net/proxy"
)

// DefaultTransport is the default implementation of Transport and is
Expand Down
2 changes: 1 addition & 1 deletion src/net/interface_bsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package net
import (
"syscall"

"golang_org/x/net/route"
"golang.org/x/net/route"
)

// If the ifindex is zero, interfaceTable returns mappings of all
Expand Down
2 changes: 1 addition & 1 deletion src/net/interface_bsdvar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package net
import (
"syscall"

"golang_org/x/net/route"
"golang.org/x/net/route"
)

func interfaceMessages(ifindex int) ([]route.Message, error) {
Expand Down
2 changes: 1 addition & 1 deletion src/net/interface_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package net
import (
"syscall"

"golang_org/x/net/route"
"golang.org/x/net/route"
)

func interfaceMessages(ifindex int) ([]route.Message, error) {
Expand Down
2 changes: 1 addition & 1 deletion src/net/interface_freebsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package net
import (
"syscall"

"golang_org/x/net/route"
"golang.org/x/net/route"
)

func interfaceMessages(ifindex int) ([]route.Message, error) {
Expand Down
2 changes: 1 addition & 1 deletion src/net/interface_solaris.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package net
import (
"syscall"

"golang_org/x/net/lif"
"golang.org/x/net/lif"
)

// If the ifindex is zero, interfaceTable returns mappings of all
Expand Down