Require Go 1.18.

- Run "go fix" to remove legacy build tags

- Use staticcheck@master until it has a release that supports Go 1.18

- Turn off autocrlf for Windows tasks

.cirrus.yml

@@ -1,26 +1,33 @@
 test_task:
   env:
     ELVISH_TEST_TIME_SCALE: 20
+  go_toolchain_cache:
+    fingerprint_key: 1.18
+    folder: $HOME/sdk
   go_modules_cache:
     fingerprint_script: cat go.sum
-    folder: $GOPATH/pkg/mod
+    folder: $HOME/go/pkg/mod
   matrix:
-    - name: Test on gccgo
-      container:
-        image: debian:unstable-slim
-      setup_script:
-        - apt-get -y update
-        - apt-get -y install ca-certificates gccgo-11
-        - ln -sf /usr/bin/go-11 /usr/local/bin/go
-      env:
-        # gccgo doesn't support race test
-        TEST_FLAG: ""
+    # Re-enable gccgo when it supports Go 1.18.
+    #- name: Test on gccgo
+    #  container:
+    #    image: debian:unstable-slim
+    #  setup_script:
+    #    - apt-get -y update
+    #    - apt-get -y install ca-certificates gccgo-11
+    #    - ln -sf /usr/bin/go-11 /usr/local/bin/go
+    #  env:
+    #    # gccgo doesn't support race test
+    #    TEST_FLAG: ""
     - name: Test on FreeBSD
       freebsd_instance:
-        image_family: freebsd-12-1
-      setup_script: pkg install -y go
+        image_family: freebsd-13-0
       env:
-        GOPATH: $HOME/go
         TEST_FLAG: -race
-  go_version_script: go version
-  test_script: go test $TEST_FLAG ./...
+        PATH: $HOME/go/bin:$PATH
+      setup_script: |
+        pkg install -y go git
+        go install golang.org/dl/go1.18@latest
+        go1.18 download
+  go_version_script: go1.18 version
+  test_script: go1.18 test $TEST_FLAG ./...

.github/workflows/ci.yml

@@ -16,15 +16,23 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu, macos, windows]
-        go-version: [1.17.x]
-        include:
-          # Test old supported Go version
-          - os: ubuntu
-            go-version: 1.16.x
+        go-version: [1.18.x]
+        # We usually support building Elvish with Go 1.N-1 too, but since Go
+        # 1.18 brought a lot of improvements, we dropped support for Go 1.17
+        # when Go 1.18 is released. When Go 1.19 is released, uncomment the
+        # stanza below to test on Go 1.18 too.
+        #include:
+        #  # Test old supported Go version
+        #  - os: ubuntu
+        #    go-version: 1.18.x
     env:
       ELVISH_TEST_TIME_SCALE: 20
     runs-on: ${{ matrix.os }}-latest
     steps:
+    # autocrlf is problematic for fuzz testdata.
+    - name: Turn off autocrlf
+      if: matrix.os == 'windows'
+      run: git config --global core.autocrlf false
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Set up cache
@@ -51,10 +59,10 @@ jobs:
       if: matrix.os == 'ubuntu'
       run: echo ostype=linux >> $GITHUB_ENV
     - name: Generate test coverage
-      if: matrix.go-version == '1.17.x'
+      if: matrix.go-version == '1.18.x'
       run: go test -coverprofile=cover -coverpkg=./pkg/... ./pkg/...
     - name: Save test coverage
-      if: matrix.go-version == '1.17.x'
+      if: matrix.go-version == '1.18.x'
       uses: actions/upload-artifact@v2
       with:
         name: cover-${{ env.ostype }}
@@ -72,7 +80,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17.x
+        go-version: 1.18.x
     - name: Run benchmarks
       run: go test -bench=. -run='^$' ./...
 
@@ -108,12 +116,12 @@ jobs:
         path: |
           ~/go/pkg/mod
           ~/.cache/go-build
-        key: buildall/${{ matrix.os }}/1.17.x/${{ hashFiles('go.sum') }}/${{ github.sha }}
-        restore-keys: buildall/${{ matrix.os }}/1.17.x/${{ hashFiles('go.sum') }}
+        key: buildall/${{ matrix.os }}/1.18.x/${{ hashFiles('go.sum') }}/${{ github.sha }}
+        restore-keys: buildall/${{ matrix.os }}/1.18.x/${{ hashFiles('go.sum') }}
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17.x
+        go-version: 1.18.x
     - name: Build binaries
       # TODO: Use PR number for suffix when running for PR
       run: ELVISH_REPRODUCIBLE=dev ./tools/buildall.sh . bin HEAD
@@ -132,7 +140,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17.x
+        go-version: 1.18.x
     - name: Set up goimports
       run: go install golang.org/x/tools/cmd/goimports@latest
     - name: Check style
@@ -205,9 +213,9 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17.x
+        go-version: 1.18.x
     - name: Set up staticcheck
-      run: go install honnef.co/go/tools/cmd/staticcheck@2021.1
+      run: go install honnef.co/go/tools/cmd/staticcheck@master
     - name: Run linters
       run: ./tools/lint.sh
 

CONTRIBUTING.md

@@ -159,7 +159,7 @@ formatted.
 Install [staticcheck](https://staticcheck.io):
 
 ```sh
-go install honnef.co/go/tools/cmd/staticcheck@2021.1
+go install honnef.co/go/tools/cmd/staticcheck@master
 ```
 
 The other linter Elvish uses is the standard `go vet` command. Elvish doesn't

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.16-alpine as builder
+FROM golang:1.18-alpine as builder
 RUN apk update && \
     apk add --virtual build-deps make git
 # Build Elvish

README.md

@@ -50,7 +50,7 @@ To build Elvish from source, you need
 
     **NOTE**: Windows 10 support is experimental.
 
--   Go >= 1.16.
+-   Go >= 1.18.
 
 To build Elvish from source, follow these steps:
 

go.mod

@@ -10,4 +10,6 @@ require (
 	golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9
 )
 
-go 1.16
+require golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
+
+go 1.18

pkg/cli/lscolors/feature_nonunix_test.go

@@ -1,5 +1,4 @@
 //go:build windows || plan9 || js
-// +build windows plan9 js
 
 package lscolors
 

pkg/cli/lscolors/feature_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package lscolors
 

pkg/cli/lscolors/stat_notsolaris.go

@@ -1,5 +1,4 @@
 //go:build !solaris
-// +build !solaris
 
 package lscolors
 

pkg/cli/lscolors/stat_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package lscolors
 

pkg/cli/term/file_reader_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package term
 

pkg/cli/term/file_reader_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package term
 

pkg/cli/term/read_rune_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package term
 

pkg/cli/term/reader_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package term
 

pkg/cli/term/reader_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package term
 

pkg/cli/term/setup_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package term
 

pkg/cli/term/setup_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package term
 

pkg/cli/tty_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package cli_test
 

pkg/daemon/activate_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package daemon
 

pkg/daemon/server_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package daemon
 

pkg/daemon/sys_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package daemon
 

pkg/edit/listing_nonwindows_test.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package edit
 

pkg/eval/builtin_fn_cmd_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package eval
 

pkg/eval/builtin_fn_cmd_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package eval_test
 

pkg/eval/builtin_fn_misc_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package eval_test
 

pkg/eval/compile_effect_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package eval_test
 

pkg/eval/exception_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package eval_test
 

pkg/eval/external_cmd_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package eval
 

pkg/eval/external_cmd_unix_internal_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package eval
 

pkg/eval/external_cmd_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package eval_test
 

pkg/eval/external_cmd_windows_test.go

@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package eval_test
 

pkg/eval/fuzz_test.go

@@ -1,5 +1,4 @@
 //go:build go1.18
-// +build go1.18
 
 package eval
 

pkg/eval/plugin.go

@@ -1,5 +1,4 @@
 //go:build !gccgo
-// +build !gccgo
 
 package eval
 

pkg/eval/plugin_gccgo.go

@@ -1,5 +1,4 @@
 //go:build gccgo
-// +build gccgo
 
 package eval
 

pkg/eval/port_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package eval
 

pkg/eval/process_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package eval
 

pkg/eval/vals/repr.go

@@ -26,8 +26,7 @@ type Reprer interface {
 
 // ReprPlain is like Repr, but without pretty-printing.
 func ReprPlain(v interface{}) string {
-	// TODO: Change to math.MinInt when Go 1.17 is required.
-	return Repr(v, math.MinInt32)
+	return Repr(v, math.MinInt)
 }
 
 // Repr returns the representation for a value, a string that is preferably

pkg/fsutil/search_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package fsutil
 

pkg/fsutil/search_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package fsutil
 

pkg/mods/platform/unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package platform
 

pkg/mods/platform/windows.go

@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package platform
 

pkg/mods/unix/non_unix.go

@@ -1,5 +1,4 @@
 //go:build windows || plan9 || js
-// +build windows plan9 js
 
 // Package unix exports an Elvish namespace that contains variables and
 // functions that deal with features unique to UNIX-like operating systems. On

pkg/mods/unix/rlim_t_int64.go

@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd
 
 package unix
 

pkg/mods/unix/rlim_t_uint64.go

@@ -1,5 +1,4 @@
 //go:build !freebsd && !windows && !plan9 && !js
-// +build !freebsd,!windows,!plan9,!js
 
 package unix
 

pkg/mods/unix/rlimit.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package unix
 

pkg/mods/unix/rlimit_keys.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package unix
 

pkg/mods/unix/rlimit_keys_as.go

@@ -1,5 +1,4 @@
 //go:build !openbsd && !darwin && !windows && !plan9 && !js
-// +build !openbsd,!darwin,!windows,!plan9,!js
 
 package unix
 

pkg/mods/unix/rlimit_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package unix
 

pkg/mods/unix/testutils_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package unix
 

pkg/mods/unix/umask.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package unix
 

pkg/mods/unix/umask_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package unix
 

pkg/mods/unix/unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 // Package unix exports an Elvish namespace that contains variables and
 // functions that deal with features unique to UNIX-like operating systems. On

pkg/parse/fuzz_test.go

@@ -1,5 +1,4 @@
 //go:build go1.18
-// +build go1.18
 
 package parse
 

pkg/shell/interact_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package shell
 

pkg/shell/paths_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package shell
 

pkg/shell/paths_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package shell
 

pkg/shell/signal_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package shell
 

pkg/sys/eunix/tc.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package eunix
 

pkg/sys/eunix/termios.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 // Copyright 2015 go-termios Author. All Rights Reserved.
 // https://github.com/go-termios/termios

pkg/sys/eunix/termios_32bitflag.go

@@ -1,5 +1,4 @@
 //go:build !(darwin && (amd64 || arm64))
-// +build !darwin !amd64,!arm64
 
 package eunix
 

pkg/sys/eunix/termios_64bitflag.go

@@ -1,6 +1,4 @@
 //go:build darwin && (amd64 || arm64)
-// +build darwin
-// +build amd64 arm64
 
 package eunix
 

pkg/sys/eunix/termios_bsd.go

@@ -1,5 +1,4 @@
 //go:build darwin || dragonfly || freebsd || netbsd || openbsd
-// +build darwin dragonfly freebsd netbsd openbsd
 
 // Copyright 2015 go-termios Author. All Rights Reserved.
 // https://github.com/go-termios/termios

pkg/sys/eunix/termios_notbsd.go

@@ -1,5 +1,4 @@
 //go:build linux || solaris
-// +build linux solaris
 
 // Copyright 2015 go-termios Author. All Rights Reserved.
 // https://github.com/go-termios/termios

pkg/sys/eunix/waitforread.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package eunix
 

pkg/sys/eunix/waitforread_test.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 package eunix
 

pkg/sys/signal_nonunix.go

@@ -1,5 +1,4 @@
 //go:build windows || plan9 || js
-// +build windows plan9 js
 
 package sys
 

pkg/sys/signal_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package sys
 

pkg/sys/winsize_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9
-// +build !windows,!plan9
 
 // Copyright 2015 go-termios Author. All Rights Reserved.
 // https://github.com/go-termios/termios

pkg/testutil/testdir_nonwindows_test.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package testutil
 

pkg/testutil/umask_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows && !plan9 && !js
-// +build !windows,!plan9,!js
 
 package testutil
 

website/go.mod

@@ -1,10 +1,12 @@
 module src.elv.sh/website
 
-go 1.16
+go 1.18
 
 require (
 	github.com/BurntSushi/toml v1.0.0
 	src.elv.sh v0.17.0
 )
 
+require golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
+
 replace src.elv.sh => ../

website/go.sum

@@ -1,15 +1,6 @@
 github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU=
 github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/creack/pty v1.1.15/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/sourcegraph/go-lsp v0.0.0-20200429204803-219e11d77f5d/go.mod h1:SULmZY7YNBsvNiQbrb/BEDdEJ84TGnfyUQxaHt8t8rY=
-github.com/sourcegraph/jsonrpc2 v0.1.0/go.mod h1:ZafdZgk/axhT1cvZAPOhw+95nz2I/Ra5qMlU4gTRwIo=
-go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
-golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=