Conversation
Ended up fixing these two syntax errors: ``` diff --git a/src/smoosh/src/smoosh_priority_queue.erl b/src/smoosh/src/smoosh_priority_queue.erl index 6492f02..6fcee55e3 100644 --- a/src/smoosh/src/smoosh_priority_queue.erl +++ b/src/smoosh/src/smoosh_priority_queue.erl @@ -76,7 +76,6 @@ in(Key, Value, Priority, Q) -> in(Key, Value, Priority, Capacity, #priority_queue{name=Name, map=Map, tree=Tree}) -> Tree1 = case maps:find(Key, Map) of - case dict:find(Key, Dict) of {ok, TreeKey} -> gb_trees:delete_any(TreeKey, Tree); error -> diff --git a/src/smoosh/src/smoosh_server.erl b/src/smoosh/src/smoosh_server.erl index e89412f..9efeb06a1 100644 --- a/src/smoosh/src/smoosh_server.erl +++ b/src/smoosh/src/smoosh_server.erl @@ -181,7 +181,7 @@ handle_call(resume, _From, State) -> fun(#channel{name = Name, pid = P}, _) -> couch_log:notice("Resuming ~p", [Name]), smoosh_channel:resume(P) - end, + end, 0, State#state.tab), {reply, ok, State}; handle_call({get_channel, ChannelName}, _From, #state{tab = Tab} = State) -> ``` So a careful audit for the changes should be done to make some semantic merge issues haven't snuck in. Then ran `make erlfmt-format` again and it added all the other changes on top of that.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is a draft PR to help @noahshaw11 reformat his PR with erlfmt