Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wire for openSUSE:Factory checked in at 2024-02-20 21:15:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wire (Old) and /work/SRC/openSUSE:Factory/.wire.new.1706 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wire" Tue Feb 20 21:15:38 2024 rev:11 rq:1148285 version:0.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/wire/wire.changes 2023-04-24 22:31:57.411775850 +0200 +++ /work/SRC/openSUSE:Factory/.wire.new.1706/wire.changes 2024-02-20 21:16:03.485744881 +0100 @@ -1,0 +2,34 @@ +Tue Feb 20 13:11:33 UTC 2024 - Jeff Kowalczyk <jkowalc...@suse.com> + +- Packaging improvements: + * Drop BuildRequires: golang-packaging. The original macros for + file movements into GOPATH are obsolete with Go modules. + * Drop autosetup -n arg only needed when archive and package + name differ + * Remove goprep macro which is no longer recommended + * Remove gobuild macro which is no longer recommended + * Build PIE with pattern that may become recommended procedure: + %%ifnarch ppc64 GOFLAGS="-buildmode=pie" %%endif go build + A go toolchain buildmode default config would be preferable + but none exist at this time. + * Drop mod=vendor, go1.14+ will detect vendor dir and auto-enable + * Remove goinstall macro which is no longer recommended + * Drop defattr(-,root,root) no longer needed with recent rpm + +------------------------------------------------------------------- +Tue Feb 20 08:11:33 UTC 2024 - Dominique Leuenberger <dims...@opensuse.org> + +- Require go 1.22: match what the build declares to need + go: go.mod requires go >= 1.22 (running go 1.21.7) + +------------------------------------------------------------------- +Mon Feb 19 09:00:50 UTC 2024 - witold.be...@suse.com + +- Add update_go_version.patch +- Update to version 0.6.0: + * Add support for Go v1.22.0 + * Update dependencies to support Generics + * fix: run wire with -mod=mod + * all: update record/replay files for new version of go + +------------------------------------------------------------------- Old: ---- wire-0.5.0.tar.gz New: ---- update_go_version.patch wire-0.6.0.tar.gz BETA DEBUG BEGIN: New: - Add update_go_version.patch - Update to version 0.6.0: BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wire.spec ++++++ --- /var/tmp/diff_new_pack.7MCGhs/_old 2024-02-20 21:16:03.957762003 +0100 +++ /var/tmp/diff_new_pack.7MCGhs/_new 2024-02-20 21:16:03.961762149 +0100 @@ -1,7 +1,7 @@ # # spec file for package wire # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ %endif Name: wire -Version: 0.5.0 +Version: 0.6.0 Release: 0 Summary: Compile-time Dependency Injection for Go License: Apache-2.0 @@ -34,8 +34,8 @@ URL: https://github.com/google/wire Source0: %{name}-%{version}.tar.gz Source1: vendor.tar.gz -BuildRequires: golang-packaging -BuildRequires: golang(API) >= 1.19 +Patch1: update_go_version.patch +BuildRequires: golang(API) >= 1.22 %{?systemd_ordering} ExcludeArch: s390 @@ -47,14 +47,16 @@ written to be used with Wire is useful even for hand-written initialization. %prep -%autosetup -a1 -n %{name}-%{version} +%autosetup -a 1 %build -%goprep github.com/google/wire -%gobuild -mod=vendor "" ... +%ifnarch ppc64 +export GOFLAGS="-buildmode=pie" +%endif +go build ./cmd/%{name} %install -%goinstall +install -D -m 0755 %{name} "%{buildroot}/%{_bindir}/%{name}" %if 0%{?rhel} == 8 %check ++++++ _service ++++++ --- /var/tmp/diff_new_pack.7MCGhs/_old 2024-02-20 21:16:03.993763309 +0100 +++ /var/tmp/diff_new_pack.7MCGhs/_new 2024-02-20 21:16:03.997763454 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/google/wire</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v0.5.0</param> + <param name="revision">v0.6.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> @@ -16,7 +16,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="disabled"> - <param name="archive">wire-0.5.0.tar.gz</param> + <param name="archive">wire-0.6.0.tar.gz</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.7MCGhs/_old 2024-02-20 21:16:04.021764325 +0100 +++ /var/tmp/diff_new_pack.7MCGhs/_new 2024-02-20 21:16:04.025764470 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/google/wire</param> - <param name="changesrevision">0ac845078ca01a1755571c53d7a8e7995b96e40d</param></service></servicedata> + <param name="changesrevision">e57deea2f8bbe2386b756f2555e02de33e20a3f0</param></service></servicedata> (No newline at EOF) ++++++ update_go_version.patch ++++++ Index: wire-0.6.0/go.mod =================================================================== --- wire-0.6.0.orig/go.mod +++ wire-0.6.0/go.mod @@ -1,6 +1,6 @@ module github.com/google/wire -go 1.12 +go 1.22 require ( github.com/google/go-cmp v0.2.0 @@ -8,3 +8,5 @@ require ( github.com/pmezard/go-difflib v1.0.0 golang.org/x/tools v0.17.0 ) + +require golang.org/x/mod v0.14.0 // indirect ++++++ vendor.tar.gz ++++++ ++++ 21414 lines of diff (skipped) ++++++ wire-0.5.0.tar.gz -> wire-0.6.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/.gitattributes new/wire-0.6.0/.gitattributes --- old/wire-0.5.0/.gitattributes 1970-01-01 01:00:00.000000000 +0100 +++ new/wire-0.6.0/.gitattributes 2024-02-07 18:25:46.000000000 +0100 @@ -0,0 +1 @@ +* text eol=lf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/.github/workflows/tests.yml new/wire-0.6.0/.github/workflows/tests.yml --- old/wire-0.5.0/.github/workflows/tests.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/wire-0.6.0/.github/workflows/tests.yml 2024-02-07 18:25:46.000000000 +0100 @@ -0,0 +1,35 @@ +# 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: + os: [ubuntu-latest, macos-latest, windows-latest] + go-version: [1.22.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 + with: + fetch-depth: 2 # required for codecov + - name: Run Tests + shell: bash + run: 'internal/runtests.sh' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/.travis.yml new/wire-0.6.0/.travis.yml --- old/wire-0.5.0/.travis.yml 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +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 - -# When updating Go versions: -# In addition to changing the "go:" versions below, edit the version -# test in internal/runtests.sh. - -jobs: - include: - - go: "1.13.x" - os: linux - - go: "1.13.x" - os: osx - - go: "1.13.x" - os: windows diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/CONTRIBUTING.md new/wire-0.6.0/CONTRIBUTING.md --- old/wire-0.5.0/CONTRIBUTING.md 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/CONTRIBUTING.md 2024-02-07 18:25:46.000000000 +0100 @@ -78,11 +78,11 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/README.md new/wire-0.6.0/README.md --- old/wire-0.5.0/README.md 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/README.md 2024-02-07 18:25:46.000000000 +0100 @@ -1,6 +1,6 @@ # Wire: Automated Initialization in Go -[][travis] +[](https://github.com/google/wire/actions) [][godoc] [](https://codecov.io/gh/google/wire) @@ -24,7 +24,7 @@ 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`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/_tutorial/README.md new/wire-0.6.0/_tutorial/README.md --- old/wire-0.5.0/_tutorial/README.md 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/_tutorial/README.md 2024-02-07 18:25:46.000000000 +0100 @@ -163,7 +163,7 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/_tutorial/wire.go new/wire-0.6.0/_tutorial/wire.go --- old/wire-0.5.0/_tutorial/wire.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/_tutorial/wire.go 2024-02-07 18:25:46.000000000 +0100 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/_tutorial/wire_gen.go new/wire-0.6.0/_tutorial/wire_gen.go --- old/wire-0.5.0/_tutorial/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/_tutorial/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/docs/guide.md new/wire-0.6.0/docs/guide.md --- old/wire-0.5.0/docs/guide.md 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/docs/guide.md 2024-02-07 18:25:46.000000000 +0100 @@ -151,7 +151,7 @@ ```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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/go.mod new/wire-0.6.0/go.mod --- old/wire-0.5.0/go.mod 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/go.mod 2024-02-07 18:25:46.000000000 +0100 @@ -4,7 +4,7 @@ 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/tools v0.17.0 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/go.sum new/wire-0.6.0/go.sum --- old/wire-0.5.0/go.sum 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/go.sum 2024-02-07 18:25:46.000000000 +0100 @@ -1,15 +1,59 @@ 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.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/net v0.0.0-20190311183353-d8887717615a/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-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-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-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-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/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/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.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= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/alldeps new/wire-0.6.0/internal/alldeps --- old/wire-0.5.0/internal/alldeps 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/alldeps 2024-02-07 18:25:46.000000000 +0100 @@ -1,4 +1,5 @@ github.com/google/subcommands github.com/google/wire github.com/pmezard/go-difflib +golang.org/x/mod golang.org/x/tools diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/check_api_change.sh new/wire-0.6.0/internal/check_api_change.sh --- old/wire-0.5.0/internal/check_api_change.sh 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/check_api_change.sh 2024-02-07 18:25:46.000000000 +0100 @@ -21,33 +21,26 @@ # 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_BASE_REF). set -euo pipefail -UPSTREAM_BRANCH="${TRAVIS_BRANCH:-master}" +UPSTREAM_BRANCH="${GITHUB_BASE_REF:-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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/listdeps.sh new/wire-0.6.0/internal/listdeps.sh --- old/wire-0.5.0/internal/listdeps.sh 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/listdeps.sh 2024-02-07 18:25:46.000000000 +0100 @@ -20,6 +20,6 @@ # $ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/runtests.sh new/wire-0.6.0/internal/runtests.sh --- old/wire-0.5.0/internal/runtests.sh 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/runtests.sh 2024-02-07 18:25:46.000000000 +0100 @@ -24,7 +24,7 @@ # 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,8 +36,8 @@ 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 @@ -59,23 +59,22 @@ # ./internal/alldeps # # Whenever project dependencies change, rerun ./internal/listdeps.sh -if [[ $(go version) == *go1\.12* ]]; 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." - 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 [[ ${result} -eq 0 ]] && [[ ! -z "${TRAVIS_BRANCH:-x}" ]] && [[ ! -z "${TRAVIS_PULL_REQUEST_SHA:-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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/parse.go new/wire-0.6.0/internal/wire/parse.go --- old/wire-0.5.0/internal/wire/parse.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/parse.go 2024-02-07 18:25:46.000000000 +0100 @@ -1173,9 +1173,9 @@ // // - 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/BindInjectorArg/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/BindInjectorArg/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/BindInjectorArg/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/BindInjectorArg/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/BindInjectorArgPointer/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/BindInterfaceWithValue/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/BuildTagsAllPackages/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/Chain/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/Chain/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/Chain/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/Chain/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/Cleanup/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/Cleanup/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/Cleanup/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/Cleanup/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/CopyOtherDecls/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/CopyOtherDecls/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/CopyOtherDecls/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/CopyOtherDecls/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/DocComment/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/DocComment/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/DocComment/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/DocComment/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/ExampleWithMocks/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/ExampleWithMocks/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/ExampleWithMocks/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/ExampleWithMocks/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/ExportedValue/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/ExportedValue/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/ExportedValue/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/ExportedValue/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/ExportedValueDifferentPackage/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/ExportedValueDifferentPackage/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/ExportedValueDifferentPackage/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/ExportedValueDifferentPackage/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/FieldsOfImportedStruct/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/FieldsOfStruct/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/FieldsOfStruct/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/FieldsOfStruct/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/FieldsOfStruct/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/FieldsOfStructPointer/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/FieldsOfValueStruct/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/Header/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/Header/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/Header/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/Header/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -2,8 +2,9 @@ // // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/ImportedInterfaceBinding/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/ImportedInterfaceBinding/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/ImportedInterfaceBinding/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/ImportedInterfaceBinding/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/InjectInput/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/InjectInput/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/InjectInput/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/InjectInput/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/InjectWithPanic/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/InjectWithPanic/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/InjectWithPanic/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/InjectWithPanic/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/InterfaceBinding/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/InterfaceBinding/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/InterfaceBinding/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/InterfaceBinding/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt new/wire-0.6.0/internal/wire/testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt --- old/wire-0.5.0/internal/wire/testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/InterfaceBindingNotEnoughArgs/want/wire_errs.txt 2024-02-07 18:25:46.000000000 +0100 @@ -1 +1,3 @@ -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 + have (*Fooer) + want (interface{}, interface{}) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/InterfaceBindingReuse/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/InterfaceValue/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/InterfaceValue/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/InterfaceValue/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/InterfaceValue/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt new/wire-0.6.0/internal/wire/testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt --- old/wire-0.5.0/internal/wire/testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/InterfaceValueNotEnoughArgs/want/wire_errs.txt 2024-02-07 18:25:46.000000000 +0100 @@ -1 +1,3 @@ -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 + have (string) + want (interface{}, interface{}) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/MultipleSimilarPackages/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/NamingWorstCase/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/NamingWorstCase/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/NamingWorstCase/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/NamingWorstCase/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/NamingWorstCaseAllInOne/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/NiladicIdentity/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/NiladicIdentity/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/NiladicIdentity/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/NiladicIdentity/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/NiladicValue/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/NiladicValue/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/NiladicValue/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/NiladicValue/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/NoInjectParamNames/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/NoInjectParamNames/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/NoInjectParamNames/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/NoInjectParamNames/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/PartialCleanup/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/PartialCleanup/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/PartialCleanup/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/PartialCleanup/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/PkgImport/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/PkgImport/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/PkgImport/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/PkgImport/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/RelativePkg/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/RelativePkg/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/RelativePkg/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/RelativePkg/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/ReservedKeywords/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/ReservedKeywords/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/ReservedKeywords/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/ReservedKeywords/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/ReturnArgumentAsInterface/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/ReturnError/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/ReturnError/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/ReturnError/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/ReturnError/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/Struct/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/Struct/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/Struct/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/Struct/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/StructPointer/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/StructPointer/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/StructPointer/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/StructPointer/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/TwoDeps/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/TwoDeps/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/TwoDeps/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/TwoDeps/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/ValueChain/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/ValueChain/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/ValueChain/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/ValueChain/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/ValueConversion/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/ValueConversion/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/ValueConversion/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/ValueConversion/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/ValueIsStruct/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/ValueIsStruct/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/ValueIsStruct/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/ValueIsStruct/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/VarValue/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/VarValue/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/VarValue/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/VarValue/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/testdata/Varargs/want/wire_gen.go new/wire-0.6.0/internal/wire/testdata/Varargs/want/wire_gen.go --- old/wire-0.5.0/internal/wire/testdata/Varargs/want/wire_gen.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/testdata/Varargs/want/wire_gen.go 2024-02-07 18:25:46.000000000 +0100 @@ -1,7 +1,8 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire -//+build !wireinject +//go:generate go run -mod=mod github.com/google/wire/cmd/wire +//go:build !wireinject +// +build !wireinject package main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/wire.go new/wire-0.6.0/internal/wire/wire.go --- old/wire-0.5.0/internal/wire/wire.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/wire.go 2024-02-07 18:25:46.000000000 +0100 @@ -267,7 +267,7 @@ 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/internal/wire/wire_test.go new/wire-0.6.0/internal/wire/wire_test.go --- old/wire-0.5.0/internal/wire/wire_test.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/internal/wire/wire_test.go 2024-02-07 18:25:46.000000000 +0100 @@ -463,7 +463,6 @@ // 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wire-0.5.0/wire.go new/wire-0.6.0/wire.go --- old/wire-0.5.0/wire.go 2021-01-26 02:57:54.000000000 +0100 +++ new/wire-0.6.0/wire.go 2024-02-07 18:25:46.000000000 +0100 @@ -156,12 +156,12 @@ // // 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 @@ // // The following example would provide Foo and Bar using S.MyFoo and S.MyBar respectively: // -// type S struct { -// MyFoo Foo -// MyBar Bar -// } -// -// func NewStruct() S { /* ... */ } -// var Set = wire.NewSet(wire.FieldsOf(new(S), "MyFoo", "MyBar")) -// -// or -// -// 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). +// type S struct { +// MyFoo Foo +// MyBar Bar +// } +// +// func NewStruct() S { /* ... */ } +// var Set = wire.NewSet(wire.FieldsOf(new(S), "MyFoo", "MyBar")) +// +// or +// +// 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). func FieldsOf(structType interface{}, fieldNames ...string) StructFields { return StructFields{} }
