upstream-archive/ollama
1
0
Fork 0
mirror of https://github.com/ollama/ollama.git synced 2026-09-21 05:28:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

lint fixes (#17897)

Browse Source
This commit is contained in:
Daniel Hiltgen
2026-08-20 10:23:25 -07:00
committed by GitHub
parent e92b7855f6
commit 6bba484f1a
15 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/cmd/app/app.go
+1 -1
View File
@@ -407,7 +407,7 @@ func startHiddenTasks() {
return
}
if err := updater.DoUpgradeAtStartup(); err != nil {
if err := updater.DoUpgradeAtStartup(); err != nil { //nolint:staticcheck,nolintlint // DoUpgradeAtStartup may always return non-nil on Windows
slog.Info("unable to perform upgrade at startup", "error", err)
// Make sure the restart to upgrade menu shows so we can attempt an interactive upgrade to get authorization
UpdateAvailable("")
app/cmd/app/app_darwin.go
+1 -1
View File
@@ -119,7 +119,7 @@ func maybeMoveAndRestart() appMove {
}
// Ask to move to applications directory
status := (appMove)(C.askToMoveToApplications())
status := appMove(C.askToMoveToApplications())
if status == MoveCompleted {
// Double check
if _, err := os.Stat(updater.SystemWidePath); err != nil {
app/cmd/app/app_windows.go
+1 -1
View File
@@ -130,7 +130,7 @@ func (app *appCallbacks) DoUpdate() {
app.shutdown()
if err := updater.DoUpgrade(true); err != nil {
if err := updater.DoUpgrade(true); err != nil { //nolint:staticcheck,nolintlint // DoUpgrade may always return non-nil on Windows
slog.Warn(fmt.Sprintf("upgrade attempt failed: %s", err))
}
}
app/dialog/dlgs_windows.go
+2 -2
View File
@@ -143,13 +143,13 @@ func utf16ptr(utf16 []uint16) *uint16 {
func utf16slice(ptr *uint16) []uint16 { //nolint:unused
hdr := reflect.SliceHeader{Data: uintptr(unsafe.Pointer(ptr)), Len: 1, Cap: 1}
slice := *((*[]uint16)(unsafe.Pointer(&hdr))) //nolint:govet
slice := *(*[]uint16)(unsafe.Pointer(&hdr)) //nolint:govet
i := 0
for slice[len(slice)-1] != 0 {
i++
}
hdr.Len = i
slice = *((*[]uint16)(unsafe.Pointer(&hdr))) //nolint:govet
slice = *(*[]uint16)(unsafe.Pointer(&hdr)) //nolint:govet
return slice
}
app/updater/updater_darwin.go
+1 -1
View File
@@ -434,7 +434,7 @@ func IsUpdatePending() bool {
func chownWithAuthorization(user string) bool {
u := C.CString(user)
defer C.free(unsafe.Pointer(u))
return (bool)(C.chownWithAuthorization(u))
return bool(C.chownWithAuthorization(u))
}
func verifyExtractedBundle(path string) error {
app/updater/updater_windows.go
+3 -3
View File
@@ -78,7 +78,7 @@ func init() {
func loadOSVersion() {
UserAgentOS = "Windows"
verInfo := OSVERSIONINFOEXW{}
verInfo.dwOSVersionInfoSize = (uint32)(unsafe.Sizeof(verInfo))
verInfo.dwOSVersionInfoSize = uint32(unsafe.Sizeof(verInfo))
ntdll, err := windows.LoadDLL("ntdll.dll")
if err != nil {
slog.Warn("unable to find ntdll", "error", err)
@@ -394,13 +394,13 @@ func IsProcRunning(procName string) []uint32 {
defer windows.CloseHandle(hProcess)
var module windows.Handle
var cbNeeded uint32
cb := (uint32)(unsafe.Sizeof(module))
cb := uint32(unsafe.Sizeof(module))
if err := windows.EnumProcessModules(hProcess, &module, cb, &cbNeeded); err != nil {
continue
}
var sz uint32 = 1024 * 8
moduleName := make([]uint16, sz)
cb = uint32(len(moduleName)) * (uint32)(unsafe.Sizeof(uint16(0)))
cb = uint32(len(moduleName)) * uint32(unsafe.Sizeof(uint16(0)))
if err := windows.GetModuleBaseName(hProcess, module, &moduleName[0], cb); err != nil && err != syscall.ERROR_INSUFFICIENT_BUFFER {
continue
}
cmd/cmd.go
+1 -1
View File
@@ -2085,7 +2085,7 @@ func checkServerHeartbeat(cmd *cobra.Command, _ []string) error {
if !(strings.Contains(err.Error(), " refused") || strings.Contains(err.Error(), "could not connect")) {
return err
}
if err := startApp(cmd.Context(), client); err != nil {
if err := startApp(cmd.Context(), client); err != nil { //nolint:staticcheck,nolintlint // startApp always returns non-nil on Linux (start_default.go) but can return nil on macOS/Windows
return err
}
}
cmd/start_windows.go
+2 -2
View File
@@ -93,13 +93,13 @@ func isProcRunning(procName string) []uint32 {
defer windows.CloseHandle(hProcess)
var module windows.Handle
var cbNeeded uint32
cb := (uint32)(unsafe.Sizeof(module))
cb := uint32(unsafe.Sizeof(module))
if err := windows.EnumProcessModules(hProcess, &module, cb, &cbNeeded); err != nil {
continue
}
var sz uint32 = 1024 * 8
moduleName := make([]uint16, sz)
cb = uint32(len(moduleName)) * (uint32)(unsafe.Sizeof(uint16(0)))
cb = uint32(len(moduleName)) * uint32(unsafe.Sizeof(uint16(0)))
if err := windows.GetModuleBaseName(hProcess, module, &moduleName[0], cb); err != nil && err != syscall.ERROR_INSUFFICIENT_BUFFER {
continue
}
convert/convert_qwen3next.go
+13 -11
View File
@@ -1437,17 +1437,19 @@ func (q *qwen3NextModel) splitQKVZTensor(t Tensor) (*ggml.Tensor, *ggml.Tensor,
qkvName := strings.Replace(t.Name(), "ssm_in", "attn_qkv", 1)
gateName := strings.Replace(t.Name(), "ssm_in", "attn_gate", 1)
return &ggml.Tensor{
Name: qkvName,
Kind: t.Kind(),
Shape: []uint64{uint64(spec.qkvOut), uint64(spec.hidden)},
WriterTo: qkvTensor,
}, &ggml.Tensor{
Name: gateName,
Kind: t.Kind(),
Shape: []uint64{uint64(spec.gateOut), uint64(spec.hidden)},
WriterTo: gateTensor,
}, true
qkv := &ggml.Tensor{
Name: qkvName,
Kind: t.Kind(),
Shape: []uint64{uint64(spec.qkvOut), uint64(spec.hidden)},
WriterTo: qkvTensor,
}
gate := &ggml.Tensor{
Name: gateName,
Kind: t.Kind(),
Shape: []uint64{uint64(spec.gateOut), uint64(spec.hidden)},
WriterTo: gateTensor,
}
return qkv, gate, true
}
func (q *qwen3NextModel) repackQKVZ(spec qkvzSplitSpec, extractGate bool) Repacker {
discover/native_probe.go
+3 -3
View File
@@ -110,15 +110,15 @@ func RunNativeProbeCommand(ctx context.Context, libDirs []string, out io.Writer)
libDirs = []string{ml.LibOllamaPath}
}
devices, err := runNativeProbe(ctx, libDirs)
if err != nil {
devices, err := runNativeProbe(ctx, libDirs) //nolint:staticcheck,nolintlint // runNativeProbe always returns non-nil on macOS (stub) but can return nil on Linux with cgo
if err != nil { //nolint:staticcheck,nolintlint
return err
}
return json.NewEncoder(out).Encode(nativeProbeResult{Devices: devices})
}
func runNativeProbe(ctx context.Context, libDirs []string) ([]nativeProbeDevice, error) {
func runNativeProbe(ctx context.Context, libDirs []string) ([]nativeProbeDevice, error) { //nolint:staticcheck,nolintlint
return runPlatformNativeProbe(ctx, libDirs)
}
readline/buffer.go
+1 -1
View File
@@ -294,7 +294,7 @@ func (b *Buffer) drawRemaining() {
// render the other lines
if remLength > currLineSpace {
remaining := (remainingText[len(currLine):])
remaining := remainingText[len(currLine):]
var totalLines int
var displayLength int
var lineLength int = currLineSpace
server/download.go
+1 -1
View File
@@ -475,7 +475,7 @@ type downloadOpts struct {
// downloadBlob downloads a blob from the registry and stores it in the blobs directory
func downloadBlob(ctx context.Context, opts downloadOpts) (cacheHit bool, _ error) {
if opts.digest == "" {
return false, fmt.Errorf(("%s: %s"), opts.n.DisplayNamespaceModel(), "digest is empty")
return false, fmt.Errorf("%s: %s", opts.n.DisplayNamespaceModel(), "digest is empty")
}
fp, err := manifest.BlobsPath(opts.digest)
server/sched_test.go
+1
View File
@@ -2148,6 +2148,7 @@ func (s *mockLlm) Close() error {
s.closeCalled = true
return s.closeResp
}
func (s *mockLlm) MemorySize() (uint64, uint64) { return s.totalSize, s.vramSize }
func (s *mockLlm) VRAMByGPU(id ml.DeviceID) uint64 { return s.vramByGPU[id] }
func (s *mockLlm) Pid() int { return -1 }
template/template.go
+3 -3
View File
@@ -602,11 +602,11 @@ func deleteNode(n parse.Node, fn func(parse.Node) bool) parse.Node {
t.Nodes = nodes
return t
case *parse.IfNode:
t.BranchNode = *(walk(&t.BranchNode).(*parse.BranchNode))
t.BranchNode = *walk(&t.BranchNode).(*parse.BranchNode)
case *parse.WithNode:
t.BranchNode = *(walk(&t.BranchNode).(*parse.BranchNode))
t.BranchNode = *walk(&t.BranchNode).(*parse.BranchNode)
case *parse.RangeNode:
t.BranchNode = *(walk(&t.BranchNode).(*parse.BranchNode))
t.BranchNode = *walk(&t.BranchNode).(*parse.BranchNode)
case *parse.BranchNode:
t.List = walk(t.List).(*parse.ListNode)
if t.ElseList != nil {
x/create/writer.go
+2 -2
View File
@@ -67,8 +67,8 @@ func writeBlob(spec BlobSpec, src *sourceFiles, store BlobStore) (LayerInfo, err
// take the MLX path.
var r io.Reader
if needsMLX {
blobData, err := quantizeBlob(items)
if err != nil {
blobData, err := quantizeBlob(items) //nolint:staticcheck,nolintlint // quantizeBlob can return nil via runOnMLXThread; staticcheck SA4023 false positive on closure-capture pattern
if err != nil { //nolint:staticcheck,nolintlint
return LayerInfo{}, fmt.Errorf("quantize blob %s: %w", spec.Name, err)
}
r = bytes.NewReader(blobData)