From dd8f5406cb41fb891289cc9bbc73822a179004df Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Thu, 30 Jun 2022 09:56:27 -0700 Subject: [PATCH 1/4] Update bazel-gazelle --- WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index abb5988dd..de09893b1 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -51,10 +51,10 @@ http_archive( http_archive( name = "bazel_gazelle", - sha256 = "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb", + sha256 = "501deb3d5695ab658e82f6f6f549ba681ea3ca2a5fb7911154b5aa45596183fa", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.26.0/bazel-gazelle-v0.26.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.26.0/bazel-gazelle-v0.26.0.tar.gz", ], ) From 7fcc1a1069201dcf7c8fe9448124ca0734041e47 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Thu, 30 Jun 2022 10:42:03 -0700 Subject: [PATCH 2/4] Update bazel-skylib --- WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index de09893b1..4278aff66 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,11 +15,11 @@ http_file( # Bazel/starlark utilities. http_archive( name = "bazel_skylib", - sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c", urls = [ - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz", ], + sha256 = "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728", ) load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") From 3d0907d5b66b983b243968f206c9f2a22ab3a189 Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Thu, 30 Jun 2022 10:42:25 -0700 Subject: [PATCH 3/4] Update go to 1.18.3 --- WORKSPACE | 2 +- tools/go_types_memoize.patch | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 4278aff66..f11757790 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -70,7 +70,7 @@ go_download_sdk( # time on our continuous integration. patch = "//tools:go_types_memoize.patch", patch_strip = 2, - version = "1.17.6", + version = "1.18.3", ) gazelle_dependencies() diff --git a/tools/go_types_memoize.patch b/tools/go_types_memoize.patch index 215206eba..306788b79 100644 --- a/tools/go_types_memoize.patch +++ b/tools/go_types_memoize.patch @@ -1,20 +1,26 @@ -diff '--color=auto' -r -u2 a/go/src/go/types/scope.go b/go/src/go/types/scope.go ---- a/go/src/go/types/scope.go 2022-01-06 19:14:25.000000000 +0000 -+++ b/go/src/go/types/scope.go 2022-02-03 18:50:35.526563967 +0000 -@@ -24,4 +24,5 @@ +diff --git a/go/src/go/types/scope.go b/src/go/types/scope.go +index 010727eb72..0f134b872e 100644 +--- a/go/src/go/types/scope.go ++++ b/go/src/go/types/scope.go +@@ -25,6 +25,7 @@ type Scope struct { children []*Scope + number int // parent.children[number-1] is this scope; 0 if there is no parent elems map[string]Object // lazily allocated + sorted []string // lazily allocated pos, end token.Pos // scope extent; may be invalid comment string // for debugging only -@@ -32,5 +33,5 @@ + isFunc bool // set if this is a function scope (internal use only) +@@ -33,7 +34,7 @@ type Scope struct { + // NewScope returns a new, empty scope contained in the given parent // scope, if any. The comment is for debugging only. func NewScope(parent *Scope, pos, end token.Pos, comment string) *Scope { -- s := &Scope{parent, nil, nil, pos, end, comment, false} -+ s := &Scope{parent, nil, nil, nil, pos, end, comment, false} +- s := &Scope{parent, nil, 0, nil, pos, end, comment, false} ++ s := &Scope{parent, nil, 0, nil, nil, pos, end, comment, false} // don't add children to Universe scope! if parent != nil && parent != Universe { -@@ -48,12 +49,14 @@ + parent.children = append(parent.children, s) +@@ -50,14 +51,16 @@ func (s *Scope) Len() int { return len(s.elems) } + // Names returns the scope's element names in sorted order. func (s *Scope) Names() []string { - names := make([]string, len(s.elems)) @@ -36,4 +42,4 @@ diff '--color=auto' -r -u2 a/go/src/go/types/scope.go b/go/src/go/types/scope.go + return s.sorted } -Only in b/go/src/go/types: scope.go.orig + // NumChildren returns the number of scopes nested in s. From 2b30f52fc1d274edd559a7beaaf1efc128ed24be Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Thu, 30 Jun 2022 09:59:56 -0700 Subject: [PATCH 4/4] Update rules_go --- WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index f11757790..b9edd5615 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -42,10 +42,10 @@ http_archive( # Allow for patching of the go_sdk. "//tools:rules_go_sdk.patch", ], - sha256 = "d6b2513456fe2229811da7eb67a444be7785f5323c6708b38d851d2b51e54d83", + sha256 = "685052b498b6ddfe562ca7a97736741d87916fe536623afb7da2824c0211c369", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.30.0/rules_go-v0.30.0.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.30.0/rules_go-v0.30.0.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip", ], )