Skip to content

Refactoring #73

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

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Refactoring #73

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0f30ca2
Fix typo in comments
dippi Jul 3, 2021
3166c8e
Refactor conversion to HashMap
dippi Jul 3, 2021
cb4b6c1
Refactor string_into_resp macro
dippi Jul 3, 2021
f2056c5
Compact message pattern matching
dippi Jul 3, 2021
f903825
Refactor handle_messages into smaller functions
dippi Jul 3, 2021
6b4b434
Refactor process_subscribe
dippi Jul 3, 2021
c69bfdc
Refactor process_unsubscribe
dippi Jul 3, 2021
f171071
Refactor process_message
dippi Jul 3, 2021
4520034
Use a single loop when sending error to subscribers
dippi Jul 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Compact message pattern matching
  • Loading branch information
@dippi
dippi committed Jul 4, 2021
commit f2056c5d06a37638478e8752b265f08fe38b49bf
13 changes: 4 additions & 9 deletions src/client/pubsub.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,10 @@ impl PubsubConnectionInner {
messages.pop(),
messages.pop(),
) {
(Some(msg), Some(topic), Some(message_type), None) => {
match (msg, String::from_resp(topic), message_type) {
(msg, Ok(topic), resp::RespValue::BulkString(bytes)) => (bytes, topic, msg),
_ => return Err(error::unexpected("Incorrect format of a PUBSUB message")),
}
}
(Some(msg), Some(_), Some(topic), Some(message_type)) => {
match (msg, String::from_resp(topic), message_type) {
(msg, Ok(topic), resp::RespValue::BulkString(bytes)) => (bytes, topic, msg),
(Some(msg), Some(topic), Some(message_type), None)
| (Some(msg), Some(_), Some(topic), Some(message_type)) => {
match (String::from_resp(topic), message_type) {
(Ok(topic), resp::RespValue::BulkString(bytes)) => (bytes, topic, msg),
_ => return Err(error::unexpected("Incorrect format of a PUBSUB message")),
}
}
Expand Down