16 files changed, 15 insertions, 19 deletions
diff --git a/src/protector/protector.go b/src/protector/protector.go
index 2739c016..fe84b388 100644
--- a/src/protector/protector.go
+++ b/src/protector/protector.go
@@ -1,4 +1,4 @@
-// +build !openbsd
+//go:build !openbsd
 
 package protector
 
diff --git a/src/protector/protector_openbsd.go b/src/protector/protector_openbsd.go
index 84a5ded1..34784a6c 100644
--- a/src/protector/protector_openbsd.go
+++ b/src/protector/protector_openbsd.go
@@ -1,4 +1,4 @@
-// +build openbsd
+//go:build openbsd
 
 package protector
 
diff --git a/src/result_others.go b/src/result_others.go
index e3363a8e..0d9dcd7c 100644
--- a/src/result_others.go
+++ b/src/result_others.go
@@ -1,4 +1,4 @@
-// +build !386,!amd64
+//go:build !386 && !amd64
 
 package fzf
 
diff --git a/src/result_test.go b/src/result_test.go
index 4084fdb7..2fd3127f 100644
--- a/src/result_test.go
+++ b/src/result_test.go
@@ -1,5 +1,3 @@
-// +build !tcell
-
 package fzf
 
 import (
diff --git a/src/result_x86.go b/src/result_x86.go
index 60e26e99..3e3fd58e 100644
--- a/src/result_x86.go
+++ b/src/result_x86.go
@@ -1,4 +1,4 @@
-// +build 386 amd64
+//go:build 386 || amd64
 
 package fzf
 
diff --git a/src/terminal_unix.go b/src/terminal_unix.go
index b14cd684..4cee73b0 100644
--- a/src/terminal_unix.go
+++ b/src/terminal_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package fzf
 
diff --git a/src/terminal_windows.go b/src/terminal_windows.go
index 5e748733..a1ea7a22 100644
--- a/src/terminal_windows.go
+++ b/src/terminal_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package fzf
 
diff --git a/src/tui/dummy.go b/src/tui/dummy.go
index af7e759c..686a1009 100644
--- a/src/tui/dummy.go
+++ b/src/tui/dummy.go
@@ -1,6 +1,4 @@
-// +build !ncurses
-// +build !tcell
-// +build !windows
+//go:build !tcell && !windows
 
 package tui
 
diff --git a/src/tui/light_unix.go b/src/tui/light_unix.go
index 936a13e3..6dc058c8 100644
--- a/src/tui/light_unix.go
+++ b/src/tui/light_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package tui
 
diff --git a/src/tui/light_windows.go b/src/tui/light_windows.go
index 875bf6f3..db829d3a 100644
--- a/src/tui/light_windows.go
+++ b/src/tui/light_windows.go
@@ -1,4 +1,4 @@
-//+build windows
+//go:build windows
 
 package tui
 
diff --git a/src/tui/tcell.go b/src/tui/tcell.go
index 82c75663..6f9b53a9 100644
--- a/src/tui/tcell.go
+++ b/src/tui/tcell.go
@@ -1,4 +1,4 @@
-// +build tcell windows
+//go:build tcell || windows
 
 package tui
 
diff --git a/src/tui/tcell_test.go b/src/tui/tcell_test.go
index aa63b726..96ea7ed3 100644
--- a/src/tui/tcell_test.go
+++ b/src/tui/tcell_test.go
@@ -1,4 +1,4 @@
-// +build tcell windows
+//go:build tcell || windows
 
 package tui
 
diff --git a/src/tui/ttyname_unix.go b/src/tui/ttyname_unix.go
index 68298cdc..b5f47416 100644
--- a/src/tui/ttyname_unix.go
+++ b/src/tui/ttyname_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package tui
 
diff --git a/src/tui/ttyname_windows.go b/src/tui/ttyname_windows.go
index 8db490ad..39b84f70 100644
--- a/src/tui/ttyname_windows.go
+++ b/src/tui/ttyname_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package tui
 
diff --git a/src/util/util_unix.go b/src/util/util_unix.go
index 6331275c..a76f770a 100644
--- a/src/util/util_unix.go
+++ b/src/util/util_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+//go:build !windows
 
 package util
 
diff --git a/src/util/util_windows.go b/src/util/util_windows.go
index e4e04376..b3f4e016 100644
--- a/src/util/util_windows.go
+++ b/src/util/util_windows.go
@@ -1,4 +1,4 @@
-// +build windows
+//go:build windows
 
 package util