From d07cde0df9c5edd46e05e21d29eb315e0b452cbc Mon Sep 17 00:00:00 2001 From: Robert van Gent Date: Wed, 17 Feb 2021 10:27:44 -0800 Subject: [PATCH 01/17] update to go 1.16 (#281) --- .travis.yml | 15 ++++++++------- go.mod | 6 ++++-- go.sum | 35 +++++++++++++++++++++++++++-------- internal/alldeps | 3 +++ internal/check_api_change.sh | 8 ++------ internal/runtests.sh | 36 +++++++++++++++++++++++------------- 6 files changed, 67 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index 680a5003..3073a03f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,15 +39,16 @@ env: - GO111MODULE=on - GOPROXY=https://proxy.golang.org -# When updating Go versions: -# In addition to changing the "go:" versions below, edit the version -# test in internal/runtests.sh. - jobs: + # When updating Go versions: + # In addition to changing the "go:" versions below, edit the version + # test in ./internal/runtests.sh. include: - - go: "1.13.x" + - go: "1.15.x" + os: linux + - go: "1.16.x" os: linux - - go: "1.13.x" + - go: "1.16.x" os: osx - - go: "1.13.x" + - go: "1.16.x" os: windows diff --git a/go.mod b/go.mod index b2233dc5..7335ae1a 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,9 @@ go 1.12 require ( github.com/google/go-cmp v0.2.0 - github.com/google/subcommands v1.0.1 + github.com/google/subcommands v1.2.0 github.com/pmezard/go-difflib v1.0.0 - golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b + golang.org/x/mod v0.4.1 // indirect + golang.org/x/sys v0.0.0-20210216224549-f992740a1bac // indirect + golang.org/x/tools v0.1.0 ) diff --git a/go.sum b/go.sum index 132636db..ff9cc31e 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,34 @@ github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TUH7k= -github.com/google/subcommands v1.0.1/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= +github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE= +github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210216224549-f992740a1bac h1:9glrpwtNjBYgRpb67AZJKHfzj1stG/8BL5H7In2oTC4= +golang.org/x/sys v0.0.0-20210216224549-f992740a1bac/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b h1:NVD8gBK33xpdqCaZVVtd6OFJp+3dxkXuz7+U7KaVN6s= -golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/alldeps b/internal/alldeps index e2ede73a..7a7b3f0f 100644 --- a/internal/alldeps +++ b/internal/alldeps @@ -1,4 +1,7 @@ github.com/google/subcommands github.com/google/wire github.com/pmezard/go-difflib +golang.org/x/mod +golang.org/x/sys golang.org/x/tools +golang.org/x/xerrors diff --git a/internal/check_api_change.sh b/internal/check_api_change.sh index fdbf988a..19265ba4 100755 --- a/internal/check_api_change.sh +++ b/internal/check_api_change.sh @@ -31,23 +31,19 @@ set -euo pipefail UPSTREAM_BRANCH="${TRAVIS_BRANCH:-master}" echo "Checking for incompatible API changes relative to ${UPSTREAM_BRANCH}..." -INSTALL_DIR="$(mktemp -d)" MASTER_CLONE_DIR="$(mktemp -d)" PKGINFO_BRANCH=$(mktemp) PKGINFO_MASTER=$(mktemp) function cleanup() { - rm -rf "$INSTALL_DIR" rm -rf "$MASTER_CLONE_DIR" rm -f "$PKGINFO_BRANCH" rm -f "$PKGINFO_MASTER" } trap cleanup EXIT -# Move to a temporary directory while installing apidiff to avoid changing -# the local .mod file. -( cd "$INSTALL_DIR" && exec go mod init unused ) -( cd "$INSTALL_DIR" && exec go install golang.org/x/exp/cmd/apidiff ) +# Install apidiff. +go install golang.org/x/exp/cmd/apidiff@latest git clone -b "$UPSTREAM_BRANCH" . "$MASTER_CLONE_DIR" &> /dev/null diff --git a/internal/runtests.sh b/internal/runtests.sh index 2e7915e9..75fee90e 100755 --- a/internal/runtests.sh +++ b/internal/runtests.sh @@ -41,16 +41,26 @@ if [[ "${TRAVIS_OS_NAME:-linux}" != "linux" ]]; then exit $result fi -echo -echo "Ensuring .go files are formatted with gofmt -s..." -mapfile -t go_files < <(find . -name '*.go' -type f | grep -v testdata) -DIFF="$(gofmt -s -d "${go_files[@]}")" -if [ -n "$DIFF" ]; then - echo "FAIL: please run gofmt -s and commit the result" - echo "$DIFF"; - result=1; -else - echo "OK" +# Update the regexp below when upgrading to a +# new Go version. Some checks below we only run +# for the latest Go version. +latest_go_version=0 +if [[ $(go version) == *go1\.16* ]]; then + latest_go_version=1 +fi + +if [[ ${latest_go_version} -eq 1 ]]; then + echo + echo "Ensuring .go files are formatted with gofmt -s..." + mapfile -t go_files < <(find . -name '*.go' -type f | grep -v testdata) + DIFF="$(gofmt -s -d "${go_files[@]}")" + if [ -n "$DIFF" ]; then + echo "FAIL: please run gofmt -s and commit the result" + echo "$DIFF"; + result=1; + else + echo "OK" + fi; fi; @@ -59,13 +69,13 @@ fi; # ./internal/alldeps # # Whenever project dependencies change, rerun ./internal/listdeps.sh -if [[ $(go version) == *go1\.12* ]]; then +if [[ ${latest_go_version} -eq 1 ]]; then echo echo "Ensuring that there are no dependencies not listed in ./internal/alldeps..." (./internal/listdeps.sh | diff ./internal/alldeps - && echo "OK") || { echo "FAIL: dependencies changed; run: internal/listdeps.sh > internal/alldeps" # Module behavior may differ across versions. - echo "using go version 1.12." + echo "using the latest go version." result=1 } fi @@ -73,7 +83,7 @@ fi # For pull requests, check if there are undeclared incompatible API changes. # Skip this if we're already going to fail since it is expensive. -if [[ ${result} -eq 0 ]] && [[ ! -z "${TRAVIS_BRANCH:-x}" ]] && [[ ! -z "${TRAVIS_PULL_REQUEST_SHA:-x}" ]]; then +if [[ ${latest_go_version} -eq 1 ]] && [[ ${result} -eq 0 ]] && [[ ! -z "${TRAVIS_BRANCH:-x}" ]] && [[ ! -z "${TRAVIS_PULL_REQUEST_SHA:-x}" ]]; then echo ./internal/check_api_change.sh || result=1; fi From cb1364cdf16a6af6c6b181805f3f4d06b0177eab Mon Sep 17 00:00:00 2001 From: Robert van Gent Date: Mon, 30 Aug 2021 13:01:23 -0700 Subject: [PATCH 02/17] all: add a Github Workflow to run tests (#307) --- .github/workflows/tests.yml | 39 +++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/tests.yml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 00000000..c588acd3 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,39 @@ +# Copyright 2021 The Wire Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: Wire Tests +on: [push, pull_request] +jobs: + build: + strategy: + matrix: + # Run most recent version of Go on all supported OSs. + # When updating Go versions, also edit the version test in + # internal/runtests.sh. + os: [ubuntu-latest, macos-latest, windows-latest] + go-version: 1.17.x + # Also run previous version of Go, but only on Ubuntu. + include: + - os: ubuntu-latest + go-version: 1.16.x + runs-on: ${{ matrix.os }} + steps: + - name: Install Go + uses: actions/setup-go@v2 + with: + go-version: ${{ matrix.go-version }} + - name: Checkout code + uses: actions/checkout@v2 + - name: Test + 'internal/runtests.sh' From e23bb7109a344e77fceff6f9013bca55996808fe Mon Sep 17 00:00:00 2001 From: Robert van Gent Date: Mon, 30 Aug 2021 13:13:41 -0700 Subject: [PATCH 03/17] all: try to fix test workflow (#308) --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c588acd3..0ea83576 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -36,4 +36,4 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Test - 'internal/runtests.sh' + run: './internal/runtests.sh' From 8b20581338ae25def597310313636a508b089c1c Mon Sep 17 00:00:00 2001 From: Robert van Gent Date: Mon, 30 Aug 2021 13:35:47 -0700 Subject: [PATCH 04/17] all: update record/replay files for new version of go (#310) --- internal/wire/testdata/BindInjectorArg/want/wire_gen.go | 3 ++- internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go | 3 ++- internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go | 3 ++- internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go | 3 ++- internal/wire/testdata/Chain/want/wire_gen.go | 3 ++- internal/wire/testdata/Cleanup/want/wire_gen.go | 3 ++- internal/wire/testdata/CopyOtherDecls/want/wire_gen.go | 3 ++- internal/wire/testdata/DocComment/want/wire_gen.go | 3 ++- internal/wire/testdata/ExampleWithMocks/want/wire_gen.go | 3 ++- internal/wire/testdata/ExportedValue/want/wire_gen.go | 3 ++- .../testdata/ExportedValueDifferentPackage/want/wire_gen.go | 3 ++- internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go | 3 ++- internal/wire/testdata/FieldsOfStruct/want/wire_gen.go | 3 ++- internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go | 3 ++- internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go | 3 ++- internal/wire/testdata/Header/want/wire_gen.go | 3 ++- .../wire/testdata/ImportedInterfaceBinding/want/wire_gen.go | 3 ++- internal/wire/testdata/InjectInput/want/wire_gen.go | 3 ++- internal/wire/testdata/InjectWithPanic/want/wire_gen.go | 3 ++- internal/wire/testdata/InterfaceBinding/want/wire_gen.go | 3 ++- .../testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt | 2 +- internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go | 3 ++- internal/wire/testdata/InterfaceValue/want/wire_gen.go | 3 ++- .../testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt | 2 +- .../wire/testdata/MultipleSimilarPackages/want/wire_gen.go | 3 ++- internal/wire/testdata/NamingWorstCase/want/wire_gen.go | 3 ++- .../wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go | 3 ++- internal/wire/testdata/NiladicIdentity/want/wire_gen.go | 3 ++- internal/wire/testdata/NiladicValue/want/wire_gen.go | 3 ++- internal/wire/testdata/NoInjectParamNames/want/wire_gen.go | 3 ++- internal/wire/testdata/PartialCleanup/want/wire_gen.go | 3 ++- internal/wire/testdata/PkgImport/want/wire_gen.go | 3 ++- internal/wire/testdata/RelativePkg/want/wire_gen.go | 3 ++- internal/wire/testdata/ReservedKeywords/want/wire_gen.go | 3 ++- .../wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go | 3 ++- internal/wire/testdata/ReturnError/want/wire_gen.go | 3 ++- internal/wire/testdata/Struct/want/wire_gen.go | 3 ++- internal/wire/testdata/StructPointer/want/wire_gen.go | 3 ++- internal/wire/testdata/TwoDeps/want/wire_gen.go | 3 ++- internal/wire/testdata/ValueChain/want/wire_gen.go | 3 ++- internal/wire/testdata/ValueConversion/want/wire_gen.go | 3 ++- internal/wire/testdata/ValueIsStruct/want/wire_gen.go | 3 ++- internal/wire/testdata/VarValue/want/wire_gen.go | 3 ++- internal/wire/testdata/Varargs/want/wire_gen.go | 3 ++- 44 files changed, 86 insertions(+), 44 deletions(-) diff --git a/internal/wire/testdata/BindInjectorArg/want/wire_gen.go b/internal/wire/testdata/BindInjectorArg/want/wire_gen.go index 1b8ba1d5..25ce7235 100644 --- a/internal/wire/testdata/BindInjectorArg/want/wire_gen.go +++ b/internal/wire/testdata/BindInjectorArg/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go b/internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go index 53091f09..20a9f53c 100644 --- a/internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go +++ b/internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go b/internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go index fa4e50fc..b6255e1e 100644 --- a/internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go +++ b/internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go b/internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go index ad744f94..f75adb53 100644 --- a/internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go +++ b/internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/Chain/want/wire_gen.go b/internal/wire/testdata/Chain/want/wire_gen.go index ffa8d55c..257e642b 100644 --- a/internal/wire/testdata/Chain/want/wire_gen.go +++ b/internal/wire/testdata/Chain/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/Cleanup/want/wire_gen.go b/internal/wire/testdata/Cleanup/want/wire_gen.go index 12e1640c..eea8b223 100644 --- a/internal/wire/testdata/Cleanup/want/wire_gen.go +++ b/internal/wire/testdata/Cleanup/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/CopyOtherDecls/want/wire_gen.go b/internal/wire/testdata/CopyOtherDecls/want/wire_gen.go index db647bde..3dcb4b53 100644 --- a/internal/wire/testdata/CopyOtherDecls/want/wire_gen.go +++ b/internal/wire/testdata/CopyOtherDecls/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/DocComment/want/wire_gen.go b/internal/wire/testdata/DocComment/want/wire_gen.go index 03b34234..a1027b9c 100644 --- a/internal/wire/testdata/DocComment/want/wire_gen.go +++ b/internal/wire/testdata/DocComment/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/ExampleWithMocks/want/wire_gen.go b/internal/wire/testdata/ExampleWithMocks/want/wire_gen.go index 1f65f285..9f2fd0f9 100644 --- a/internal/wire/testdata/ExampleWithMocks/want/wire_gen.go +++ b/internal/wire/testdata/ExampleWithMocks/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/ExportedValue/want/wire_gen.go b/internal/wire/testdata/ExportedValue/want/wire_gen.go index 71776216..d3ba4549 100644 --- a/internal/wire/testdata/ExportedValue/want/wire_gen.go +++ b/internal/wire/testdata/ExportedValue/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/ExportedValueDifferentPackage/want/wire_gen.go b/internal/wire/testdata/ExportedValueDifferentPackage/want/wire_gen.go index 644de349..d8bdd24f 100644 --- a/internal/wire/testdata/ExportedValueDifferentPackage/want/wire_gen.go +++ b/internal/wire/testdata/ExportedValueDifferentPackage/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go b/internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go index eb66e4ba..fbdc062a 100644 --- a/internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go +++ b/internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/FieldsOfStruct/want/wire_gen.go b/internal/wire/testdata/FieldsOfStruct/want/wire_gen.go index 8baee553..c27e6d0b 100644 --- a/internal/wire/testdata/FieldsOfStruct/want/wire_gen.go +++ b/internal/wire/testdata/FieldsOfStruct/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go b/internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go index 480f8403..6a03e81d 100644 --- a/internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go +++ b/internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go b/internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go index 15951880..5b61dfea 100644 --- a/internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go +++ b/internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/Header/want/wire_gen.go b/internal/wire/testdata/Header/want/wire_gen.go index 07e319c3..3ab21079 100644 --- a/internal/wire/testdata/Header/want/wire_gen.go +++ b/internal/wire/testdata/Header/want/wire_gen.go @@ -3,7 +3,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/ImportedInterfaceBinding/want/wire_gen.go b/internal/wire/testdata/ImportedInterfaceBinding/want/wire_gen.go index e3e745f6..6a7cd42a 100644 --- a/internal/wire/testdata/ImportedInterfaceBinding/want/wire_gen.go +++ b/internal/wire/testdata/ImportedInterfaceBinding/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/InjectInput/want/wire_gen.go b/internal/wire/testdata/InjectInput/want/wire_gen.go index 6a04f53f..c17559c5 100644 --- a/internal/wire/testdata/InjectInput/want/wire_gen.go +++ b/internal/wire/testdata/InjectInput/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/InjectWithPanic/want/wire_gen.go b/internal/wire/testdata/InjectWithPanic/want/wire_gen.go index f5f5237d..92cb390b 100644 --- a/internal/wire/testdata/InjectWithPanic/want/wire_gen.go +++ b/internal/wire/testdata/InjectWithPanic/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/InterfaceBinding/want/wire_gen.go b/internal/wire/testdata/InterfaceBinding/want/wire_gen.go index 7c7fa825..f1d7f17a 100644 --- a/internal/wire/testdata/InterfaceBinding/want/wire_gen.go +++ b/internal/wire/testdata/InterfaceBinding/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt b/internal/wire/testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt index 022422f0..cae32670 100644 --- a/internal/wire/testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt +++ b/internal/wire/testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt @@ -1 +1 @@ -example.com/foo/wire.go:x:y: too few arguments in call to wire.Bind \ No newline at end of file +example.com/foo/wire.go:x:y: not enough arguments in call to wire.Bind \ No newline at end of file diff --git a/internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go b/internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go index 91ad1706..bff6877c 100644 --- a/internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go +++ b/internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/InterfaceValue/want/wire_gen.go b/internal/wire/testdata/InterfaceValue/want/wire_gen.go index a09adc6c..0cc1e8c8 100644 --- a/internal/wire/testdata/InterfaceValue/want/wire_gen.go +++ b/internal/wire/testdata/InterfaceValue/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt b/internal/wire/testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt index f203dbd3..2081cb51 100644 --- a/internal/wire/testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt +++ b/internal/wire/testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt @@ -1 +1 @@ -example.com/foo/wire.go:x:y: too few arguments in call to wire.InterfaceValue \ No newline at end of file +example.com/foo/wire.go:x:y: not enough arguments in call to wire.InterfaceValue \ No newline at end of file diff --git a/internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go b/internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go index 13bb34bb..a43b6e4d 100644 --- a/internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go +++ b/internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/NamingWorstCase/want/wire_gen.go b/internal/wire/testdata/NamingWorstCase/want/wire_gen.go index af7ab8c0..23dd8fa4 100644 --- a/internal/wire/testdata/NamingWorstCase/want/wire_gen.go +++ b/internal/wire/testdata/NamingWorstCase/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go b/internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go index ed0758a9..dac690d6 100644 --- a/internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go +++ b/internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/NiladicIdentity/want/wire_gen.go b/internal/wire/testdata/NiladicIdentity/want/wire_gen.go index f5f5237d..92cb390b 100644 --- a/internal/wire/testdata/NiladicIdentity/want/wire_gen.go +++ b/internal/wire/testdata/NiladicIdentity/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/NiladicValue/want/wire_gen.go b/internal/wire/testdata/NiladicValue/want/wire_gen.go index ad744f94..f75adb53 100644 --- a/internal/wire/testdata/NiladicValue/want/wire_gen.go +++ b/internal/wire/testdata/NiladicValue/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/NoInjectParamNames/want/wire_gen.go b/internal/wire/testdata/NoInjectParamNames/want/wire_gen.go index a613d1ad..c943b5cc 100644 --- a/internal/wire/testdata/NoInjectParamNames/want/wire_gen.go +++ b/internal/wire/testdata/NoInjectParamNames/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/PartialCleanup/want/wire_gen.go b/internal/wire/testdata/PartialCleanup/want/wire_gen.go index e5dd8b9d..a3ef6a4c 100644 --- a/internal/wire/testdata/PartialCleanup/want/wire_gen.go +++ b/internal/wire/testdata/PartialCleanup/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/PkgImport/want/wire_gen.go b/internal/wire/testdata/PkgImport/want/wire_gen.go index 94441149..7dbc4692 100644 --- a/internal/wire/testdata/PkgImport/want/wire_gen.go +++ b/internal/wire/testdata/PkgImport/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/RelativePkg/want/wire_gen.go b/internal/wire/testdata/RelativePkg/want/wire_gen.go index f5f5237d..92cb390b 100644 --- a/internal/wire/testdata/RelativePkg/want/wire_gen.go +++ b/internal/wire/testdata/RelativePkg/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/ReservedKeywords/want/wire_gen.go b/internal/wire/testdata/ReservedKeywords/want/wire_gen.go index 8d9f7d59..a8a6ae76 100644 --- a/internal/wire/testdata/ReservedKeywords/want/wire_gen.go +++ b/internal/wire/testdata/ReservedKeywords/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go b/internal/wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go index e1ba2429..5d73b549 100644 --- a/internal/wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go +++ b/internal/wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/ReturnError/want/wire_gen.go b/internal/wire/testdata/ReturnError/want/wire_gen.go index 93e03bb4..6a759777 100644 --- a/internal/wire/testdata/ReturnError/want/wire_gen.go +++ b/internal/wire/testdata/ReturnError/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/Struct/want/wire_gen.go b/internal/wire/testdata/Struct/want/wire_gen.go index 7f58000e..3529cb2b 100644 --- a/internal/wire/testdata/Struct/want/wire_gen.go +++ b/internal/wire/testdata/Struct/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/StructPointer/want/wire_gen.go b/internal/wire/testdata/StructPointer/want/wire_gen.go index 84be63df..1fa1bd8d 100644 --- a/internal/wire/testdata/StructPointer/want/wire_gen.go +++ b/internal/wire/testdata/StructPointer/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/TwoDeps/want/wire_gen.go b/internal/wire/testdata/TwoDeps/want/wire_gen.go index da2deae2..29cde76d 100644 --- a/internal/wire/testdata/TwoDeps/want/wire_gen.go +++ b/internal/wire/testdata/TwoDeps/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/ValueChain/want/wire_gen.go b/internal/wire/testdata/ValueChain/want/wire_gen.go index 23eedd83..9e4a669c 100644 --- a/internal/wire/testdata/ValueChain/want/wire_gen.go +++ b/internal/wire/testdata/ValueChain/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/ValueConversion/want/wire_gen.go b/internal/wire/testdata/ValueConversion/want/wire_gen.go index 8183f036..9c1c4b61 100644 --- a/internal/wire/testdata/ValueConversion/want/wire_gen.go +++ b/internal/wire/testdata/ValueConversion/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/ValueIsStruct/want/wire_gen.go b/internal/wire/testdata/ValueIsStruct/want/wire_gen.go index c90ec703..9e0b96c4 100644 --- a/internal/wire/testdata/ValueIsStruct/want/wire_gen.go +++ b/internal/wire/testdata/ValueIsStruct/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/VarValue/want/wire_gen.go b/internal/wire/testdata/VarValue/want/wire_gen.go index 70012813..8a2bc61d 100644 --- a/internal/wire/testdata/VarValue/want/wire_gen.go +++ b/internal/wire/testdata/VarValue/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/wire/testdata/Varargs/want/wire_gen.go b/internal/wire/testdata/Varargs/want/wire_gen.go index d26201ca..d6cef6a3 100644 --- a/internal/wire/testdata/Varargs/want/wire_gen.go +++ b/internal/wire/testdata/Varargs/want/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main From 737d4615ed6064bb949e4cfa2ead194f8d2dec2c Mon Sep 17 00:00:00 2001 From: Robert van Gent Date: Mon, 30 Aug 2021 15:21:53 -0700 Subject: [PATCH 05/17] all: fix Github Workflow for tests, drop Travis --- .gitattributes | 1 + .github/workflows/tests.yml | 16 ++++------- .travis.yml | 54 ----------------------------------- _tutorial/wire.go | 3 +- _tutorial/wire_gen.go | 3 +- internal/runtests.sh | 56 +++++++++++++++---------------------- 6 files changed, 33 insertions(+), 100 deletions(-) create mode 100644 .gitattributes delete mode 100644 .travis.yml diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..fcadb2cf --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text eol=lf diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0ea83576..4a6b29e9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,15 +18,8 @@ jobs: build: strategy: matrix: - # Run most recent version of Go on all supported OSs. - # When updating Go versions, also edit the version test in - # internal/runtests.sh. os: [ubuntu-latest, macos-latest, windows-latest] - go-version: 1.17.x - # Also run previous version of Go, but only on Ubuntu. - include: - - os: ubuntu-latest - go-version: 1.16.x + go-version: [1.17.x] runs-on: ${{ matrix.os }} steps: - name: Install Go @@ -35,5 +28,8 @@ jobs: go-version: ${{ matrix.go-version }} - name: Checkout code uses: actions/checkout@v2 - - name: Test - run: './internal/runtests.sh' + with: + fetch-depth: 2 # required for codecov + - name: Run Tests + shell: bash + run: 'internal/runtests.sh' diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 3073a03f..00000000 --- a/.travis.yml +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2018 The Wire Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -language: go -go_import_path: github.com/google/wire - -before_install: - # The Bash that comes with OS X is ancient. - # grep is similar: it's not GNU grep, which means commands aren't portable. - # Homebrew installs grep as ggrep if you don't build from source, so it needs - # moving so it takes precedence in the PATH. - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - HOMEBREW_NO_AUTO_UPDATE=1 brew install bash grep; - mv $(brew --prefix)/bin/ggrep $(brew --prefix)/bin/grep; - fi - -install: - # Re-checkout files preserving line feeds. This prevents Windows builds from - # converting \n to \r\n. - - "git config --global core.autocrlf input" - - "git checkout -- ." - -script: - - 'internal/runtests.sh' - -env: - global: - - GO111MODULE=on - - GOPROXY=https://proxy.golang.org - -jobs: - # When updating Go versions: - # In addition to changing the "go:" versions below, edit the version - # test in ./internal/runtests.sh. - include: - - go: "1.15.x" - os: linux - - go: "1.16.x" - os: linux - - go: "1.16.x" - os: osx - - go: "1.16.x" - os: windows diff --git a/_tutorial/wire.go b/_tutorial/wire.go index a0e0571d..9f5b7475 100644 --- a/_tutorial/wire.go +++ b/_tutorial/wire.go @@ -12,7 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//+build wireinject +//go:build wireinject +// +build wireinject // The build tag makes sure the stub is not built in the final build. package main diff --git a/_tutorial/wire_gen.go b/_tutorial/wire_gen.go index 46ce25c3..7a93a7b0 100644 --- a/_tutorial/wire_gen.go +++ b/_tutorial/wire_gen.go @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. //go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:build !wireinject +// +build !wireinject package main diff --git a/internal/runtests.sh b/internal/runtests.sh index 75fee90e..11f9d5f4 100755 --- a/internal/runtests.sh +++ b/internal/runtests.sh @@ -24,7 +24,7 @@ fi # Run Go tests. Only do coverage for the Linux build # because it is slow, and codecov will only save the last one anyway. result=0 -if [[ "${TRAVIS_OS_NAME:-}" == "linux" ]]; then +if [[ "${RUNNER_OS:-}" == "Linux" ]]; then echo "Running Go tests (with coverage)..." go test -mod=readonly -race -coverpkg=./... -coverprofile=coverage.out ./... || result=1 if [ -f coverage.out ] && [ $result -eq 0 ]; then @@ -36,31 +36,21 @@ else fi # No need to run other checks on OSs other than linux. -# We default TRAVIS_OS_NAME to "linux" so that we don't abort here when run locally. -if [[ "${TRAVIS_OS_NAME:-linux}" != "linux" ]]; then +# We default RUNNER_OS to "Linux" so that we don't abort here when run locally. +if [[ "${RUNNER_OS:-Linux}" != "Linux" ]]; then exit $result fi -# Update the regexp below when upgrading to a -# new Go version. Some checks below we only run -# for the latest Go version. -latest_go_version=0 -if [[ $(go version) == *go1\.16* ]]; then - latest_go_version=1 -fi - -if [[ ${latest_go_version} -eq 1 ]]; then - echo - echo "Ensuring .go files are formatted with gofmt -s..." - mapfile -t go_files < <(find . -name '*.go' -type f | grep -v testdata) - DIFF="$(gofmt -s -d "${go_files[@]}")" - if [ -n "$DIFF" ]; then - echo "FAIL: please run gofmt -s and commit the result" - echo "$DIFF"; - result=1; - else - echo "OK" - fi; +echo +echo "Ensuring .go files are formatted with gofmt -s..." +mapfile -t go_files < <(find . -name '*.go' -type f | grep -v testdata) +DIFF="$(gofmt -s -d "${go_files[@]}")" +if [ -n "$DIFF" ]; then + echo "FAIL: please run gofmt -s and commit the result" + echo "$DIFF"; + result=1; +else + echo "OK" fi; @@ -69,21 +59,19 @@ fi; # ./internal/alldeps # # Whenever project dependencies change, rerun ./internal/listdeps.sh -if [[ ${latest_go_version} -eq 1 ]]; then - echo - echo "Ensuring that there are no dependencies not listed in ./internal/alldeps..." - (./internal/listdeps.sh | diff ./internal/alldeps - && echo "OK") || { - echo "FAIL: dependencies changed; run: internal/listdeps.sh > internal/alldeps" - # Module behavior may differ across versions. - echo "using the latest go version." - result=1 - } -fi +echo +echo "Ensuring that there are no dependencies not listed in ./internal/alldeps..." +(./internal/listdeps.sh | diff ./internal/alldeps - && echo "OK") || { + echo "FAIL: dependencies changed; run: internal/listdeps.sh > internal/alldeps" + # Module behavior may differ across versions. + echo "using the latest go version." + result=1 +} # For pull requests, check if there are undeclared incompatible API changes. # Skip this if we're already going to fail since it is expensive. -if [[ ${latest_go_version} -eq 1 ]] && [[ ${result} -eq 0 ]] && [[ ! -z "${TRAVIS_BRANCH:-x}" ]] && [[ ! -z "${TRAVIS_PULL_REQUEST_SHA:-x}" ]]; then +if ${result} -eq 0 ]] && [[ ! -z "${GITHUB_HEAD_REF:-x}" ]]; then echo ./internal/check_api_change.sh || result=1; fi From ae4e74aa6b9e49db3d5379be9d4775d62824f2f8 Mon Sep 17 00:00:00 2001 From: Robert van Gent Date: Mon, 30 Aug 2021 16:16:39 -0700 Subject: [PATCH 06/17] all: update stale refs to Travis (#312) --- CONTRIBUTING.md | 4 ++-- README.md | 2 +- internal/check_api_change.sh | 7 ++----- internal/listdeps.sh | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 68445fc4..ee19499f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -78,11 +78,11 @@ again. If you are submitting code on behalf of your employer, there's a single commit before merging your change. * Check the diffs, write a useful description (including something like `Fixes #123` if it's fixing a bug) and send the PR out. -* [Travis CI](http://travis-ci.com) will run tests against the PR. This should +* Github will run tests against the PR. This should happen within 10 minutes or so. If a test fails, go back to the coding stage and try to fix the test and push the same branch again. You won't need to make a new pull request, the changes will be rolled directly into the PR you - already opened. Wait for Travis again. There is no need to assign a reviewer + already opened. Wait for the tests again. There is no need to assign a reviewer to the PR, the project team will assign someone for review during the standard [triage](#triaging) process. diff --git a/README.md b/README.md index 10983be0..839529ab 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wire: Automated Initialization in Go -[![Build Status](https://travis-ci.com/google/wire.svg?branch=master)][travis] +[![Build Status](https://github.com/github/google/wire/workflows/tests.yml/badge.svg?branch=main) [![godoc](https://godoc.org/github.com/google/wire?status.svg)][godoc] [![Coverage](https://codecov.io/gh/google/wire/branch/master/graph/badge.svg)](https://codecov.io/gh/google/wire) diff --git a/internal/check_api_change.sh b/internal/check_api_change.sh index 19265ba4..273aace8 100755 --- a/internal/check_api_change.sh +++ b/internal/check_api_change.sh @@ -21,14 +21,11 @@ # This script expects: # a) to be run at the root of the repository # b) HEAD is pointing to a commit that merges between the pull request and the -# upstream branch (TRAVIS_BRANCH). This is what Travis does (see -# https://docs.travis-ci.com/user/pull-requests/ for details), but if you -# are testing this script manually, you may need to manually create a merge -# commit. +# upstream branch (GITHUB_HEAD_REF). set -euo pipefail -UPSTREAM_BRANCH="${TRAVIS_BRANCH:-master}" +UPSTREAM_BRANCH="${GITHUB_HEAD_REF:-master}" echo "Checking for incompatible API changes relative to ${UPSTREAM_BRANCH}..." MASTER_CLONE_DIR="$(mktemp -d)" diff --git a/internal/listdeps.sh b/internal/listdeps.sh index 3b79f4bd..fc99ade9 100755 --- a/internal/listdeps.sh +++ b/internal/listdeps.sh @@ -20,6 +20,6 @@ set -euo pipefail # $ internal/listdeps.sh > internal/alldeps # # Important note: there are changes in module tooling behavior between go 1.11 -# and go 1.12; please make sure to use the same version of Go as used by Travis -# (see .travis.yml) when updating the alldeps file. +# and go 1.12; please make sure to use the same version of Go as used by Github +# Actions (see .github/workflows/tests.yml) when updating the alldeps file. go list -deps -f '{{with .Module}}{{.Path}}{{end}}' ./... | sort | uniq From 3fd3a427dd3f6aadd39c358d7266ece11e0f3b6d Mon Sep 17 00:00:00 2001 From: Robert van Gent Date: Mon, 30 Aug 2021 16:28:34 -0700 Subject: [PATCH 07/17] doc: fix badge in readme (#313) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 839529ab..be32ff0d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wire: Automated Initialization in Go -[![Build Status](https://github.com/github/google/wire/workflows/tests.yml/badge.svg?branch=main) +[![Build Status](https://github.com/github/google/wire/workflows/tests.yml/badge.svg?branch=main)][build] [![godoc](https://godoc.org/github.com/google/wire?status.svg)][godoc] [![Coverage](https://codecov.io/gh/google/wire/branch/master/graph/badge.svg)](https://codecov.io/gh/google/wire) From 233b341f94f2977f584e6bbbc3cb3660dcece516 Mon Sep 17 00:00:00 2001 From: Robert van Gent Date: Mon, 30 Aug 2021 16:31:21 -0700 Subject: [PATCH 08/17] doc: fix badge in readme (#314) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index be32ff0d..82d45f9c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wire: Automated Initialization in Go -[![Build Status](https://github.com/github/google/wire/workflows/tests.yml/badge.svg?branch=main)][build] +[![Build Status](https://github.com/google/wire/actions/workflows/tests.yml/badge.svg?branch=main)][build] [![godoc](https://godoc.org/github.com/google/wire?status.svg)][godoc] [![Coverage](https://codecov.io/gh/google/wire/branch/master/graph/badge.svg)](https://codecov.io/gh/google/wire) From 7e8af290485e932fe094c10f084c8f8df0c96d93 Mon Sep 17 00:00:00 2001 From: Robert van Gent Date: Mon, 30 Aug 2021 16:32:22 -0700 Subject: [PATCH 09/17] doc: fix badge in readme (#315) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 82d45f9c..0fbd28a7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wire: Automated Initialization in Go -[![Build Status](https://github.com/google/wire/actions/workflows/tests.yml/badge.svg?branch=main)][build] +![Build Status](https://github.com/google/wire/actions/workflows/tests.yml/badge.svg?branch=main) [![godoc](https://godoc.org/github.com/google/wire?status.svg)][godoc] [![Coverage](https://codecov.io/gh/google/wire/branch/master/graph/badge.svg)](https://codecov.io/gh/google/wire) From 3b6fb78a3fe4be519cebdd2469248b7cd8676ee1 Mon Sep 17 00:00:00 2001 From: Robert van Gent Date: Mon, 30 Aug 2021 17:57:05 -0700 Subject: [PATCH 10/17] tests: disable apidiff check (#316) --- internal/check_api_change.sh | 4 ++-- internal/runtests.sh | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/internal/check_api_change.sh b/internal/check_api_change.sh index 273aace8..ad2f00c4 100755 --- a/internal/check_api_change.sh +++ b/internal/check_api_change.sh @@ -21,11 +21,11 @@ # This script expects: # a) to be run at the root of the repository # b) HEAD is pointing to a commit that merges between the pull request and the -# upstream branch (GITHUB_HEAD_REF). +# upstream branch (GITHUB_BASE_REF). set -euo pipefail -UPSTREAM_BRANCH="${GITHUB_HEAD_REF:-master}" +UPSTREAM_BRANCH="${GITHUB_BASE_REF:-master}" echo "Checking for incompatible API changes relative to ${UPSTREAM_BRANCH}..." MASTER_CLONE_DIR="$(mktemp -d)" diff --git a/internal/runtests.sh b/internal/runtests.sh index 11f9d5f4..dd564732 100755 --- a/internal/runtests.sh +++ b/internal/runtests.sh @@ -71,9 +71,10 @@ echo "Ensuring that there are no dependencies not listed in ./internal/alldeps.. # For pull requests, check if there are undeclared incompatible API changes. # Skip this if we're already going to fail since it is expensive. -if ${result} -eq 0 ]] && [[ ! -z "${GITHUB_HEAD_REF:-x}" ]]; then - echo - ./internal/check_api_change.sh || result=1; -fi +# CURRENTLY BROKEN +# if [[ ${result} -eq 0 ]] && [[ ! -z "${GITHUB_HEAD_REF:-x}" ]]; then + # echo + # ./internal/check_api_change.sh || result=1; +# fi exit $result From 2f70a008e2446b941cdeadb751ed6979ec49a29c Mon Sep 17 00:00:00 2001 From: Eli Bendersky Date: Tue, 31 Aug 2021 08:30:57 -0700 Subject: [PATCH 11/17] Fix build badge link in README (#317) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0fbd28a7..4342b26e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wire: Automated Initialization in Go -![Build Status](https://github.com/google/wire/actions/workflows/tests.yml/badge.svg?branch=main) +[![Build Status](https://github.com/google/wire/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/google/wire/actions) [![godoc](https://godoc.org/github.com/google/wire?status.svg)][godoc] [![Coverage](https://codecov.io/gh/google/wire/branch/master/graph/badge.svg)](https://codecov.io/gh/google/wire) From 9d78e0ad8cbeb6716fa6bdbca689bdb9ce0e8fe8 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 6 Jan 2022 22:25:54 -0500 Subject: [PATCH 12/17] README: fix install instructions (#339) go get p has been replaced by go install p@latest. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4342b26e..ccafb0e2 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ For an overview, see the [introductory blog post][]. Install Wire by running: ```shell -go get github.com/google/wire/cmd/wire +go install github.com/google/wire/cmd/wire@latest ``` and ensuring that `$GOPATH/bin` is added to your `$PATH`. From f5e937daa903d897e925a8cd6fdc12566cd7e4c5 Mon Sep 17 00:00:00 2001 From: "Giau. Tran Minh" Date: Fri, 27 May 2022 12:31:39 +0700 Subject: [PATCH 13/17] fix: run wire with -mod=mod (#353) * fix: run wire with -mod=mod * chore: update test with mod flag --- _tutorial/wire_gen.go | 2 +- docs/guide.md | 2 +- internal/wire/testdata/BindInjectorArg/want/wire_gen.go | 2 +- internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go | 2 +- internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go | 2 +- internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go | 2 +- internal/wire/testdata/Chain/want/wire_gen.go | 2 +- internal/wire/testdata/Cleanup/want/wire_gen.go | 2 +- internal/wire/testdata/CopyOtherDecls/want/wire_gen.go | 2 +- internal/wire/testdata/DocComment/want/wire_gen.go | 2 +- internal/wire/testdata/ExampleWithMocks/want/wire_gen.go | 2 +- internal/wire/testdata/ExportedValue/want/wire_gen.go | 2 +- .../testdata/ExportedValueDifferentPackage/want/wire_gen.go | 2 +- internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go | 2 +- internal/wire/testdata/FieldsOfStruct/want/wire_gen.go | 2 +- internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go | 2 +- internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go | 2 +- internal/wire/testdata/Header/want/wire_gen.go | 2 +- .../wire/testdata/ImportedInterfaceBinding/want/wire_gen.go | 2 +- internal/wire/testdata/InjectInput/want/wire_gen.go | 2 +- internal/wire/testdata/InjectWithPanic/want/wire_gen.go | 2 +- internal/wire/testdata/InterfaceBinding/want/wire_gen.go | 2 +- internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go | 2 +- internal/wire/testdata/InterfaceValue/want/wire_gen.go | 2 +- internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go | 2 +- internal/wire/testdata/NamingWorstCase/want/wire_gen.go | 2 +- internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go | 2 +- internal/wire/testdata/NiladicIdentity/want/wire_gen.go | 2 +- internal/wire/testdata/NiladicValue/want/wire_gen.go | 2 +- internal/wire/testdata/NoInjectParamNames/want/wire_gen.go | 2 +- internal/wire/testdata/PartialCleanup/want/wire_gen.go | 2 +- internal/wire/testdata/PkgImport/want/wire_gen.go | 2 +- internal/wire/testdata/RelativePkg/want/wire_gen.go | 2 +- internal/wire/testdata/ReservedKeywords/want/wire_gen.go | 2 +- .../wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go | 2 +- internal/wire/testdata/ReturnError/want/wire_gen.go | 2 +- internal/wire/testdata/Struct/want/wire_gen.go | 2 +- internal/wire/testdata/StructPointer/want/wire_gen.go | 2 +- internal/wire/testdata/TwoDeps/want/wire_gen.go | 2 +- internal/wire/testdata/ValueChain/want/wire_gen.go | 2 +- internal/wire/testdata/ValueConversion/want/wire_gen.go | 2 +- internal/wire/testdata/ValueIsStruct/want/wire_gen.go | 2 +- internal/wire/testdata/VarValue/want/wire_gen.go | 2 +- internal/wire/testdata/Varargs/want/wire_gen.go | 2 +- internal/wire/wire.go | 2 +- 45 files changed, 45 insertions(+), 45 deletions(-) diff --git a/_tutorial/wire_gen.go b/_tutorial/wire_gen.go index 7a93a7b0..fe54ab77 100644 --- a/_tutorial/wire_gen.go +++ b/_tutorial/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/docs/guide.md b/docs/guide.md index dc1b42e7..530650a1 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -151,7 +151,7 @@ Wire will produce an implementation of the injector in a file called ```go // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //+build !wireinject package main diff --git a/internal/wire/testdata/BindInjectorArg/want/wire_gen.go b/internal/wire/testdata/BindInjectorArg/want/wire_gen.go index 25ce7235..5f5b2106 100644 --- a/internal/wire/testdata/BindInjectorArg/want/wire_gen.go +++ b/internal/wire/testdata/BindInjectorArg/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go b/internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go index 20a9f53c..15d6f0e3 100644 --- a/internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go +++ b/internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go b/internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go index b6255e1e..58d82bf4 100644 --- a/internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go +++ b/internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go b/internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go index f75adb53..16c0df25 100644 --- a/internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go +++ b/internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/Chain/want/wire_gen.go b/internal/wire/testdata/Chain/want/wire_gen.go index 257e642b..cf9e9eea 100644 --- a/internal/wire/testdata/Chain/want/wire_gen.go +++ b/internal/wire/testdata/Chain/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/Cleanup/want/wire_gen.go b/internal/wire/testdata/Cleanup/want/wire_gen.go index eea8b223..1519c104 100644 --- a/internal/wire/testdata/Cleanup/want/wire_gen.go +++ b/internal/wire/testdata/Cleanup/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/CopyOtherDecls/want/wire_gen.go b/internal/wire/testdata/CopyOtherDecls/want/wire_gen.go index 3dcb4b53..c654540b 100644 --- a/internal/wire/testdata/CopyOtherDecls/want/wire_gen.go +++ b/internal/wire/testdata/CopyOtherDecls/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/DocComment/want/wire_gen.go b/internal/wire/testdata/DocComment/want/wire_gen.go index a1027b9c..3efb22ac 100644 --- a/internal/wire/testdata/DocComment/want/wire_gen.go +++ b/internal/wire/testdata/DocComment/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/ExampleWithMocks/want/wire_gen.go b/internal/wire/testdata/ExampleWithMocks/want/wire_gen.go index 9f2fd0f9..9cb7b01c 100644 --- a/internal/wire/testdata/ExampleWithMocks/want/wire_gen.go +++ b/internal/wire/testdata/ExampleWithMocks/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/ExportedValue/want/wire_gen.go b/internal/wire/testdata/ExportedValue/want/wire_gen.go index d3ba4549..7563ca26 100644 --- a/internal/wire/testdata/ExportedValue/want/wire_gen.go +++ b/internal/wire/testdata/ExportedValue/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/ExportedValueDifferentPackage/want/wire_gen.go b/internal/wire/testdata/ExportedValueDifferentPackage/want/wire_gen.go index d8bdd24f..d8c74d4c 100644 --- a/internal/wire/testdata/ExportedValueDifferentPackage/want/wire_gen.go +++ b/internal/wire/testdata/ExportedValueDifferentPackage/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go b/internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go index fbdc062a..8467ee37 100644 --- a/internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go +++ b/internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/FieldsOfStruct/want/wire_gen.go b/internal/wire/testdata/FieldsOfStruct/want/wire_gen.go index c27e6d0b..5b8ca2f3 100644 --- a/internal/wire/testdata/FieldsOfStruct/want/wire_gen.go +++ b/internal/wire/testdata/FieldsOfStruct/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go b/internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go index 6a03e81d..c9fe7955 100644 --- a/internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go +++ b/internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go b/internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go index 5b61dfea..793c04d6 100644 --- a/internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go +++ b/internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/Header/want/wire_gen.go b/internal/wire/testdata/Header/want/wire_gen.go index 3ab21079..2f8c5c62 100644 --- a/internal/wire/testdata/Header/want/wire_gen.go +++ b/internal/wire/testdata/Header/want/wire_gen.go @@ -2,7 +2,7 @@ // // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/ImportedInterfaceBinding/want/wire_gen.go b/internal/wire/testdata/ImportedInterfaceBinding/want/wire_gen.go index 6a7cd42a..b68a1dbf 100644 --- a/internal/wire/testdata/ImportedInterfaceBinding/want/wire_gen.go +++ b/internal/wire/testdata/ImportedInterfaceBinding/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/InjectInput/want/wire_gen.go b/internal/wire/testdata/InjectInput/want/wire_gen.go index c17559c5..9471cf6f 100644 --- a/internal/wire/testdata/InjectInput/want/wire_gen.go +++ b/internal/wire/testdata/InjectInput/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/InjectWithPanic/want/wire_gen.go b/internal/wire/testdata/InjectWithPanic/want/wire_gen.go index 92cb390b..8b124e56 100644 --- a/internal/wire/testdata/InjectWithPanic/want/wire_gen.go +++ b/internal/wire/testdata/InjectWithPanic/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/InterfaceBinding/want/wire_gen.go b/internal/wire/testdata/InterfaceBinding/want/wire_gen.go index f1d7f17a..2c1a67b2 100644 --- a/internal/wire/testdata/InterfaceBinding/want/wire_gen.go +++ b/internal/wire/testdata/InterfaceBinding/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go b/internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go index bff6877c..1c437713 100644 --- a/internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go +++ b/internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/InterfaceValue/want/wire_gen.go b/internal/wire/testdata/InterfaceValue/want/wire_gen.go index 0cc1e8c8..9868a902 100644 --- a/internal/wire/testdata/InterfaceValue/want/wire_gen.go +++ b/internal/wire/testdata/InterfaceValue/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go b/internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go index a43b6e4d..e4068205 100644 --- a/internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go +++ b/internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/NamingWorstCase/want/wire_gen.go b/internal/wire/testdata/NamingWorstCase/want/wire_gen.go index 23dd8fa4..e32329d3 100644 --- a/internal/wire/testdata/NamingWorstCase/want/wire_gen.go +++ b/internal/wire/testdata/NamingWorstCase/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go b/internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go index dac690d6..c0815204 100644 --- a/internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go +++ b/internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/NiladicIdentity/want/wire_gen.go b/internal/wire/testdata/NiladicIdentity/want/wire_gen.go index 92cb390b..8b124e56 100644 --- a/internal/wire/testdata/NiladicIdentity/want/wire_gen.go +++ b/internal/wire/testdata/NiladicIdentity/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/NiladicValue/want/wire_gen.go b/internal/wire/testdata/NiladicValue/want/wire_gen.go index f75adb53..16c0df25 100644 --- a/internal/wire/testdata/NiladicValue/want/wire_gen.go +++ b/internal/wire/testdata/NiladicValue/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/NoInjectParamNames/want/wire_gen.go b/internal/wire/testdata/NoInjectParamNames/want/wire_gen.go index c943b5cc..b8760db4 100644 --- a/internal/wire/testdata/NoInjectParamNames/want/wire_gen.go +++ b/internal/wire/testdata/NoInjectParamNames/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/PartialCleanup/want/wire_gen.go b/internal/wire/testdata/PartialCleanup/want/wire_gen.go index a3ef6a4c..6cf26401 100644 --- a/internal/wire/testdata/PartialCleanup/want/wire_gen.go +++ b/internal/wire/testdata/PartialCleanup/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/PkgImport/want/wire_gen.go b/internal/wire/testdata/PkgImport/want/wire_gen.go index 7dbc4692..5f3e127f 100644 --- a/internal/wire/testdata/PkgImport/want/wire_gen.go +++ b/internal/wire/testdata/PkgImport/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/RelativePkg/want/wire_gen.go b/internal/wire/testdata/RelativePkg/want/wire_gen.go index 92cb390b..8b124e56 100644 --- a/internal/wire/testdata/RelativePkg/want/wire_gen.go +++ b/internal/wire/testdata/RelativePkg/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/ReservedKeywords/want/wire_gen.go b/internal/wire/testdata/ReservedKeywords/want/wire_gen.go index a8a6ae76..7ff31104 100644 --- a/internal/wire/testdata/ReservedKeywords/want/wire_gen.go +++ b/internal/wire/testdata/ReservedKeywords/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go b/internal/wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go index 5d73b549..9d1a331d 100644 --- a/internal/wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go +++ b/internal/wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/ReturnError/want/wire_gen.go b/internal/wire/testdata/ReturnError/want/wire_gen.go index 6a759777..5d974667 100644 --- a/internal/wire/testdata/ReturnError/want/wire_gen.go +++ b/internal/wire/testdata/ReturnError/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/Struct/want/wire_gen.go b/internal/wire/testdata/Struct/want/wire_gen.go index 3529cb2b..e4bf0c72 100644 --- a/internal/wire/testdata/Struct/want/wire_gen.go +++ b/internal/wire/testdata/Struct/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/StructPointer/want/wire_gen.go b/internal/wire/testdata/StructPointer/want/wire_gen.go index 1fa1bd8d..e96e8cdd 100644 --- a/internal/wire/testdata/StructPointer/want/wire_gen.go +++ b/internal/wire/testdata/StructPointer/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/TwoDeps/want/wire_gen.go b/internal/wire/testdata/TwoDeps/want/wire_gen.go index 29cde76d..bfc52d7f 100644 --- a/internal/wire/testdata/TwoDeps/want/wire_gen.go +++ b/internal/wire/testdata/TwoDeps/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/ValueChain/want/wire_gen.go b/internal/wire/testdata/ValueChain/want/wire_gen.go index 9e4a669c..da2cccb3 100644 --- a/internal/wire/testdata/ValueChain/want/wire_gen.go +++ b/internal/wire/testdata/ValueChain/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/ValueConversion/want/wire_gen.go b/internal/wire/testdata/ValueConversion/want/wire_gen.go index 9c1c4b61..b663861d 100644 --- a/internal/wire/testdata/ValueConversion/want/wire_gen.go +++ b/internal/wire/testdata/ValueConversion/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/ValueIsStruct/want/wire_gen.go b/internal/wire/testdata/ValueIsStruct/want/wire_gen.go index 9e0b96c4..f41ed122 100644 --- a/internal/wire/testdata/ValueIsStruct/want/wire_gen.go +++ b/internal/wire/testdata/ValueIsStruct/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/VarValue/want/wire_gen.go b/internal/wire/testdata/VarValue/want/wire_gen.go index 8a2bc61d..07e4f019 100644 --- a/internal/wire/testdata/VarValue/want/wire_gen.go +++ b/internal/wire/testdata/VarValue/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/testdata/Varargs/want/wire_gen.go b/internal/wire/testdata/Varargs/want/wire_gen.go index d6cef6a3..703a5491 100644 --- a/internal/wire/testdata/Varargs/want/wire_gen.go +++ b/internal/wire/testdata/Varargs/want/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/internal/wire/wire.go b/internal/wire/wire.go index a9b7a50d..5cedeb1a 100644 --- a/internal/wire/wire.go +++ b/internal/wire/wire.go @@ -267,7 +267,7 @@ func (g *gen) frame(tags string) []byte { tags = fmt.Sprintf(" gen -tags \"%s\"", tags) } buf.WriteString("// Code generated by Wire. DO NOT EDIT.\n\n") - buf.WriteString("//go:generate go run github.com/google/wire/cmd/wire" + tags + "\n") + buf.WriteString("//go:generate go run -mod=mod github.com/google/wire/cmd/wire" + tags + "\n") buf.WriteString("//+build !wireinject\n\n") buf.WriteString("package ") buf.WriteString(g.pkg.Name) From 79660af94317b9c466adc39f27f469f1079c779b Mon Sep 17 00:00:00 2001 From: wirekang Date: Fri, 27 May 2022 14:32:31 +0900 Subject: [PATCH 14/17] README: fix install instructions on tutorial (#357) --- _tutorial/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_tutorial/README.md b/_tutorial/README.md index cfccde1c..f39fba2b 100644 --- a/_tutorial/README.md +++ b/_tutorial/README.md @@ -163,7 +163,7 @@ injector complete, we are ready to use the `wire` command line tool. Install the tool with: ``` shell -go get github.com/google/wire/cmd/wire +go install github.com/google/wire/cmd/wire@latest ``` Then in the same directory with the above code, simply run `wire`. Wire will From 4aee85e4cee22a1d7ff1734b8bf7a26c1a215501 Mon Sep 17 00:00:00 2001 From: Enrique Fueyo Date: Sun, 19 Jun 2022 17:37:05 -0700 Subject: [PATCH 15/17] Update dependencies to support Generics (#360) * feat(copy_ast): add ast.IndexListExpr case * feat(go.mod): add dependencies (golang.org/x/tools v0.1.0 => v0.1.10) --- go.mod | 4 +--- go.sum | 33 +++++++++++++++++---------------- internal/wire/copyast.go | 7 +++++++ 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 7335ae1a..aa12806a 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,5 @@ require ( github.com/google/go-cmp v0.2.0 github.com/google/subcommands v1.2.0 github.com/pmezard/go-difflib v1.0.0 - golang.org/x/mod v0.4.1 // indirect - golang.org/x/sys v0.0.0-20210216224549-f992740a1bac // indirect - golang.org/x/tools v0.1.0 + golang.org/x/tools v0.1.10 ) diff --git a/go.sum b/go.sum index ff9cc31e..1e80ef82 100644 --- a/go.sum +++ b/go.sum @@ -4,30 +4,31 @@ github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210216224549-f992740a1bac h1:9glrpwtNjBYgRpb67AZJKHfzj1stG/8BL5H7In2oTC4= -golang.org/x/sys v0.0.0-20210216224549-f992740a1bac/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= +golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= diff --git a/internal/wire/copyast.go b/internal/wire/copyast.go index 179d1c64..9ec63d70 100644 --- a/internal/wire/copyast.go +++ b/internal/wire/copyast.go @@ -263,6 +263,13 @@ func copyAST(original ast.Node) ast.Node { Index: exprFromMap(m, node.Index), Rbrack: node.Rbrack, } + case *ast.IndexListExpr: + m[node] = &ast.IndexListExpr{ + X: exprFromMap(m, node.X), + Lbrack: node.Lbrack, + Indices: copyExprList(m, node.Indices), + Rbrack: node.Rbrack, + } case *ast.InterfaceType: m[node] = &ast.InterfaceType{ Interface: node.Interface, From 0675cdc9191c85b3aeb6bc2529e7e28263d7e202 Mon Sep 17 00:00:00 2001 From: Stanley Chen Date: Sun, 19 Jun 2022 19:14:24 -0700 Subject: [PATCH 16/17] Revert "Update dependencies to support Generics (#360)" (#365) This reverts commit 4aee85e4cee22a1d7ff1734b8bf7a26c1a215501. --- go.mod | 4 +++- go.sum | 33 ++++++++++++++++----------------- internal/wire/copyast.go | 7 ------- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index aa12806a..7335ae1a 100644 --- a/go.mod +++ b/go.mod @@ -6,5 +6,7 @@ require ( github.com/google/go-cmp v0.2.0 github.com/google/subcommands v1.2.0 github.com/pmezard/go-difflib v1.0.0 - golang.org/x/tools v0.1.10 + golang.org/x/mod v0.4.1 // indirect + golang.org/x/sys v0.0.0-20210216224549-f992740a1bac // indirect + golang.org/x/tools v0.1.0 ) diff --git a/go.sum b/go.sum index 1e80ef82..ff9cc31e 100644 --- a/go.sum +++ b/go.sum @@ -4,31 +4,30 @@ github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210216224549-f992740a1bac h1:9glrpwtNjBYgRpb67AZJKHfzj1stG/8BL5H7In2oTC4= +golang.org/x/sys v0.0.0-20210216224549-f992740a1bac/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= diff --git a/internal/wire/copyast.go b/internal/wire/copyast.go index 9ec63d70..179d1c64 100644 --- a/internal/wire/copyast.go +++ b/internal/wire/copyast.go @@ -263,13 +263,6 @@ func copyAST(original ast.Node) ast.Node { Index: exprFromMap(m, node.Index), Rbrack: node.Rbrack, } - case *ast.IndexListExpr: - m[node] = &ast.IndexListExpr{ - X: exprFromMap(m, node.X), - Lbrack: node.Lbrack, - Indices: copyExprList(m, node.Indices), - Rbrack: node.Rbrack, - } case *ast.InterfaceType: m[node] = &ast.InterfaceType{ Interface: node.Interface, From e57deea2f8bbe2386b756f2555e02de33e20a3f0 Mon Sep 17 00:00:00 2001 From: Todd Treece <360020+toddtreece@users.noreply.github.com> Date: Wed, 7 Feb 2024 12:25:46 -0500 Subject: [PATCH 17/17] all: update golang.org/x/tools dependency to support Go v1.22.0 (#401) --- .github/workflows/tests.yml | 2 +- go.mod | 4 +- go.sum | 63 +++++++++++++------ internal/alldeps | 2 - internal/wire/parse.go | 6 +- .../want/wire_errs.txt | 4 +- .../want/wire_errs.txt | 4 +- internal/wire/wire_test.go | 1 - wire.go | 36 +++++------ 9 files changed, 73 insertions(+), 49 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4a6b29e9..c39e9af4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - go-version: [1.17.x] + go-version: [1.22.x] runs-on: ${{ matrix.os }} steps: - name: Install Go diff --git a/go.mod b/go.mod index 7335ae1a..944aef04 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,5 @@ require ( github.com/google/go-cmp v0.2.0 github.com/google/subcommands v1.2.0 github.com/pmezard/go-difflib v1.0.0 - golang.org/x/mod v0.4.1 // indirect - golang.org/x/sys v0.0.0-20210216224549-f992740a1bac // indirect - golang.org/x/tools v0.1.0 + golang.org/x/tools v0.17.0 ) diff --git a/go.sum b/go.sum index ff9cc31e..8da3aae7 100644 --- a/go.sum +++ b/go.sum @@ -4,31 +4,56 @@ github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= +golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210216224549-f992740a1bac h1:9glrpwtNjBYgRpb67AZJKHfzj1stG/8BL5H7In2oTC4= -golang.org/x/sys v0.0.0-20210216224549-f992740a1bac/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= +golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/alldeps b/internal/alldeps index 7a7b3f0f..41e98ac7 100644 --- a/internal/alldeps +++ b/internal/alldeps @@ -2,6 +2,4 @@ github.com/google/subcommands github.com/google/wire github.com/pmezard/go-difflib golang.org/x/mod -golang.org/x/sys golang.org/x/tools -golang.org/x/xerrors diff --git a/internal/wire/parse.go b/internal/wire/parse.go index 93fbda85..09f1e1dd 100644 --- a/internal/wire/parse.go +++ b/internal/wire/parse.go @@ -1173,9 +1173,9 @@ func (pt ProvidedType) IsNil() bool { // // - For a function provider, this is the first return value type. // - For a struct provider, this is either the struct type or the pointer type -// whose element type is the struct type. -// - For a value, this is the type of the expression. -// - For an argument, this is the type of the argument. +// whose element type is the struct type. +// - For a value, this is the type of the expression. +// - For an argument, this is the type of the argument. func (pt ProvidedType) Type() types.Type { return pt.t } diff --git a/internal/wire/testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt b/internal/wire/testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt index cae32670..01a2f6cc 100644 --- a/internal/wire/testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt +++ b/internal/wire/testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt @@ -1 +1,3 @@ -example.com/foo/wire.go:x:y: not enough arguments in call to wire.Bind \ No newline at end of file +example.com/foo/wire.go:x:y: not enough arguments in call to wire.Bind + have (*Fooer) + want (interface{}, interface{}) \ No newline at end of file diff --git a/internal/wire/testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt b/internal/wire/testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt index 2081cb51..d11189ad 100644 --- a/internal/wire/testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt +++ b/internal/wire/testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt @@ -1 +1,3 @@ -example.com/foo/wire.go:x:y: not enough arguments in call to wire.InterfaceValue \ No newline at end of file +example.com/foo/wire.go:x:y: not enough arguments in call to wire.InterfaceValue + have (string) + want (interface{}, interface{}) \ No newline at end of file diff --git a/internal/wire/wire_test.go b/internal/wire/wire_test.go index 96861a15..6389ac6d 100644 --- a/internal/wire/wire_test.go +++ b/internal/wire/wire_test.go @@ -463,7 +463,6 @@ type testCase struct { // program_out.txt // expected output from the final compiled program, // missing if wire_errs.txt is present -// func loadTestCase(root string, wireGoSrc []byte) (*testCase, error) { name := filepath.Base(root) pkg, err := ioutil.ReadFile(filepath.Join(root, "pkg")) diff --git a/wire.go b/wire.go index fe8edc8c..6af91dda 100644 --- a/wire.go +++ b/wire.go @@ -156,12 +156,12 @@ type StructProvider struct{} // // For example: // -// type S struct { -// MyFoo *Foo -// MyBar *Bar -// } -// var Set = wire.NewSet(wire.Struct(new(S), "MyFoo")) -> inject only S.MyFoo -// var Set = wire.NewSet(wire.Struct(new(S), "*")) -> inject all fields +// type S struct { +// MyFoo *Foo +// MyBar *Bar +// } +// var Set = wire.NewSet(wire.Struct(new(S), "MyFoo")) -> inject only S.MyFoo +// var Set = wire.NewSet(wire.Struct(new(S), "*")) -> inject all fields func Struct(structType interface{}, fieldNames ...string) StructProvider { return StructProvider{} } @@ -175,22 +175,22 @@ type StructFields struct{} // // The following example would provide Foo and Bar using S.MyFoo and S.MyBar respectively: // -// type S struct { -// MyFoo Foo -// MyBar Bar -// } +// type S struct { +// MyFoo Foo +// MyBar Bar +// } // -// func NewStruct() S { /* ... */ } -// var Set = wire.NewSet(wire.FieldsOf(new(S), "MyFoo", "MyBar")) +// func NewStruct() S { /* ... */ } +// var Set = wire.NewSet(wire.FieldsOf(new(S), "MyFoo", "MyBar")) // -// or +// or // -// func NewStruct() *S { /* ... */ } -// var Set = wire.NewSet(wire.FieldsOf(new(*S), "MyFoo", "MyBar")) +// func NewStruct() *S { /* ... */ } +// var Set = wire.NewSet(wire.FieldsOf(new(*S), "MyFoo", "MyBar")) // -// If the structType argument is a pointer to a pointer to a struct, then FieldsOf -// additionally provides a pointer to each field type (e.g., *Foo and *Bar in the -// example above). +// If the structType argument is a pointer to a pointer to a struct, then FieldsOf +// additionally provides a pointer to each field type (e.g., *Foo and *Bar in the +// example above). func FieldsOf(structType interface{}, fieldNames ...string) StructFields { return StructFields{} }