summaryrefslogtreecommitdiff
path: root/libgo/go/gob/error.go
diff options
context:
space:
mode:
Diffstat (limited to 'libgo/go/gob/error.go')
-rw-r--r--libgo/go/gob/error.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/libgo/go/gob/error.go b/libgo/go/gob/error.go
index bfd38fc16d3..106543d7360 100644
--- a/libgo/go/gob/error.go
+++ b/libgo/go/gob/error.go
@@ -18,7 +18,7 @@ import (
// A gobError wraps an os.Error and is used to distinguish errors (panics) generated in this package.
type gobError struct {
- os.Error
+ err os.Error
}
// errorf is like error but takes Printf-style arguments to construct an os.Error.
@@ -29,14 +29,14 @@ func errorf(format string, args ...interface{}) {
// error wraps the argument error and uses it as the argument to panic.
func error(err os.Error) {
- panic(gobError{Error: err})
+ panic(gobError{err})
}
// catchError is meant to be used as a deferred function to turn a panic(gobError) into a
// plain os.Error. It overwrites the error return of the function that deferred its call.
func catchError(err *os.Error) {
if e := recover(); e != nil {
- *err = e.(gobError).Error // Will re-panic if not one of our errors, such as a runtime error.
+ *err = e.(gobError).err // Will re-panic if not one of our errors, such as a runtime error.
}
return
}