From 9aa5777a535fc349094fa254e8bab09d1e6677b1 Mon Sep 17 00:00:00 2001 From: Dawei Shen Date: Tue, 23 Jan 2024 10:53:14 +0800 Subject: [PATCH] Strip the extra path in go_types_memoize.patch The go_types_memoize.patch was generated using the git diff command, with the 'go' field manually added to the path. It would be more appropriate to set the patch_strip value to 1 when applying such patches. Signed-off-by: Dawei Shen --- WORKSPACE | 2 +- tools/go_types_memoize.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 2224f05c0..99194ff0f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -96,7 +96,7 @@ go_download_sdk( # analysis. Without this fix, the nogo rules will often fail to run in # time on our continuous integration. patch = "//tools:go_types_memoize.patch", - patch_strip = 2, + patch_strip = 1, version = "1.23.2", ) diff --git a/tools/go_types_memoize.patch b/tools/go_types_memoize.patch index 306788b79..b8b809a76 100644 --- a/tools/go_types_memoize.patch +++ b/tools/go_types_memoize.patch @@ -1,7 +1,7 @@ -diff --git a/go/src/go/types/scope.go b/src/go/types/scope.go +diff --git a/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 +--- a/src/go/types/scope.go ++++ b/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