Skip to content

Commit

Permalink
Lint fixes for rsocket/src (#421)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexmalyshev authored and lehecka committed May 12, 2017
1 parent 8eb2f11 commit 8f801d4
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
8 changes: 5 additions & 3 deletions src/ConnectionAutomaton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,8 @@ void ConnectionAutomaton::handleStreamFrame(
std::move(serializedFrame))) {
return;
}
automaton->handleError(std::runtime_error(frameError.payload_.moveDataToString()));
automaton->handleError(
std::runtime_error(frameError.payload_.moveDataToString()));
break;
}
case FrameType::REQUEST_CHANNEL:
Expand Down Expand Up @@ -887,8 +888,9 @@ void ConnectionAutomaton::setFrameSerializer(
frameSerializer_ = std::move(frameSerializer);
}

void ConnectionAutomaton::setUpFrame(std::shared_ptr<FrameTransport> frameTransport,
ConnectionSetupPayload setupPayload) {
void ConnectionAutomaton::setUpFrame(
std::shared_ptr<FrameTransport> frameTransport,
ConnectionSetupPayload setupPayload) {
auto protocolVersion = getSerializerProtocolVersion();

Frame_SETUP frame(
Expand Down
7 changes: 4 additions & 3 deletions src/ConnectionAutomaton.h
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,10 @@ class ConnectionAutomaton final

void metadataPush(std::unique_ptr<folly::IOBuf> metadata);

void tryClientResume(const ResumeIdentificationToken& token,
std::shared_ptr<FrameTransport> frameTransport,
std::unique_ptr<ClientResumeStatusCallback> resumeCallback);
void tryClientResume(
const ResumeIdentificationToken& token,
std::shared_ptr<FrameTransport> frameTransport,
std::unique_ptr<ClientResumeStatusCallback> resumeCallback);

void setFrameSerializer(std::unique_ptr<FrameSerializer>);

Expand Down
3 changes: 2 additions & 1 deletion src/ReactiveSocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,8 @@ void ReactiveSocket::tryClientResume(
debugCheckCorrectExecutor();
checkNotClosed();
CHECK(frameTransport && !frameTransport->isClosed());
connection_->tryClientResume(token, std::move(frameTransport), std::move(resumeCallback));
connection_->tryClientResume(
token, std::move(frameTransport), std::move(resumeCallback));
}

bool ReactiveSocket::tryResumeServer(
Expand Down
2 changes: 1 addition & 1 deletion test/ReactiveSocketTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1551,4 +1551,4 @@ TEST_F(ReactiveSocketEmptyPayloadTest, RequestChannel) {
}
}));
clientOutput->onSubscribe(clientOutputSub);
}
}

0 comments on commit 8f801d4

Please sign in to comment.