mirror of
https://github.com/golang/go
synced 2024-11-11 17:41:37 -07:00
test: error-related fixes
R=golang-dev, bradfitz CC=golang-dev https://golang.org/cl/5328051
This commit is contained in:
parent
29fb5d3e0f
commit
64f78c918a
@ -12,11 +12,11 @@
|
||||
package main
|
||||
|
||||
type S struct {
|
||||
err os.Error // ERROR "undefined|expected package"
|
||||
err foo.Bar // ERROR "undefined|expected package"
|
||||
Num int
|
||||
}
|
||||
|
||||
func main() {
|
||||
s := S{}
|
||||
_ = s.Num // no error here please
|
||||
_ = s.Num // no error here please
|
||||
}
|
||||
|
@ -13,13 +13,12 @@ import _os_ "os"
|
||||
import "os"
|
||||
import . "os"
|
||||
|
||||
func f(e os.Error)
|
||||
func f(e *os.File)
|
||||
|
||||
func main() {
|
||||
var _e_ _os_.Error
|
||||
var dot Error
|
||||
var _e_ *_os_.File
|
||||
var dot *File
|
||||
|
||||
f(_e_)
|
||||
f(dot)
|
||||
}
|
||||
|
||||
|
@ -9,13 +9,10 @@ package main
|
||||
import (
|
||||
"fmt"
|
||||
"math"
|
||||
"runtime"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type Error interface {
|
||||
String() string
|
||||
}
|
||||
|
||||
type ErrorTest struct {
|
||||
name string
|
||||
fn func()
|
||||
@ -164,7 +161,7 @@ var errorTests = []ErrorTest{
|
||||
func error(fn func()) (error string) {
|
||||
defer func() {
|
||||
if e := recover(); e != nil {
|
||||
error = e.(Error).String()
|
||||
error = e.(runtime.Error).String()
|
||||
}
|
||||
}()
|
||||
fn()
|
||||
|
Loading…
Reference in New Issue
Block a user