Skip to content

Commit ec4940f

Browse files
authored
Merge pull request #128 from lehecka/format
fixing formatting by running devtools/format_all.sh
2 parents 8f7b9e4 + 69fb872 commit ec4940f

File tree

4 files changed

+10
-13
lines changed

4 files changed

+10
-13
lines changed

src/automata/RequestResponseRequester.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#pragma once
44

5-
#include <iosfwd>
65
#include <folly/Optional.h>
6+
#include <iosfwd>
77

88
#include <reactive-streams/utilities/SmartPointers.h>
99
#include "src/Frame.h"
@@ -27,7 +27,6 @@ enum class StreamCompletionSignal;
2727
/// Implementation of stream automaton that represents a RequestResponse
2828
/// requester
2929
class RequestResponseRequesterBase : public MixinTerminator {
30-
3130
public:
3231
using MixinTerminator::MixinTerminator;
3332

@@ -74,7 +73,7 @@ class RequestResponseRequesterBase : public MixinTerminator {
7473
reactivestreams::SubscriberPtr<Subscriber<Payload>> consumingSubscriber_;
7574
};
7675

77-
using RequestResponseRequester = SourceIfMixin <
78-
StreamIfMixin<LoggingMixin<ExecutorMixin<LoggingMixin<
76+
using RequestResponseRequester =
77+
SourceIfMixin<StreamIfMixin<LoggingMixin<ExecutorMixin<LoggingMixin<
7978
MemoryMixin<LoggingMixin<RequestResponseRequesterBase>>>>>>>;
8079
}

src/automata/RequestResponseResponder.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ void RequestResponseResponderBase::onComplete() {
3535
}
3636
}
3737

38-
3938
void RequestResponseResponderBase::onError(folly::exception_wrapper ex) {
4039
switch (state_) {
4140
case State::RESPONDING: {
@@ -75,8 +74,7 @@ void RequestResponseResponderBase::onNextFrame(Frame_CANCEL&& frame) {
7574
}
7675

7776
std::ostream& RequestResponseResponderBase::logPrefix(std::ostream& os) {
78-
return os << "RequestResponseResponder(" << &connection_ << ", "
79-
<< streamId_ << "): ";
77+
return os << "RequestResponseResponder(" << &connection_ << ", " << streamId_
78+
<< "): ";
8079
}
81-
8280
}

src/automata/RequestResponseResponder.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ enum class StreamCompletionSignal;
2828
/// responder
2929
class RequestResponseResponderBase
3030
: public LoggingMixin<PublisherMixin<Frame_RESPONSE, MixinTerminator>> {
31-
using Base = LoggingMixin<PublisherMixin<Frame_RESPONSE, MixinTerminator>>;
31+
using Base = LoggingMixin<PublisherMixin<Frame_RESPONSE, MixinTerminator>>;
3232

3333
public:
3434
using Base::Base;
@@ -60,7 +60,7 @@ class RequestResponseResponderBase
6060
RESPONDING,
6161
CLOSED,
6262
} state_{State::RESPONDING};
63-
};
63+
};
6464

6565
using RequestResponseResponder =
6666
SinkIfMixin<StreamIfMixin<LoggingMixin<ExecutorMixin<LoggingMixin<

test/ReactiveSocketTest.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -451,9 +451,9 @@ TEST(ReactiveSocketTest, RequestResponse) {
451451
// had COMPELTE flag set
452452
EXPECT_CALL(clientInput, onComplete_()).InSequence(s);
453453

454-
EXPECT_CALL(serverOutputSub, cancel_()).InSequence(s).WillOnce(Invoke([&]() {
455-
serverOutput->onComplete();
456-
}));
454+
EXPECT_CALL(serverOutputSub, cancel_())
455+
.InSequence(s)
456+
.WillOnce(Invoke([&]() { serverOutput->onComplete(); }));
457457

458458
// Kick off the magic.
459459
clientSock->requestResponse(Payload(originalPayload->clone()), clientInput);

0 commit comments

Comments
 (0)