From fb1c704d140e453557a3fd6650a726877a47c24f Mon Sep 17 00:00:00 2001
From: Jan De Dobbeleer <jan.de.dobbeleer@gmail.com>
Date: Thu, 9 Sep 2021 20:12:25 +0200
Subject: [PATCH] refactor: adjust build directives for go 1.17

---
 src/constants_unix.go               | 2 +-
 src/constants_windows64.go          | 3 +--
 src/constrants_windows386.go        | 3 +--
 src/environment_unix.go             | 2 +-
 src/environment_windows.go          | 2 +-
 src/environment_windows_win32.go    | 2 +-
 src/segment_command_test.go         | 2 +-
 src/segment_spotify_darwin.go       | 2 +-
 src/segment_spotify_darwin_test.go  | 2 +-
 src/segment_spotify_others.go       | 3 +--
 src/segment_spotify_windows.go      | 2 +-
 src/segment_spotify_windows_test.go | 2 +-
 12 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/constants_unix.go b/src/constants_unix.go
index ab291ea6..4f6b90ad 100644
--- a/src/constants_unix.go
+++ b/src/constants_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package main
 
diff --git a/src/constants_windows64.go b/src/constants_windows64.go
index ba451e1f..f167890e 100644
--- a/src/constants_windows64.go
+++ b/src/constants_windows64.go
@@ -1,5 +1,4 @@
-// +build windows
-// +build amd64
+//go:build windows && amd64
 
 package main
 
diff --git a/src/constrants_windows386.go b/src/constrants_windows386.go
index 04c8c680..627385c5 100644
--- a/src/constrants_windows386.go
+++ b/src/constrants_windows386.go
@@ -1,5 +1,4 @@
-// +build windows
-// +build 386
+//go:build windows && 386
 
 package main
 
diff --git a/src/environment_unix.go b/src/environment_unix.go
index 8042e88d..801d958c 100644
--- a/src/environment_unix.go
+++ b/src/environment_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package main
 
diff --git a/src/environment_windows.go b/src/environment_windows.go
index f5765e56..afc6d389 100644
--- a/src/environment_windows.go
+++ b/src/environment_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package main
 
diff --git a/src/environment_windows_win32.go b/src/environment_windows_win32.go
index 3da60886..714e147b 100644
--- a/src/environment_windows_win32.go
+++ b/src/environment_windows_win32.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package main
 
diff --git a/src/segment_command_test.go b/src/segment_command_test.go
index 2713c86f..b9b4c44f 100644
--- a/src/segment_command_test.go
+++ b/src/segment_command_test.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package main
 
diff --git a/src/segment_spotify_darwin.go b/src/segment_spotify_darwin.go
index ea4f6ac7..1425c600 100644
--- a/src/segment_spotify_darwin.go
+++ b/src/segment_spotify_darwin.go
@@ -1,4 +1,4 @@
-// +build darwin
+//go:build darwin
 
 package main
 
diff --git a/src/segment_spotify_darwin_test.go b/src/segment_spotify_darwin_test.go
index 830386cf..81650891 100644
--- a/src/segment_spotify_darwin_test.go
+++ b/src/segment_spotify_darwin_test.go
@@ -1,4 +1,4 @@
-// +build darwin
+//go:build darwin
 
 package main
 
diff --git a/src/segment_spotify_others.go b/src/segment_spotify_others.go
index 7e2c3c03..dfefc87f 100644
--- a/src/segment_spotify_others.go
+++ b/src/segment_spotify_others.go
@@ -1,5 +1,4 @@
-// +build !darwin
-// +build !windows
+//go:build !darwin && !windows
 
 package main
 
diff --git a/src/segment_spotify_windows.go b/src/segment_spotify_windows.go
index 138448d6..54f9949a 100644
--- a/src/segment_spotify_windows.go
+++ b/src/segment_spotify_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package main
 
diff --git a/src/segment_spotify_windows_test.go b/src/segment_spotify_windows_test.go
index 6b63b8ca..44d446ae 100644
--- a/src/segment_spotify_windows_test.go
+++ b/src/segment_spotify_windows_test.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package main