Skip to content

Commit 85ed820

Browse files
martenrichtermartenrichter
committed
quic: Fix linting
1 parent d31f2c8 commit 85ed820

4 files changed

Lines changed: 30 additions & 46 deletions

File tree

‎src/dataqueue/queue.cc‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,8 +1068,7 @@ class FdEntry final : public EntryImpl {
10681068

10691069
class FeederEntry final : public EntryImpl {
10701070
public:
1071-
FeederEntry(DataQueueFeeder* feeder) : feeder_(feeder) {
1072-
}
1071+
FeederEntry(DataQueueFeeder* feeder) : feeder_(feeder) {}
10731072

10741073
static std::unique_ptr<FeederEntry> Create(DataQueueFeeder* feeder) {
10751074
return std::make_unique<FeederEntry>(feeder);
@@ -1080,9 +1079,9 @@ class FeederEntry final : public EntryImpl {
10801079
}
10811080

10821081
std::unique_ptr<Entry> slice(
1083-
uint64_t start, std::optional<uint64_t> end = std::nullopt) override {
1084-
// we are not idempotent
1085-
return std::unique_ptr<Entry>(nullptr);
1082+
uint64_t start, std::optional<uint64_t> end = std::nullopt) override {
1083+
// we are not idempotent
1084+
return std::unique_ptr<Entry>(nullptr);
10861085
}
10871086

10881087
std::optional<uint64_t> size() const override {
@@ -1103,11 +1102,10 @@ class FeederEntry final : public EntryImpl {
11031102
public:
11041103
static std::shared_ptr<ReaderImpl> Create(FeederEntry* entry) {
11051104
return std::make_shared<ReaderImpl>(entry);
1106-
};
1107-
1108-
explicit ReaderImpl(FeederEntry* entry) : entry_(entry) {
11091105
}
11101106

1107+
explicit ReaderImpl(FeederEntry* entry) : entry_(entry) {}
1108+
11111109
~ReaderImpl() {
11121110
entry_->feeder_->DrainAndClose();
11131111
}
@@ -1122,7 +1120,7 @@ class FeederEntry final : public EntryImpl {
11221120
return bob::STATUS_EOS;
11231121
}
11241122
entry_->feeder_->addPendingPull(
1125-
DataQueueFeeder::PendingPull(std::move(next)));
1123+
DataQueueFeeder::PendingPull(std::move(next)));
11261124
entry_->feeder_->tryWakePulls();
11271125
return bob::STATUS_WAIT;
11281126
}
@@ -1138,7 +1136,6 @@ class FeederEntry final : public EntryImpl {
11381136

11391137
// ============================================================================
11401138

1141-
11421139
std::shared_ptr<DataQueue> DataQueue::CreateIdempotent(
11431140
std::vector<std::unique_ptr<Entry>> list) {
11441141
// Any entry is invalid for an idempotent DataQueue if any of the entries

‎src/dataqueue/queue.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include <vector>
1717

1818
namespace node {
19-
using v8::Local;
20-
using v8::Value;
19+
using v8::Local;
20+
using v8::Value;
2121

2222
// Represents a sequenced collection of data sources that can be
2323
// consumed as a single logical stream of data. Sources can be

‎src/quic/streams.cc‎

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ Maybe<std::shared_ptr<DataQueue>> Stream::GetDataQueueFromSource(
229229
return Just(dataQueue);
230230
}
231231

232-
233232
THROW_ERR_INVALID_ARG_TYPE(env, "Invalid data source type");
234233
return Nothing<std::shared_ptr<DataQueue>>();
235234
}
@@ -1337,8 +1336,7 @@ void Stream::Unschedule() {
13371336

13381337
} // namespace quic
13391338

1340-
DataQueueFeeder::DataQueueFeeder(Environment* env,
1341-
Local<Object> object)
1339+
DataQueueFeeder::DataQueueFeeder(Environment* env, Local<Object> object)
13421340
: AsyncWrap(env, object) {
13431341
MakeWeak();
13441342
}
@@ -1367,7 +1365,6 @@ void DataQueueFeeder::DrainAndClose() {
13671365
done = true;
13681366
}
13691367

1370-
13711368
JS_METHOD_IMPL(DataQueueFeeder::New) {
13721369
DCHECK(args.IsConstructCall());
13731370
auto env = Environment::GetCurrent(args);
@@ -1383,7 +1380,7 @@ JS_METHOD_IMPL(DataQueueFeeder::Ready) {
13831380
return;
13841381
} else {
13851382
Local<Promise::Resolver> readFinish =
1386-
Promise::Resolver::New(env->context()).ToLocalChecked();
1383+
Promise::Resolver::New(env->context()).ToLocalChecked();
13871384
feeder->readFinish_.Reset(env->isolate(), readFinish);
13881385
args.GetReturnValue().Set(readFinish->GetPromise());
13891386
return;
@@ -1397,7 +1394,7 @@ JS_METHOD_IMPL(DataQueueFeeder::Submit) {
13971394

13981395
bool done = false;
13991396
if (args[1]->IsBoolean() && args[1].As<v8::Boolean>()->Value()) {
1400-
done = true;
1397+
done = true;
14011398
}
14021399
if (!args[0].IsEmpty()) {
14031400
CHECK_GT(feeder->pendingPulls_.size(), 0);
@@ -1408,8 +1405,8 @@ JS_METHOD_IMPL(DataQueueFeeder::Submit) {
14081405
chunk = Uint8Array::New(buffer, 0, buffer->ByteLength());
14091406
}
14101407
if (!chunk->IsTypedArray()) {
1411-
THROW_ERR_INVALID_ARG_TYPE(env,
1412-
"Invalid data must be Arraybuffer or TypedArray");
1408+
THROW_ERR_INVALID_ARG_TYPE(
1409+
env, "Invalid data must be Arraybuffer or TypedArray");
14131410
}
14141411
Local<TypedArray> typedArray = chunk.As<TypedArray>();
14151412
// now we create a copy
@@ -1423,10 +1420,10 @@ JS_METHOD_IMPL(DataQueueFeeder::Submit) {
14231420
JS_TRY_ALLOCATE_BACKING(env, backingUniq, nread);
14241421
std::shared_ptr<BackingStore> backing = std::move(backingUniq);
14251422

1426-
auto originalStore = typedArray->Buffer()->GetBackingStore();
1427-
const void* originalData = static_cast<char*>(originalStore->Data())
1428-
+ typedArray->ByteOffset();
1429-
memcpy(backing->Data(), originalData, nread);
1423+
auto originalStore = typedArray->Buffer()->GetBackingStore();
1424+
const void* originalData =
1425+
static_cast<char*>(originalStore->Data()) + typedArray->ByteOffset();
1426+
memcpy(backing->Data(), originalData, nread);
14301427
auto& pending = feeder->pendingPulls_.front();
14311428
auto pop = OnScopeLeave([feeder] { feeder->pendingPulls_.pop_front(); });
14321429
DataQueue::Vec vec;
@@ -1446,7 +1443,7 @@ JS_METHOD_IMPL(DataQueueFeeder::Submit) {
14461443
return;
14471444
} else {
14481445
Local<Promise::Resolver> readFinish =
1449-
Promise::Resolver::New(env->context()).ToLocalChecked();
1446+
Promise::Resolver::New(env->context()).ToLocalChecked();
14501447
feeder->readFinish_.Reset(env->isolate(), readFinish);
14511448
args.GetReturnValue().Set(readFinish->GetPromise());
14521449
return;
@@ -1467,15 +1464,14 @@ JS_CONSTRUCTOR_IMPL(DataQueueFeeder, dataqueuefeeder_constructor_template, {
14671464
JS_NEW_CONSTRUCTOR();
14681465
JS_INHERIT(AsyncWrap);
14691466
JS_CLASS(dataqueuefeeder);
1470-
SetProtoMethod(isolate, tmpl, "error", Error);
1467+
SetProtoMethod(isolate, tmpl, "error", Error);
14711468
SetProtoMethod(isolate, tmpl, "submit", Submit);
1472-
SetProtoMethod(isolate, tmpl, "ready", Ready);
1469+
SetProtoMethod(isolate, tmpl, "ready", Ready);
14731470
})
14741471

14751472

1476-
void DataQueueFeeder::InitPerIsolate(
1477-
IsolateData* data,
1478-
Local<ObjectTemplate> target) {
1473+
void DataQueueFeeder::InitPerIsolate(IsolateData* data,
1474+
Local<ObjectTemplate> target) {
14791475
// TODO(@jasnell): Implement the per-isolate state
14801476
}
14811477

@@ -1487,8 +1483,7 @@ void DataQueueFeeder::InitPerContext(Realm* realm, Local<Object> target) {
14871483
}
14881484

14891485
void DataQueueFeeder::RegisterExternalReferences(
1490-
ExternalReferenceRegistry* registry
1491-
) {
1486+
ExternalReferenceRegistry* registry) {
14921487
registry->Register(New);
14931488
registry->Register(Submit);
14941489
registry->Register(Error);

‎src/quic/streams.h‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ class Stream;
2626

2727
using Ngtcp2Source = bob::SourceImpl<ngtcp2_vec>;
2828

29-
3029
// When a request to open a stream is made before a Session is able to actually
3130
// open a stream (either because the handshake is not yet sufficiently complete
3231
// or concurrency limits are temporarily reached) then the request to open the
@@ -393,36 +392,32 @@ class Stream final : public AsyncWrap,
393392
void Unschedule();
394393
};
395394
} // namespace quic
396-
class DataQueueFeeder final: public AsyncWrap {
395+
class DataQueueFeeder final : public AsyncWrap {
397396
public:
398-
using Next = bob::Next<DataQueue::Vec>;
397+
using Next = bob::Next<DataQueue::Vec>;
399398

400-
DataQueueFeeder(Environment* env,
401-
v8::Local<v8::Object> object);
399+
DataQueueFeeder(Environment* env, v8::Local<v8::Object> object);
402400

403401
JS_CONSTRUCTOR(DataQueueFeeder);
404402
JS_BINDING_INIT_BOILERPLATE();
405403

406404
static BaseObjectPtr<DataQueueFeeder> Create();
407405

408-
void setDataQueue(std::shared_ptr<DataQueue> queue) {
409-
dataQueue_ = queue;
410-
}
406+
void setDataQueue(std::shared_ptr<DataQueue> queue) { dataQueue_ = queue; }
411407

412408
void tryWakePulls();
413409
void DrainAndClose();
414410

415411
struct PendingPull {
416412
Next next;
417-
explicit PendingPull(Next next)
418-
: next(std::move(next)) {}
413+
explicit PendingPull(Next next) : next(std::move(next)) {}
419414
};
420415

421416
void addPendingPull(PendingPull toAdd) {
422417
pendingPulls_.emplace_back(std::move(toAdd));
423418
}
424419

425-
bool Done() {return done;};
420+
bool Done() { return done; }
426421

427422
SET_NO_MEMORY_INFO()
428423
SET_MEMORY_INFO_NAME(DataQueueFeeder)
@@ -433,13 +428,10 @@ using Next = bob::Next<DataQueue::Vec>;
433428
JS_METHOD(Error);
434429
JS_METHOD(Ready);
435430

436-
437431
private:
438432
std::shared_ptr<DataQueue> dataQueue_;
439433
Global<Promise::Resolver> readFinish_;
440434

441-
442-
443435
std::deque<PendingPull> pendingPulls_;
444436
bool done = false;
445437
};

0 commit comments

Comments
 (0)