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.

Sign up for GitHub

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

Jump to bottom

fix(firestore): address a missing branch in watch.stop() error remapping #3643

Merged
merged 4 commits into from Feb 2, 2021
Merged

fix(firestore): address a missing branch in watch.stop() error remapping #3643

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c966290
fix(firestore): address a missing branch in watch.stop() error remapping
crwilcox Feb 1, 2021
8d27b7a
Merge branch 'master' into fix-branch
crwilcox Feb 1, 2021
4057399
fix(firestore): prefer not using else
crwilcox Feb 1, 2021
7f291c0
Merge branch 'master' into fix-branch
crwilcox Feb 1, 2021
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
5 changes: 4 additions & 1 deletion firestore/watch.go
View file
Open in desktop
Expand Up @@ -446,9 +446,12 @@ func (s *watchStream) stop() {
return
}
if err != nil {
// if an error occurs while closing the stream
s.err = err
} else {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, prefer not including else blocks: https://golang.org/doc/effective_go.html#if

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy to make this a return. I am going to wait for @jba to maybe weigh in. Since this is either code that should have been removed, or this branch was missed :)

// if we close successfully,
s.err = io.EOF // normal shutdown
}
s.err = io.EOF // normal shutdown
}

func (s *watchStream) close() error {
Expand Down