mirror of
https://github.com/cloudflare/cloudflared.git
synced 2025-07-28 16:39:57 +00:00
TUN-9016: update go to 1.24
## Summary Update several moving parts of cloudflared build system: * use goboring 1.24.2 in cfsetup * update linter and fix lint issues * update packages namely **quic-go and net** * install script for macos * update docker files to use go 1.24.1 * remove usage of cloudflare-go * pin golang linter Closes TUN-9016
This commit is contained in:
22
vendor/go.uber.org/mock/mockgen/mockgen.go
generated
vendored
22
vendor/go.uber.org/mock/mockgen/mockgen.go
generated
vendored
@@ -393,8 +393,8 @@ func (g *generator) Generate(pkg *model.Package, outputPkgName string, outputPac
|
||||
// try base0, base1, ...
|
||||
pkgName := base
|
||||
|
||||
if _, ok := definedImports[base]; ok {
|
||||
pkgName = definedImports[base]
|
||||
if _, ok := definedImports[pth]; ok {
|
||||
pkgName = definedImports[pth]
|
||||
}
|
||||
|
||||
i := 0
|
||||
@@ -758,6 +758,17 @@ func (g *generator) GenerateMockReturnCallMethod(intf *model.Interface, m *model
|
||||
return nil
|
||||
}
|
||||
|
||||
// nameExistsAsPackage returns true if the name exists as a package name.
|
||||
// This is used to avoid name collisions when generating mock method arguments.
|
||||
func (g *generator) nameExistsAsPackage(name string) bool {
|
||||
for _, symbolName := range g.packageMap {
|
||||
if symbolName == name {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func (g *generator) getArgNames(m *model.Method, in bool) []string {
|
||||
var params []*model.Parameter
|
||||
if in {
|
||||
@@ -766,16 +777,19 @@ func (g *generator) getArgNames(m *model.Method, in bool) []string {
|
||||
params = m.Out
|
||||
}
|
||||
argNames := make([]string, len(params))
|
||||
|
||||
for i, p := range params {
|
||||
name := p.Name
|
||||
if name == "" || name == "_" {
|
||||
|
||||
if name == "" || name == "_" || g.nameExistsAsPackage(name) {
|
||||
name = fmt.Sprintf("arg%d", i)
|
||||
}
|
||||
argNames[i] = name
|
||||
}
|
||||
if m.Variadic != nil && in {
|
||||
name := m.Variadic.Name
|
||||
if name == "" {
|
||||
|
||||
if name == "" || g.nameExistsAsPackage(name) {
|
||||
name = fmt.Sprintf("arg%d", len(params))
|
||||
}
|
||||
argNames = append(argNames, name)
|
||||
|
Reference in New Issue
Block a user