update to go1.18, drop go1.18, and replace deprecated syscall.Syscall<number>#283
Open
thaJeztah wants to merge 5 commits intomicrosoft:mainfrom
Open
update to go1.18, drop go1.18, and replace deprecated syscall.Syscall<number>#283thaJeztah wants to merge 5 commits intomicrosoft:mainfrom
thaJeztah wants to merge 5 commits intomicrosoft:mainfrom
Conversation
thaJeztah
commented
Apr 8, 2023
|
|
||
| func bind(s windows.Handle, name unsafe.Pointer, namelen int32) (err error) { | ||
| r1, _, e1 := syscall.Syscall(procbind.Addr(), 3, uintptr(s), uintptr(name), uintptr(namelen)) | ||
| r1, _, e1 := syscall.SyscallN(procbind.Addr(), uintptr(s), uintptr(name), uintptr(namelen)) |
Contributor
Author
There was a problem hiding this comment.
go generate unless doing so on a Windows machine).
Not 100% sure if CI here verifies these files (if not, perhaps someone could double-check them and run go generate on a Windows machine)
Contributor
Author
There was a problem hiding this comment.
Not 100% sure if CI here verifies these files (if not, perhaps someone could double-check them and run
go generateon a Windows machine)
looks like it does, and CI looks happy; https://github.com/thaJeztah/go-winio/actions/runs/4645965648
thaJeztah
force-pushed
the
remove_deprecated_syscall
branch
6 times, most recently
from
1d52ae4 to
7f78199
Compare
wim/lzx/lzx.go:492:3: early-return: if c { ... } else { ... break } can be simplified to if !c { ... break } ... (revive)
if matchoffset <= i && matchlen <= end-i {
copyend := i + matchlen
for ; i < copyend; i++ {
f.window[i] = f.window[i-matchoffset]
}
} else {
f.fail(errCorrupt)
break
}
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
pkg/security:
Error: directive `//nolint:structcheck,unused // structcheck thinks fields are unused, but the are used to pass data to OS` is unused for linter "unused" (nolintlint)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
pkg/etw, pkg/etwlogrus: replace interface{} with any (revive)
Warning: use-any: since GO 1.18 'interface{}' can be replaced by 'any' (revive)
Warning: use-any: since GO 1.18 'interface{}' can be replaced by 'any' (revive)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
….17) The "syscall.Syscall<number>" functions were deprecated in go1.18 in favor of the "syscall.SyscallN" function, which does not need the "nargs" argument, and does not need the list of arguments to be padded with zeros. https://github.com/golang/go/blob/go1.18/src/syscall/dll_windows.go#L27-L45 Now that go1.17 reached EOL and is no longer maintained, we can update the code to use the new SyscallN function. This patch updates the mkwinsyscall utility to generate code using the new SyscallN function, and removes the utilities that are now redundant. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
remove_deprecated_syscall
branch
from
7f78199 to
d88b00b
Compare
Contributor
Author
|
This should be ready for review /cc @kevpar 😄 (I should probably point out that containerd 1.6 still tests against go1.17 as "old version", in case this version from main ends up in containerd at some point; https://github.com/containerd/containerd/blob/v1.6.20/.github/workflows/ci.yml#L236) |
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
gha: update golangci-lint to v1.52.x
update to go1.18
tools/mkwinsyscall: replace deprecated funcs with SyscallN (drops go1.17)
The "syscall.Syscall" functions were deprecated in go1.18 in favor
of the "syscall.SyscallN" function, which does not need the "nargs" argument,
and does not need the list of arguments to be padded with zeros.
https://github.com/golang/go/blob/go1.18/src/syscall/dll_windows.go#L27-L45
Now that go1.17 reached EOL and is no longer maintained, we can update the
code to use the new SyscallN function. This patch updates the mkwinsyscall
utility to generate code using the new SyscallN function, and removes the
utilities that are now redundant.
internal/socket: replace deprecated syscall.Syscall9