Commit 609d742e authored by Rob Pike's avatar Rob Pike

fmt: remove "Scan:" prefix from error messages

The prefix was not uniformly applied and is probably better left off anyway.

Fixes #4944.

R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/12140043
parent 02ad82fe
...@@ -885,7 +885,7 @@ func (s *ss) hexDigit(d rune) int { ...@@ -885,7 +885,7 @@ func (s *ss) hexDigit(d rune) int {
case 'A', 'B', 'C', 'D', 'E', 'F': case 'A', 'B', 'C', 'D', 'E', 'F':
return 10 + digit - 'A' return 10 + digit - 'A'
} }
s.errorString("Scan: illegal hex digit") s.errorString("illegal hex digit")
return 0 return 0
} }
...@@ -915,7 +915,7 @@ func (s *ss) hexString() string { ...@@ -915,7 +915,7 @@ func (s *ss) hexString() string {
s.buf.WriteByte(b) s.buf.WriteByte(b)
} }
if len(s.buf) == 0 { if len(s.buf) == 0 {
s.errorString("Scan: no hex data for %x string") s.errorString("no hex data for %x string")
return "" return ""
} }
return string(s.buf) return string(s.buf)
...@@ -994,7 +994,7 @@ func (s *ss) scanOne(verb rune, arg interface{}) { ...@@ -994,7 +994,7 @@ func (s *ss) scanOne(verb rune, arg interface{}) {
val := reflect.ValueOf(v) val := reflect.ValueOf(v)
ptr := val ptr := val
if ptr.Kind() != reflect.Ptr { if ptr.Kind() != reflect.Ptr {
s.errorString("Scan: type not a pointer: " + val.Type().String()) s.errorString("type not a pointer: " + val.Type().String())
return return
} }
switch v := ptr.Elem(); v.Kind() { switch v := ptr.Elem(); v.Kind() {
...@@ -1010,7 +1010,7 @@ func (s *ss) scanOne(verb rune, arg interface{}) { ...@@ -1010,7 +1010,7 @@ func (s *ss) scanOne(verb rune, arg interface{}) {
// For now, can only handle (renamed) []byte. // For now, can only handle (renamed) []byte.
typ := v.Type() typ := v.Type()
if typ.Elem().Kind() != reflect.Uint8 { if typ.Elem().Kind() != reflect.Uint8 {
s.errorString("Scan: can't handle type: " + val.Type().String()) s.errorString("can't scan type: " + val.Type().String())
} }
str := s.convertString(verb) str := s.convertString(verb)
v.Set(reflect.MakeSlice(typ, len(str), len(str))) v.Set(reflect.MakeSlice(typ, len(str), len(str)))
...@@ -1024,7 +1024,7 @@ func (s *ss) scanOne(verb rune, arg interface{}) { ...@@ -1024,7 +1024,7 @@ func (s *ss) scanOne(verb rune, arg interface{}) {
case reflect.Complex64, reflect.Complex128: case reflect.Complex64, reflect.Complex128:
v.SetComplex(s.scanComplex(verb, v.Type().Bits())) v.SetComplex(s.scanComplex(verb, v.Type().Bits()))
default: default:
s.errorString("Scan: can't handle type: " + val.Type().String()) s.errorString("can't scan type: " + val.Type().String())
} }
} }
} }
...@@ -1057,7 +1057,7 @@ func (s *ss) doScan(a []interface{}) (numProcessed int, err error) { ...@@ -1057,7 +1057,7 @@ func (s *ss) doScan(a []interface{}) (numProcessed int, err error) {
break break
} }
if !isSpace(r) { if !isSpace(r) {
s.errorString("Scan: expected newline") s.errorString("expected newline")
break break
} }
} }
......
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