Extend structs rather than embed, when possible

2 files changed, 5 insertions, 5 deletions

diff --git a/rwcancel/fdset.go b/rwcancel/fdset.go
index a46cfc7..28746e6 100644
--- a/rwcancel/fdset.go
+++ b/rwcancel/fdset.go
@@ -8,15 +8,15 @@ package rwcancel
 import "golang.org/x/sys/unix"
 
 type fdSet struct {
-	fdset unix.FdSet
+	unix.FdSet
 }
 
 func (fdset *fdSet) set(i int) {
 	bits := 32 << (^uint(0) >> 63)
-	fdset.fdset.Bits[i/bits] |= 1 << uint(i%bits)
+	fdset.Bits[i/bits] |= 1 << uint(i%bits)
 }
 
 func (fdset *fdSet) check(i int) bool {
 	bits := 32 << (^uint(0) >> 63)
-	return (fdset.fdset.Bits[i/bits] & (1 << uint(i%bits))) != 0
+	return (fdset.Bits[i/bits] & (1 << uint(i%bits))) != 0
 }
diff --git a/rwcancel/rwcancel.go b/rwcancel/rwcancel.go
index 83c91a7..3984310 100644
--- a/rwcancel/rwcancel.go
+++ b/rwcancel/rwcancel.go
@@ -59,7 +59,7 @@ func (rw *RWCancel) ReadyRead() bool {
 	fdset := fdSet{}
 	fdset.set(rw.fd)
 	fdset.set(closeFd)
-	err := unixSelect(max(rw.fd, closeFd)+1, &fdset.fdset, nil, nil, nil)
+	err := unixSelect(max(rw.fd, closeFd)+1, &fdset.FdSet, nil, nil, nil)
 	if err != nil {
 		return false
 	}
@@ -74,7 +74,7 @@ func (rw *RWCancel) ReadyWrite() bool {
 	fdset := fdSet{}
 	fdset.set(rw.fd)
 	fdset.set(closeFd)
-	err := unixSelect(max(rw.fd, closeFd)+1, nil, &fdset.fdset, nil, nil)
+	err := unixSelect(max(rw.fd, closeFd)+1, nil, &fdset.FdSet, nil, nil)
 	if err != nil {
 		return false
 	}