Skip to content

Commit 3ab4588

Browse files
Alexey-N-ChernyshovAlexey-N-Chernyshov
authored
Feature/clang tidy (#450)
Disables clang-tidy and some clang-tidy fixes Signed-off-by: Alexey-N-Chernyshov <[email protected]>
1 parent 1169a5c commit 3ab4588

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+904
-787
lines changed

‎.clang-tidy

+297-258
Large diffs are not rendered by default.

‎.github/workflows/clang-tidy.yml ‎.github/disabled_workflows/clang-tidy.yml

File renamed without changes.

‎core/adt/address_key.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace fc::adt {
1212
Bytes AddressKeyer::encode(const Key &key) {
13-
return primitives::address::encode(key);
13+
return Bytes{primitives::address::encode(key)};
1414
}
1515

1616
outcome::result<AddressKeyer::Key> AddressKeyer::decode(BytesIn key) {

‎core/adt/array.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ namespace fc::adt {
1616

1717
Array(IpldPtr ipld = nullptr) : amt{ipld, bits} {}
1818

19-
Array(const CID &root, IpldPtr ipld = nullptr) : amt{ipld, root, bits} {}
19+
Array(const CID &root, IpldPtr ipld = nullptr)
20+
: amt{std::move(ipld), root, bits} {}
2021

2122
outcome::result<boost::optional<Value>> tryGet(Key key) const {
2223
auto maybe = get(key);

‎core/adt/channel.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace fc::adt {
2525
using Many = std::vector<std::shared_ptr<Channel<T>>>;
2626

2727
Channel() = default;
28-
Channel(Channel &&) = default;
28+
Channel(Channel &&) noexcept = default;
2929
~Channel() {
3030
closeRead();
3131
}

‎core/adt/uvarint_key.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace fc::adt {
2121
}
2222

2323
outcome::result<UvarintKeyer::Key> UvarintKeyer::decode(BytesIn key) {
24-
Key result;
24+
Key result = 0;
2525
if (codec::uvarint::read(result, key) && key.empty()) {
2626
return result;
2727
}
@@ -35,7 +35,7 @@ namespace fc::adt {
3535

3636
outcome::result<VarintKeyer::Key> VarintKeyer::decode(BytesIn key) {
3737
OUTCOME_TRY(value2, UvarintKeyer::decode(key));
38-
int64_t value = value2 >> 1;
39-
return value2 & 1 ? ~value : value;
38+
Key value = static_cast<Key>(value2) >> 1;
39+
return (value2 & 1) != 0 ? ~value : value;
4040
}
4141
} // namespace fc::adt

‎core/api/full_node/get_node.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@ namespace fc::api {
6262
} else {
6363
copy(key, common::span::cbytes(part.substr(3)));
6464
}
65-
OUTCOME_TRYA(
66-
raw, Hamt{ipld, cid, storage::hamt::kDefaultBitWidth}.get(key));
65+
OUTCOME_TRY(
66+
bytes,
67+
Hamt{ipld, cid, storage::hamt::kDefaultBitWidth}.get(key));
68+
raw = Buffer{bytes};
6769
s = CborDecodeStream{raw};
6870
}
6971
parts = parts.subspan(1);

‎core/api/rpc/web_socket_client_error.cpp

+3-5
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
OUTCOME_CPP_DEFINE_CATEGORY(fc::api::rpc, WebSocketClientError, e) {
99
using fc::api::rpc::WebSocketClientError;
1010

11-
switch (e) {
12-
case WebSocketClientError::kRpcErrorResponse:
13-
return "RPC error: got error response";
14-
default:
15-
return "unknown error";
11+
if (e == WebSocketClientError::kRpcErrorResponse) {
12+
return "RPC error: got error response";
1613
}
14+
return "unknown error";
1715
}

‎core/cbor_blake/cid.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace fc {
1818
using common::Hash256;
1919

2020
struct CbCid : Hash256 {
21-
CbCid() : Hash256{} {}
21+
CbCid() = default;
2222
explicit CbCid(const Hash256 &hash) : Hash256{hash} {}
2323
static CbCid hash(BytesIn cbor) {
2424
return CbCid{crypto::blake2b::blake2b_256(cbor)};

‎core/codec/cbor/cbor_decode_stream.hpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -114,30 +114,30 @@ namespace fc::codec::cbor {
114114
}
115115
/** Checks if current element is CID */
116116
bool isCid() const {
117-
return (bool)token.cidSize();
117+
return token.cidSize().has_value();
118118
}
119119
/** Checks if current element is list container */
120120
bool isList() const {
121-
return (bool)token.listCount();
121+
return token.listCount().has_value();
122122
}
123123
/** Checks if current element is map container */
124124
bool isMap() const {
125-
return (bool)token.mapCount();
125+
return token.mapCount().has_value();
126126
}
127127
bool isNull() const {
128128
return token.isNull();
129129
}
130130
bool isBool() const {
131-
return (bool)token.asBool();
131+
return token.asBool().has_value();
132132
}
133133
bool isInt() const {
134134
return token.asInt() || token.asUint();
135135
}
136136
bool isStr() const {
137-
return (bool)token.strSize();
137+
return token.strSize().has_value();
138138
}
139139
bool isBytes() const {
140-
return (bool)token.bytesSize();
140+
return token.bytesSize().has_value();
141141
}
142142

143143
/** Returns count of items in current element list container */

‎core/codec/cbor/cbor_token.hpp

+14-12
Original file line numberDiff line numberDiff line change
@@ -110,15 +110,17 @@ namespace fc::codec::cbor {
110110
static constexpr size_t _more(uint64_t extra) {
111111
if (extra < kExtraUint8) {
112112
return 0;
113-
} else if (!(extra & 0xFFFFFFFFFFFFFF00)) {
113+
}
114+
if ((extra & 0xFFFFFFFFFFFFFF00) == 0) {
114115
return sizeof(uint8_t);
115-
} else if (!(extra & 0xFFFFFFFFFFFF0000)) {
116+
}
117+
if ((extra & 0xFFFFFFFFFFFF0000) == 0) {
116118
return sizeof(uint16_t);
117-
} else if (!(extra & 0xFFFFFFFF00000000)) {
119+
}
120+
if ((extra & 0xFFFFFFFF00000000) == 0) {
118121
return sizeof(uint32_t);
119-
} else {
120-
return sizeof(uint64_t);
121122
}
123+
return sizeof(uint64_t);
122124
}
123125
};
124126

@@ -157,15 +159,15 @@ namespace fc::codec::cbor {
157159
: byte == kExtraUint32 ? 4
158160
: byte == kExtraUint64 ? 8
159161
: 0;
160-
if (!more) {
162+
if (more == 0) {
161163
error = true;
162164
return;
163165
}
164166
}
165167
} else {
166168
value.extra = (value.extra << 8) | byte;
167169
}
168-
if (!more) {
170+
if (more == 0) {
169171
if (tag) {
170172
value.type = Type::CID;
171173
--value.extra;
@@ -198,7 +200,7 @@ namespace fc::codec::cbor {
198200
};
199201

200202
inline bool read(CborTokenDecoder &decoder, BytesIn &input) {
201-
while (decoder.more) {
203+
while (decoder.more != 0) {
202204
if (input.empty()) {
203205
return false;
204206
}
@@ -218,15 +220,15 @@ namespace fc::codec::cbor {
218220
if (input.empty()) {
219221
return false;
220222
}
221-
if (decoder.more_size) {
223+
if (decoder.more_size != 0) {
222224
auto n{std::min<size_t>(decoder.more_size, input.size())};
223225
decoder.more_size -= n;
224226
fc::codec::read(input, n);
225227
} else {
226228
if (read(decoder.token, input)) {
227229
decoder.more_size = decoder.token.value.anySize();
228230
decoder.more_count += decoder.token.value.anyCount();
229-
if (decoder.more_count) {
231+
if (decoder.more_count != 0) {
230232
--decoder.more_count;
231233
decoder.token = {};
232234
}
@@ -235,7 +237,7 @@ namespace fc::codec::cbor {
235237
return false;
236238
}
237239
}
238-
if (!decoder.more()) {
240+
if (decoder.more() == 0) {
239241
return true;
240242
}
241243
}
@@ -300,7 +302,7 @@ namespace fc::codec::cbor {
300302
constexpr CborTokenEncoder(CborToken::Type type, uint64_t extra) {
301303
const auto more{CborToken::_more(extra)};
302304
length = 1 + more;
303-
if (!more) {
305+
if (more == 0) {
304306
_bytes[0] = CborToken::_first(type, extra);
305307
} else if (more == sizeof(uint8_t)) {
306308
_bytes[0] = CborToken::_first(type, kExtraUint8);

‎core/codec/cbor/streams_annotation.hpp

+30-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,19 @@
1111
template <class Stream, \
1212
typename = std::enable_if_t< \
1313
std::remove_reference_t<Stream>::is_cbor_encoder_stream>> \
14-
Stream &operator<<(Stream &&s, const type &var)
14+
Stream &operator<<(Stream &&s, \
15+
const type &var) // NOLINT(bugprone-macro-parentheses)
1516

1617
#define CBOR_DECODE(type, var) \
1718
template <class Stream, \
1819
typename = std::enable_if_t< \
1920
std::remove_reference_t<Stream>::is_cbor_decoder_stream>> \
20-
Stream &operator>>(Stream &&s, type &var)
21+
Stream &operator>>(Stream &&s, \
22+
type &var) // NOLINT(bugprone-macro-parentheses)
2123

22-
#define CBOR2_DECODE(...) \
23-
fc::codec::cbor::CborDecodeStream &operator>>( \
24+
#define CBOR2_DECODE(...) \
25+
/* NOLINTNEXTLINE(bugprone-macro-parentheses) */ \
26+
fc::codec::cbor::CborDecodeStream &operator>>( \
2427
fc::codec::cbor::CborDecodeStream &s, __VA_ARGS__ &v)
2528
#define CBOR2_ENCODE(...) \
2629
fc::codec::cbor::CborEncodeStream &operator<<( \
@@ -29,47 +32,69 @@
2932
CBOR2_DECODE(__VA_ARGS__); \
3033
CBOR2_ENCODE(__VA_ARGS__);
3134

35+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
3236
#define _CBOR_TUPLE_1(op, m) op t.m
37+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
3338
#define _CBOR_TUPLE_2(op, m, ...) \
3439
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_1(op, __VA_ARGS__)
40+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
3541
#define _CBOR_TUPLE_3(op, m, ...) \
3642
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_2(op, __VA_ARGS__)
43+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
3744
#define _CBOR_TUPLE_4(op, m, ...) \
3845
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_3(op, __VA_ARGS__)
46+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
3947
#define _CBOR_TUPLE_5(op, m, ...) \
4048
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_4(op, __VA_ARGS__)
49+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
4150
#define _CBOR_TUPLE_6(op, m, ...) \
4251
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_5(op, __VA_ARGS__)
52+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
4353
#define _CBOR_TUPLE_7(op, m, ...) \
4454
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_6(op, __VA_ARGS__)
55+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
4556
#define _CBOR_TUPLE_8(op, m, ...) \
4657
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_7(op, __VA_ARGS__)
58+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
4759
#define _CBOR_TUPLE_9(op, m, ...) \
4860
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_8(op, __VA_ARGS__)
61+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
4962
#define _CBOR_TUPLE_10(op, m, ...) \
5063
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_9(op, __VA_ARGS__)
64+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
5165
#define _CBOR_TUPLE_11(op, m, ...) \
5266
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_10(op, __VA_ARGS__)
67+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
5368
#define _CBOR_TUPLE_12(op, m, ...) \
5469
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_11(op, __VA_ARGS__)
70+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
5571
#define _CBOR_TUPLE_13(op, m, ...) \
5672
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_12(op, __VA_ARGS__)
73+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
5774
#define _CBOR_TUPLE_14(op, m, ...) \
5875
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_13(op, __VA_ARGS__)
76+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
5977
#define _CBOR_TUPLE_15(op, m, ...) \
6078
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_14(op, __VA_ARGS__)
79+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
6180
#define _CBOR_TUPLE_16(op, m, ...) \
6281
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_15(op, __VA_ARGS__)
82+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
6383
#define _CBOR_TUPLE_17(op, m, ...) \
6484
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_16(op, __VA_ARGS__)
85+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
6586
#define _CBOR_TUPLE_18(op, m, ...) \
6687
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_17(op, __VA_ARGS__)
88+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
6789
#define _CBOR_TUPLE_19(op, m, ...) \
6890
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_18(op, __VA_ARGS__)
91+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
6992
#define _CBOR_TUPLE_20(op, m, ...) \
7093
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_19(op, __VA_ARGS__)
94+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
7195
#define _CBOR_TUPLE_21(op, m, ...) \
7296
_CBOR_TUPLE_1(op, m) _CBOR_TUPLE_20(op, __VA_ARGS__)
97+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
7398
#define _CBOR_TUPLE_V(_1, \
7499
_2, \
75100
_3, \
@@ -94,6 +119,7 @@
94119
f, \
95120
...) \
96121
f
122+
// NOLINTNEXTLINE(bugprone-reserved-identifier)
97123
#define _CBOR_TUPLE(op, ...) \
98124
_CBOR_TUPLE_V(__VA_ARGS__, \
99125
_CBOR_TUPLE_21, \

‎core/codec/common.hpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#pragma once
77

8+
#include <gsl/span>
89
#include <optional>
910

1011
#include "common/bytes.hpp"
@@ -15,8 +16,8 @@ namespace fc::codec {
1516
out = {};
1617
return false;
1718
}
18-
out = input.subspan(0, n);
19-
input = input.subspan(n);
19+
out = input.subspan(0, static_cast<ptrdiff_t>(n));
20+
input = input.subspan(static_cast<ptrdiff_t>(n));
2021
return true;
2122
}
2223

‎core/codec/rle/rle_plus_decoding_stream.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ namespace fc::codec::rle {
155155
template <typename T>
156156
void decodeLongBlock(T &current_value, std::set<T> &output) {
157157
std::vector<uint8_t> bytes{};
158-
uint8_t slice;
158+
uint8_t slice = 0;
159159
do {
160160
slice = getSpan<uint8_t>(BYTE_BITS_COUNT);
161161
bytes.push_back(slice);

‎core/codec/uvarint.hpp

+9-8
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@ namespace fc::codec::uvarint {
2323
inline void update(uint8_t byte) {
2424
assert(more);
2525
assert(!overflow);
26-
more = byte & 0x80;
26+
more = (byte & 0x80) != 0;
2727
auto bits7{byte & 0x7f};
2828
auto shift{length * 7};
2929
auto more_bits{max_bits - shift};
30-
overflow = more_bits < 7 && (bits7 & (-1 << more_bits));
30+
overflow = more_bits < 7 && ((bits7 & (-1 << more_bits)) != 0);
3131
value |= bits7 << shift;
32-
shift += 7;
3332
++length;
3433
}
3534
};
@@ -39,7 +38,7 @@ namespace fc::codec::uvarint {
3938
BytesN<10> _bytes{};
4039
size_t length{};
4140

42-
constexpr VarintEncoder(uint64_t _value) : value{_value} {
41+
constexpr explicit VarintEncoder(uint64_t _value) : value{_value} {
4342
do {
4443
auto byte{static_cast<uint8_t>(_value) & 0x7f};
4544
_value >>= 7;
@@ -51,14 +50,15 @@ namespace fc::codec::uvarint {
5150
} while (_value != 0);
5251
}
5352
constexpr auto bytes() const {
54-
return gsl::make_span(_bytes).subspan(0, length);
53+
return gsl::make_span(_bytes).subspan(
54+
0, static_cast<ptrdiff_t>(length));
5555
}
5656
};
5757

5858
/** returns true on success */
5959
inline bool read(std::istream &is, VarintDecoder &varint) {
6060
while (varint.more) {
61-
char byte;
61+
char byte = 0;
6262
if (!is.get(byte).good()) {
6363
return false;
6464
}
@@ -99,7 +99,8 @@ namespace fc::codec::uvarint {
9999
return false;
100100
}
101101
if (!varint.more) {
102-
input = input.subspan(varint.length);
102+
input = input.subspan(
103+
static_cast<ptrdiff_t>(varint.length));
103104
out = static_cast<T>(varint.value);
104105
return true;
105106
}
@@ -109,7 +110,7 @@ namespace fc::codec::uvarint {
109110

110111
inline bool readBytes(BytesIn &out, BytesIn &input) {
111112
out = {};
112-
size_t length;
113+
size_t length = 0;
113114
return read(length, input) && fc::codec::read(out, input, length);
114115
}
115116
} // namespace fc::codec::uvarint

0 commit comments

Comments
 (0)