Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove old build tags #184

Merged
merged 2 commits into from
Oct 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions answer.go
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ func (f *Future) Struct() (Struct, error) {
}
r := p.resolution()
p.mu.Unlock()
return r.struct_(f.transform())
return r.strct(f.transform())
}

// Client returns the future as a client. If the answer's originating
Expand Down Expand Up @@ -746,8 +746,8 @@ func (r resolution) ptr(transform []PipelineOp) (Ptr, error) {
return p, nil
}

// struct_ obtains a Struct by applying a transform.
func (r resolution) struct_(transform []PipelineOp) (Struct, error) {
// strct obtains a Struct by applying a transform.
func (r resolution) strct(transform []PipelineOp) (Struct, error) {
p, err := r.ptr(transform)
return p.Struct(), err
}
Expand Down
12 changes: 0 additions & 12 deletions internal/packed/discard.go

This file was deleted.

14 changes: 0 additions & 14 deletions internal/packed/discard_go14.go

This file was deleted.

2 changes: 1 addition & 1 deletion internal/packed/packed.go
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ func (r *Reader) ReadWord(p []byte) error {
nz = tag >> 7 & 1
p[7] = b[i] & -nz
i += int(nz)
discard(r.rd, i)
r.rd.Discard(i)
}
switch tag {
case zeroTag:
Expand Down