Skip to content

Commit 74c0a97

Browse files
refackrvagg
authored andcommitted
src: clean clang-tidy errors in node_file.h
* explicitly delete move overloads * default initialize all members * explicitly discard unused return values * const some possibles PR-URL: #23793 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
1 parent 260d777 commit 74c0a97

File tree

1 file changed

+29
-12
lines changed

1 file changed

+29
-12
lines changed

src/node_file.h

+29-12
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class FSContinuationData : public MemoryRetainer {
3030

3131
uv_fs_t* req;
3232
int mode;
33-
std::vector<std::string> paths;
33+
std::vector<std::string> paths{};
3434

3535
void PushPath(std::string&& path) {
3636
paths.emplace_back(std::move(path));
@@ -244,9 +244,10 @@ class FSReqPromise : public FSReqBase {
244244
AsyncWrap::PROVIDER_FSREQPROMISE,
245245
use_bigint),
246246
stats_field_array_(env->isolate(), kFsStatsFieldsNumber) {
247-
auto resolver = Promise::Resolver::New(env->context()).ToLocalChecked();
248-
object()->Set(env->context(), env->promise_string(),
249-
resolver).FromJust();
247+
const auto resolver =
248+
Promise::Resolver::New(env->context()).ToLocalChecked();
249+
USE(object()->Set(env->context(), env->promise_string(),
250+
resolver).FromJust());
250251
}
251252

252253
~FSReqPromise() override {
@@ -262,7 +263,7 @@ class FSReqPromise : public FSReqBase {
262263
object()->Get(env()->context(),
263264
env()->promise_string()).ToLocalChecked();
264265
Local<Promise::Resolver> resolver = value.As<Promise::Resolver>();
265-
resolver->Reject(env()->context(), reject).FromJust();
266+
USE(resolver->Reject(env()->context(), reject).FromJust());
266267
}
267268

268269
void Resolve(Local<Value> value) override {
@@ -273,7 +274,7 @@ class FSReqPromise : public FSReqBase {
273274
object()->Get(env()->context(),
274275
env()->promise_string()).ToLocalChecked();
275276
Local<Promise::Resolver> resolver = val.As<Promise::Resolver>();
276-
resolver->Resolve(env()->context(), value).FromJust();
277+
USE(resolver->Resolve(env()->context(), value).FromJust());
277278
}
278279

279280
void ResolveStat(const uv_stat_t* stat) override {
@@ -297,10 +298,14 @@ class FSReqPromise : public FSReqBase {
297298
SET_MEMORY_INFO_NAME(FSReqPromise)
298299
SET_SELF_SIZE(FSReqPromise)
299300

301+
FSReqPromise(const FSReqPromise&) = delete;
302+
FSReqPromise& operator=(const FSReqPromise&) = delete;
303+
FSReqPromise(const FSReqPromise&&) = delete;
304+
FSReqPromise& operator=(const FSReqPromise&&) = delete;
305+
300306
private:
301307
bool finished_ = false;
302308
AliasedBuffer<NativeT, V8T> stats_field_array_;
303-
DISALLOW_COPY_AND_ASSIGN(FSReqPromise);
304309
};
305310

306311
class FSReqAfterScope {
@@ -312,6 +317,11 @@ class FSReqAfterScope {
312317

313318
void Reject(uv_fs_t* req);
314319

320+
FSReqAfterScope(const FSReqAfterScope&) = delete;
321+
FSReqAfterScope& operator=(const FSReqAfterScope&) = delete;
322+
FSReqAfterScope(const FSReqAfterScope&&) = delete;
323+
FSReqAfterScope& operator=(const FSReqAfterScope&&) = delete;
324+
315325
private:
316326
FSReqBase* wrap_ = nullptr;
317327
uv_fs_t* req_ = nullptr;
@@ -388,6 +398,11 @@ class FileHandle : public AsyncWrap, public StreamBase {
388398
SET_MEMORY_INFO_NAME(FileHandle)
389399
SET_SELF_SIZE(FileHandle)
390400

401+
FileHandle(const FileHandle&) = delete;
402+
FileHandle& operator=(const FileHandle&) = delete;
403+
FileHandle(const FileHandle&&) = delete;
404+
FileHandle& operator=(const FileHandle&&) = delete;
405+
391406
private:
392407
// Synchronous close that emits a warning
393408
void Close();
@@ -430,9 +445,14 @@ class FileHandle : public AsyncWrap, public StreamBase {
430445
return static_cast<CloseReq*>(ReqWrap::from_req(req));
431446
}
432447

448+
CloseReq(const CloseReq&) = delete;
449+
CloseReq& operator=(const CloseReq&) = delete;
450+
CloseReq(const CloseReq&&) = delete;
451+
CloseReq& operator=(const CloseReq&&) = delete;
452+
433453
private:
434-
Persistent<Promise> promise_;
435-
Persistent<Value> ref_;
454+
Persistent<Promise> promise_{};
455+
Persistent<Value> ref_{};
436456
};
437457

438458
// Asynchronous close
@@ -446,9 +466,6 @@ class FileHandle : public AsyncWrap, public StreamBase {
446466

447467
bool reading_ = false;
448468
std::unique_ptr<FileHandleReadWrap> current_read_ = nullptr;
449-
450-
451-
DISALLOW_COPY_AND_ASSIGN(FileHandle);
452469
};
453470

454471
} // namespace fs

0 commit comments

Comments
 (0)