Unverified Commit 62be2050 authored by Cheng's avatar Cheng Committed by GitHub
Browse files

chore: use errors.New to replace fmt.Errorf will much better (#3789)

parent 56f8aa69
...@@ -2,6 +2,7 @@ package api ...@@ -2,6 +2,7 @@ package api
import ( import (
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"math" "math"
"os" "os"
...@@ -307,7 +308,7 @@ func (m *Metrics) Summary() { ...@@ -307,7 +308,7 @@ func (m *Metrics) Summary() {
} }
} }
var ErrInvalidOpts = fmt.Errorf("invalid options") var ErrInvalidOpts = errors.New("invalid options")
func (opts *Options) FromMap(m map[string]interface{}) error { func (opts *Options) FromMap(m map[string]interface{}) error {
valueOpts := reflect.ValueOf(opts).Elem() // names of the fields in the options struct valueOpts := reflect.ValueOf(opts).Elem() // names of the fields in the options struct
......
...@@ -17,7 +17,7 @@ import ( ...@@ -17,7 +17,7 @@ import (
"github.com/ollama/ollama/gpu" "github.com/ollama/ollama/gpu"
) )
var errPayloadMissing = fmt.Errorf("expected payloads not included in this build of ollama") var errPayloadMissing = errors.New("expected payloads not included in this build of ollama")
func Init() error { func Init() error {
payloadsDir, err := gpu.PayloadsDir() payloadsDir, err := gpu.PayloadsDir()
......
...@@ -1137,7 +1137,7 @@ func GetSHA256Digest(r io.Reader) (string, int64) { ...@@ -1137,7 +1137,7 @@ func GetSHA256Digest(r io.Reader) (string, int64) {
return fmt.Sprintf("sha256:%x", h.Sum(nil)), n return fmt.Sprintf("sha256:%x", h.Sum(nil)), n
} }
var errUnauthorized = fmt.Errorf("unauthorized") var errUnauthorized = errors.New("unauthorized")
func makeRequestWithRetry(ctx context.Context, method string, requestURL *url.URL, headers http.Header, body io.ReadSeeker, regOpts *registryOptions) (*http.Response, error) { func makeRequestWithRetry(ctx context.Context, method string, requestURL *url.URL, headers http.Header, body io.ReadSeeker, regOpts *registryOptions) (*http.Response, error) {
for i := 0; i < 2; i++ { for i := 0; i < 2; i++ {
...@@ -1255,7 +1255,7 @@ func parseRegistryChallenge(authStr string) registryChallenge { ...@@ -1255,7 +1255,7 @@ func parseRegistryChallenge(authStr string) registryChallenge {
} }
} }
var errDigestMismatch = fmt.Errorf("digest mismatch, file must be downloaded again") var errDigestMismatch = errors.New("digest mismatch, file must be downloaded again")
func verifyBlob(digest string) error { func verifyBlob(digest string) error {
fp, err := GetBlobsPath(digest) fp, err := GetBlobsPath(digest)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment