Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
From 0addaedb77cd1badc5aa036f4b9cab5fe3fa0d19 Mon Sep 17 00:00:00 2001
From: sn0w <[email protected]>
Date: Sat, 22 Feb 2025 21:48:41 +0100
Subject: [PATCH 2/2] nilnil: use 32bit-compatible test values

---
pkg/golinters/nilnil/testdata/nilnil.go | 4 ++--
pkg/golinters/nilnil/testdata/nilnil_detect_opposite.go | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/golinters/nilnil/testdata/nilnil.go b/pkg/golinters/nilnil/testdata/nilnil.go
index 2446df77..2f7dcbdb 100644
--- a/pkg/golinters/nilnil/testdata/nilnil.go
+++ b/pkg/golinters/nilnil/testdata/nilnil.go
@@ -275,11 +275,11 @@ func unsafePtrValid() (unsafe.Pointer, error) {

func uintPtrValid() (uintptr, error) {
if false {
return 0, io.EOF
}
- return 0xc82000c290, nil
+ return 0xabcd, nil
}

func channelTypeValid() (ChannelType, error) {
if false {
return nil, io.EOF
@@ -347,11 +347,11 @@ func unsafePtrOpposite() (unsafe.Pointer, error) {

func uintPtrOpposite() (uintptr, error) {
if false {
return 0, io.EOF
}
- return 0xc82000c290, wrap(io.EOF)
+ return 0xabcd, wrap(io.EOF)
}

func channelTypeOpposite() (ChannelType, error) {
if false {
return nil, io.EOF
diff --git a/pkg/golinters/nilnil/testdata/nilnil_detect_opposite.go b/pkg/golinters/nilnil/testdata/nilnil_detect_opposite.go
index 799d86de..6ef18cae 100644
--- a/pkg/golinters/nilnil/testdata/nilnil_detect_opposite.go
+++ b/pkg/golinters/nilnil/testdata/nilnil_detect_opposite.go
@@ -35,11 +35,11 @@ func unsafePtrOpposite() (unsafe.Pointer, error) {

func uintPtrOpposite() (uintptr, error) {
if false {
return 0, io.EOF
}
- return 0xc82000c290, wrap(io.EOF) // want "return both a non-nil error and a valid value: use separate returns instead"
+ return 0xabcd, wrap(io.EOF) // want "return both a non-nil error and a valid value: use separate returns instead"
}

func channelTypeOpposite() (ChannelType, error) {
if false {
return nil, io.EOF
--
2.48.1

4 changes: 2 additions & 2 deletions srcpkgs/golangci-lint/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'golangci-lint'
pkgname=golangci-lint
version=1.61.0
version=1.64.8
revision=1
build_style=go
go_import_path="github.com/golangci/golangci-lint"
Expand All @@ -12,7 +12,7 @@ license="GPL-3.0-only"
homepage="https://github.com/golangci/golangci-lint"
changelog="https://raw.githubusercontent.com/golangci/golangci-lint/master/CHANGELOG.md"
distfiles="https://github.com/golangci/golangci-lint/archive/v${version}.tar.gz"
checksum=f4efcc09dde3eb81ba7e2fc4230d3e99375a4b176dd28c31cab07371cf5c07db
checksum=30ee6e08bf87d7bc2dcc80b7708033e967eae795451d63a693614c905d42241b

# fix: collect2: fatal error: cannot find 'ld'
export LDFLAGS="-fuse-ld=bfd"
Expand Down