[dev.fuzz] all: merge master (65f0d24) into dev.fuzz

[gostls13.git] / src / go / build / deps_test.go

diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
index cb58416191a07284ceb5a18564335928f5c90ee5..a9939dfcf3796fb643297eb22e4cb54eac7b50b3 100644 (file)
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@ -71,17 +71,19 @@ var depsRules = `
        # No dependencies allowed for any of these packages.
        NONE
        < container/list, container/ring,
-         internal/cfg, internal/cpu, internal/goexperiment,
+         internal/cfg, internal/cpu, internal/goarch,
+         internal/goexperiment, internal/goos,
          internal/goversion, internal/nettrace,
          unicode/utf8, unicode/utf16, unicode,
          unsafe;
 
-       # These packages depend only on unsafe.
-       unsafe
+       # These packages depend only on internal/goarch and unsafe.
+       internal/goarch, unsafe
        < internal/abi;
 
        # RUNTIME is the core runtime group of packages, all of them very light-weight.
-       internal/abi, internal/cpu, internal/goexperiment, unsafe
+       internal/abi, internal/cpu, internal/goarch,
+       internal/goexperiment, internal/goos, unsafe
        < internal/bytealg
        < internal/itoa
        < internal/unsafeheader
@@ -393,7 +395,7 @@ var depsRules = `
        < crypto/subtle
        < crypto/internal/subtle
        < crypto/elliptic/internal/fiat
-       < crypto/ed25519/internal/edwards25519/field
+       < crypto/ed25519/internal/edwards25519/field, golang.org/x/crypto/curve25519/internal/field
        < crypto/ed25519/internal/edwards25519
        < crypto/cipher
        < crypto/aes, crypto/des, crypto/hmac, crypto/md5, crypto/rc4,