Merge pull request #125 from bigmoonbit/main

jefft0 · web-flow · commit 8da5db759398 · 2025-12-12T10:03:27.000+01:00
refactor: remove obsolete // +build tag
diff --git a/internal/sysutil/sysutil_unix.go b/internal/sysutil/sysutil_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin
-// +build linux darwin
 
 package sysutil
 
diff --git a/internal/sysutil/sysutil_unsupported.go b/internal/sysutil/sysutil_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !linux && !darwin
-// +build !linux,!darwin
 
 package sysutil
 
diff --git a/internal/tools/tools.go b/internal/tools/tools.go
@@ -1,5 +1,4 @@
 //go:build tools
-// +build tools
 
 // Package tools ensures that `go mod` detect some required dependencies.
 //
diff --git a/internal/tools/tools_untool.go b/internal/tools/tools_untool.go
@@ -1,5 +1,4 @@
 //go:build !tools
-// +build !tools
 
 // Package tools ensures that `go mod` detect some required dependencies.
 //
diff --git a/pkg/androidnearby/bridge_android.go b/pkg/androidnearby/bridge_android.go
@@ -1,5 +1,4 @@
 //go:build android && !noproximitytransport
-// +build android,!noproximitytransport
 
 package androidnearby
 
diff --git a/pkg/androidnearby/bridge_unsupported.go b/pkg/androidnearby/bridge_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !android || noproximitytransport
-// +build !android noproximitytransport
 
 package androidnearby
 
diff --git a/pkg/ble-driver/bridge_android.go b/pkg/ble-driver/bridge_android.go
@@ -1,5 +1,4 @@
 //go:build android && !noproximitytransport
-// +build android,!noproximitytransport
 
 package ble
 
diff --git a/pkg/ble-driver/bridge_unsupported.go b/pkg/ble-driver/bridge_unsupported.go
@@ -1,5 +1,4 @@
 //go:build (!darwin && !android) || noproximitytransport
-// +build !darwin,!android noproximitytransport
 
 package ble
 
diff --git a/pkg/logutil/logger_native_android.go b/pkg/logutil/logger_native_android.go
@@ -1,5 +1,4 @@
 //go:build android
-// +build android
 
 package logutil
 
diff --git a/pkg/logutil/logger_native_other.go b/pkg/logutil/logger_native_other.go
@@ -1,5 +1,4 @@
 //go:build !darwin && !android
-// +build !darwin,!android
 
 package logutil
 
diff --git a/pkg/multipeer-connectivity-driver/bridge_darwin.go b/pkg/multipeer-connectivity-driver/bridge_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin && cgo && !catalyst && !noproximitytransport
-// +build darwin,cgo,!catalyst,!noproximitytransport
 
 package mc
 
diff --git a/pkg/multipeer-connectivity-driver/bridge_unsupported.go b/pkg/multipeer-connectivity-driver/bridge_unsupported.go
@@ -1,5 +1,4 @@
 //go:build !darwin || (darwin && !cgo) || catalyst || noproximitytransport
-// +build !darwin darwin,!cgo catalyst noproximitytransport
 
 package mc
 
diff --git a/pkg/testutil/skip_norace.go b/pkg/testutil/skip_norace.go
@@ -1,5 +1,4 @@
 //go:build !race
-// +build !race
 
 package testutil
 
diff --git a/pkg/testutil/skip_race.go b/pkg/testutil/skip_race.go
@@ -1,5 +1,4 @@
 //go:build race
-// +build race
 
 package testutil
 
diff --git a/pkg/username/android.go b/pkg/username/android.go
@@ -1,5 +1,4 @@
 //go:build android
-// +build android
 
 package username
 
diff --git a/pkg/username/ios.go b/pkg/username/ios.go
@@ -1,5 +1,4 @@
 //go:build ios && !catalyst
-// +build ios,!catalyst
 
 package username
 
diff --git a/pkg/username/others.go b/pkg/username/others.go
@@ -1,5 +1,4 @@
 //go:build (!android && !ios) || (ios && catalyst)
-// +build !android,!ios ios,catalyst
 
 package username
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build linux \|\| darwin`
`2`		`-// +build linux darwin`
`3`	`2`
`4`	`3`	`package sysutil`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !linux && !darwin`
`2`		`-// +build !linux,!darwin`
`3`	`2`
`4`	`3`	`package sysutil`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build tools`
`2`		`-// +build tools`
`3`	`2`
`4`	`3`	// Package tools ensures that `go mod` detect some required dependencies.
`5`	`4`	`//`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !tools`
`2`		`-// +build !tools`
`3`	`2`
`4`	`3`	// Package tools ensures that `go mod` detect some required dependencies.
`5`	`4`	`//`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build android && !noproximitytransport`
`2`		`-// +build android,!noproximitytransport`
`3`	`2`
`4`	`3`	`package androidnearby`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !android \|\| noproximitytransport`
`2`		`-// +build !android noproximitytransport`
`3`	`2`
`4`	`3`	`package androidnearby`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build (!darwin && !android) \|\| noproximitytransport`
`2`		`-// +build !darwin,!android noproximitytransport`
`3`	`2`
`4`	`3`	`package ble`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build android`
`2`		`-// +build android`
`3`	`2`
`4`	`3`	`package logutil`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !darwin && !android`
`2`		`-// +build !darwin,!android`
`3`	`2`
`4`	`3`	`package logutil`
`5`	`4`