Commit 3cfe194

Browse files
jasnelladuh95
authored andcommitted
src: use concepts where appropriate
Some general modernizations of templates Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65148 Reviewed-By: Aviv Keller <me@aviv.sh> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
1 parent 40b1b18 commit 3cfe194

28 files changed

Lines changed: 161 additions & 141 deletions

‎node.gyp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@
254254
'src/node_blob.h',
255255
'src/node_buffer.h',
256256
'src/node_builtins.h',
257+
'src/node_concepts.h',
257258
'src/node_config_file.h',
258259
'src/node_constants.h',
259260
'src/node_context_data.h',

‎src/aliased_buffer-inl.h‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ namespace node {
1212
typedefsize_t AliasedBufferIndex;
1313

1414
template <typename NativeT, typenameV8T>
15+
requires std::is_scalar_v<NativeT>
1516
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
1617
v8::Isolate* isolate, constsize_t count, const AliasedBufferIndex* index)
1718
: isolate_(isolate), count_(count), byte_offset_(0), index_(index) {
@@ -34,6 +35,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3435
}
3536

3637
template <typename NativeT, typenameV8T>
38+
requires std::is_scalar_v<NativeT>
3739
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3840
v8::Isolate* isolate,
3941
constsize_t byte_offset,
@@ -65,6 +67,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6567
}
6668

6769
template <typename NativeT, typenameV8T>
70+
requires std::is_scalar_v<NativeT>
6871
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6972
const AliasedBufferBase& that)
7073
: isolate_(that.isolate_),
@@ -76,13 +79,15 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
7679
}
7780

7881
template <typename NativeT, typenameV8T>
82+
requires std::is_scalar_v<NativeT>
7983
AliasedBufferIndex AliasedBufferBase<NativeT, V8T>::Serialize(
8084
v8::Local<v8::Context> context, v8::SnapshotCreator* creator) {
8185
DCHECK(is_valid());
8286
return creator->AddData(context, GetJSArray());
8387
}
8488

8589
template <typename NativeT, typenameV8T>
90+
requires std::is_scalar_v<NativeT>
8691
inlinevoid AliasedBufferBase<NativeT, V8T>::Deserialize(
8792
v8::Local<v8::Context> context) {
8893
DCHECK_NOT_NULL(index_);
@@ -99,6 +104,7 @@ inline void AliasedBufferBase<NativeT, V8T>::Deserialize(
99104
}
100105

101106
template <typename NativeT, typenameV8T>
107+
requires std::is_scalar_v<NativeT>
102108
AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
103109
AliasedBufferBase<NativeT, V8T>&& that) noexcept {
104110
DCHECK(is_valid());
@@ -116,41 +122,48 @@ AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
116122
}
117123

118124
template <typename NativeT, typenameV8T>
125+
requires std::is_scalar_v<NativeT>
119126
v8::Local<V8T> AliasedBufferBase<NativeT, V8T>::GetJSArray() const {
120127
DCHECK(is_valid());
121128
return js_array_.Get(isolate_);
122129
}
123130

124131
template <typename NativeT, typenameV8T>
132+
requires std::is_scalar_v<NativeT>
125133
void AliasedBufferBase<NativeT, V8T>::Release() {
126134
DCHECK_NULL(index_);
127135
js_array_.Reset();
128136
}
129137

130138
template <typename NativeT, typenameV8T>
139+
requires std::is_scalar_v<NativeT>
131140
inlinevoid AliasedBufferBase<NativeT, V8T>::MakeWeak() {
132141
DCHECK(is_valid());
133142
js_array_.SetWeak();
134143
}
135144

136145
template <typename NativeT, typenameV8T>
146+
requires std::is_scalar_v<NativeT>
137147
v8::Local<v8::ArrayBuffer> AliasedBufferBase<NativeT, V8T>::GetArrayBuffer()
138148
const {
139149
returnGetJSArray()->Buffer();
140150
}
141151

142152
template <typename NativeT, typenameV8T>
153+
requires std::is_scalar_v<NativeT>
143154
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::GetNativeBuffer() const {
144155
DCHECK(is_valid());
145156
return buffer_;
146157
}
147158

148159
template <typename NativeT, typenameV8T>
160+
requires std::is_scalar_v<NativeT>
149161
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::operator*() const {
150162
returnGetNativeBuffer();
151163
}
152164

153165
template <typename NativeT, typenameV8T>
166+
requires std::is_scalar_v<NativeT>
154167
inlinevoid AliasedBufferBase<NativeT, V8T>::SetValue(constsize_t index,
155168
NativeT value) {
156169
DCHECK_LT(index, count_);
@@ -159,6 +172,7 @@ inline void AliasedBufferBase<NativeT, V8T>::SetValue(const size_t index,
159172
}
160173

161174
template <typename NativeT, typenameV8T>
175+
requires std::is_scalar_v<NativeT>
162176
inlineconst NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
163177
constsize_t index) const {
164178
DCHECK(is_valid());
@@ -167,23 +181,27 @@ inline const NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
167181
}
168182

169183
template <typename NativeT, typenameV8T>
184+
requires std::is_scalar_v<NativeT>
170185
typename AliasedBufferBase<NativeT, V8T>::Reference
171186
AliasedBufferBase<NativeT, V8T>::operator[](size_t index) {
172187
DCHECK(is_valid());
173188
returnReference(this, index);
174189
}
175190

176191
template <typename NativeT, typenameV8T>
192+
requires std::is_scalar_v<NativeT>
177193
NativeT AliasedBufferBase<NativeT, V8T>::operator[](size_t index) const {
178194
returnGetValue(index);
179195
}
180196

181197
template <typename NativeT, typenameV8T>
198+
requires std::is_scalar_v<NativeT>
182199
size_t AliasedBufferBase<NativeT, V8T>::Length() const {
183200
return count_;
184201
}
185202

186203
template <typename NativeT, typenameV8T>
204+
requires std::is_scalar_v<NativeT>
187205
void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
188206
DCHECK(is_valid());
189207
DCHECK_GE(new_capacity, count_);
@@ -214,11 +232,13 @@ void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
214232
}
215233

216234
template <typename NativeT, typenameV8T>
235+
requires std::is_scalar_v<NativeT>
217236
inlinebool AliasedBufferBase<NativeT, V8T>::is_valid() const {
218237
return index_ == nullptr && !js_array_.IsEmpty();
219238
}
220239

221240
template <typename NativeT, typenameV8T>
241+
requires std::is_scalar_v<NativeT>
222242
inlinesize_t AliasedBufferBase<NativeT, V8T>::SelfSize() const {
223243
returnsizeof(*this);
224244
}

‎src/aliased_buffer.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ typedef size_t AliasedBufferIndex;
2929
* observed. Any notification APIs will be left as a future exercise.
3030
*/
3131
template <classNativeT, classV8T>
32+
requires std::is_scalar_v<NativeT>
3233
classAliasedBufferBasefinal : public MemoryRetainer {
3334
public:
34-
static_assert(std::is_scalar_v<NativeT>);
35-
3635
AliasedBufferBase(v8::Isolate* isolate,
3736
size_t count,
3837
const AliasedBufferIndex* index = nullptr);

‎src/blob_serializer_deserializer-inl.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ std::string BlobSerializerDeserializer::GetName() const {
9090
// Helper for reading numeric types.
9191
template <typename Impl>
9292
template <typename T>
93+
requires std::is_arithmetic_v<T>
9394
T BlobDeserializer<Impl>::ReadArithmetic() {
94-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
9595
T result;
9696
ReadArithmetic(&result, 1);
9797
return result;
@@ -158,8 +158,8 @@ std::string_view BlobDeserializer<Impl>::ReadStringView(StringLogMode mode) {
158158
// Helper for reading an array of numeric types.
159159
template <typename Impl>
160160
template <typename T>
161+
requires std::is_arithmetic_v<T>
161162
void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
162-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
163163
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
164164
if (is_debug) {
165165
std::string name = GetName<T>();
@@ -180,8 +180,8 @@ void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
180180
// Helper for reading numeric vectors.
181181
template <typename Impl>
182182
template <typename Number>
183+
requires std::is_arithmetic_v<Number>
183184
std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
184-
static_assert(std::is_arithmetic_v<Number>, "Not an arithmetic type");
185185
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
186186
std::vector<Number> result(count);
187187
ReadArithmetic(result.data(), count);
@@ -191,8 +191,8 @@ std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
191191
// Helper for reading non-numeric vectors.
192192
template <typename Impl>
193193
template <typename T>
194+
requires(!std::is_arithmetic_v<T>)
194195
std::vector<T> BlobDeserializer<Impl>::ReadNonArithmeticVector(size_t count) {
195-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
196196
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
197197
std::vector<T> result;
198198
result.reserve(count);
@@ -224,8 +224,8 @@ T BlobDeserializer<Impl>::ReadElement() {
224224
// Helper for writing numeric types.
225225
template <typename Impl>
226226
template <typename T>
227+
requires std::is_arithmetic_v<T>
227228
size_t BlobSerializer<Impl>::WriteArithmetic(const T& data) {
228-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
229229
returnWriteArithmetic(&data, 1);
230230
}
231231

@@ -303,8 +303,8 @@ static size_t kPreviewCount = 16;
303303
// Helper for writing an array of numeric types.
304304
template <typename Impl>
305305
template <typename T>
306+
requires std::is_arithmetic_v<T>
306307
size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
307-
static_assert(std::is_arithmetic_v<T>, "Arithmetic type");
308308
DCHECK_GT(count, 0); // Should not write contents for vectors of size 0.
309309
if (is_debug) {
310310
size_t preview_count = count < kPreviewCount ? count : kPreviewCount;
@@ -338,18 +338,18 @@ size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
338338
// Helper for writing numeric vectors.
339339
template <typename Impl>
340340
template <typename Number>
341+
requires std::is_arithmetic_v<Number>
341342
size_t BlobSerializer<Impl>::WriteArithmeticVector(
342343
const std::vector<Number>& data) {
343-
static_assert(std::is_arithmetic_v<Number>, "Arithmetic type");
344344
returnWriteArithmetic(data.data(), data.size());
345345
}
346346

347347
// Helper for writing non-numeric vectors.
348348
template <typename Impl>
349349
template <typename T>
350-
size_t BlobSerializer<Impl>::WriteNonArithmeticVector(
351-
const std::vector<T>& data) {
352-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
350+
requires(!std::is_arithmetic_v<T>)
351+
size_t
352+
BlobSerializer<Impl>::WriteNonArithmeticVector(conststd::vector<T>& data) {
353353
DCHECK_GT(data.size(),
354354
0); // Should not write contents for vectors of size 0.
355355
size_t written_total = 0;

‎src/blob_serializer_deserializer.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#ifndef SRC_BLOB_SERIALIZER_DESERIALIZER_H_
22
#defineSRC_BLOB_SERIALIZER_DESERIALIZER_H_
33

4+
#include<concepts>
45
#include<string>
6+
#include<type_traits>
57
#include<vector>
68

79
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
@@ -49,6 +51,7 @@ class BlobDeserializer : public BlobSerializerDeserializer {
4951

5052
// Helper for reading numeric types.
5153
template <typename T>
54+
requires std::is_arithmetic_v<T>
5255
T ReadArithmetic();
5356

5457
// Layout of vectors:
@@ -63,15 +66,18 @@ class BlobDeserializer : public BlobSerializerDeserializer {
6366

6467
// Helper for reading an array of numeric types.
6568
template <typename T>
69+
requires std::is_arithmetic_v<T>
6670
voidReadArithmetic(T* out, size_t count);
6771

6872
// Helper for reading numeric vectors.
6973
template <typename Number>
74+
requires std::is_arithmetic_v<Number>
7075
std::vector<Number> ReadArithmeticVector(size_t count);
7176

7277
private:
7378
// Helper for reading non-numeric vectors.
7479
template <typename T>
80+
requires(!std::is_arithmetic_v<T>)
7581
std::vector<T> ReadNonArithmeticVector(size_t count);
7682

7783
template <typename T>
@@ -94,6 +100,7 @@ class BlobSerializer : public BlobSerializerDeserializer {
94100

95101
// Helper for writing numeric types.
96102
template <typename T>
103+
requires std::is_arithmetic_v<T>
97104
size_tWriteArithmetic(const T& data);
98105

99106
// Layout of vectors:
@@ -110,15 +117,18 @@ class BlobSerializer : public BlobSerializerDeserializer {
110117

111118
// Helper for writing an array of numeric types.
112119
template <typename T>
120+
requires std::is_arithmetic_v<T>
113121
size_tWriteArithmetic(const T* data, size_t count);
114122

115123
// Helper for writing numeric vectors.
116124
template <typename Number>
125+
requires std::is_arithmetic_v<Number>
117126
size_tWriteArithmeticVector(const std::vector<Number>& data);
118127

119128
private:
120129
// Helper for writing non-numeric vectors.
121130
template <typename T>
131+
requires(!std::is_arithmetic_v<T>)
122132
size_tWriteNonArithmeticVector(const std::vector<T>& data);
123133

124134
template <typename T>

‎src/crypto/crypto_aes.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ WebCryptoCipherStatus AES_KW_Cipher(Environment* env,
259259
// implementation here:
260260
// https://github.com/chromium/chromium/blob/7af6cfd/components/webcrypto/algorithms/aes_ctr.cc
261261

262-
template <typename T>
262+
template <std::integral T>
263263
T CeilDiv(T a, T b) {
264264
return a == 0 ? 0 : 1 + (a - 1) / b;
265265
}

‎src/crypto/crypto_util.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,8 @@ class ArrayBufferOrViewContents final {
732732
}
733733

734734
template <typename M>
735+
requires(sizeof(M) == 1)
735736
voidCopyTo(M* dest, size_t len) const {
736-
static_assert(sizeof(M) == 1, "sizeof(M) must equal 1");
737737
len = std::min(len, size());
738738
if (len > 0 && data() != nullptr) {
739739
memcpy(dest, data(), len);

‎src/debug_utils-inl.h‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ struct ToStringHelper {
4949
return value.ToStringView();
5050
}
5151

52-
template <typename T,
53-
typename test_for_number = typename std::
54-
enable_if_t<std::is_arithmetic_v<T> || std::is_enum_v<T>, bool>,
55-
typename dummy = bool>
52+
template <NumericOrEnum T>
5653
static std::string Convert(const T& value) {
5754
returnstd::to_string(value);
5855
}
@@ -81,9 +78,7 @@ struct ToStringHelper {
8178
return utf8_value.ToString();
8279
}
8380

84-
template <unsignedBASE_BITS,
85-
typename T,
86-
typename = std::enable_if_t<std::is_integral_v<T>>>
81+
template <unsignedBASE_BITS, std::integral T>
8782
static std::string BaseConvert(const T& value) {
8883
auto v = static_cast<uint64_t>(value);
8984
char ret[3 * sizeof(T)];
@@ -96,9 +91,8 @@ struct ToStringHelper {
9691
} while ((v >>= BASE_BITS) != 0);
9792
return ptr;
9893
}
99-
template <unsignedBASE_BITS,
100-
typename T,
101-
typename = std::enable_if_t<!std::is_integral_v<T>>>
94+
template <unsignedBASE_BITS, typename T>
95+
requires(!std::integral<T>)
10296
staticautoBaseConvert(T&& value) {
10397
returnConvert(std::forward<T>(value));
10498
}

‎src/json_utils.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6+
#include"node_concepts.h"
7+
68
#include<iomanip>
79
#include<limits>
810
#include<ostream>
@@ -132,9 +134,7 @@ class JSONWriter {
132134
};
133135

134136
private:
135-
template <typename T,
136-
typename test_for_number = typename std::
137-
enable_if<std::numeric_limits<T>::is_specialized, bool>::type>
137+
template <NumericValue T>
138138
inlinevoidwrite_value(T number) {
139139
ifconstexpr (std::is_same<T, bool>::value)
140140
out_ << (number ? "true" : "false");

‎src/memory_tracker-inl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void MemoryTracker::TrackField(const char* edge_name,
203203
TrackField(edge_name, container, node_name, element_name);
204204
}
205205

206-
template <typename T, typename test_for_number, typename dummy>
206+
template <NumericValue T>
207207
voidMemoryTracker::TrackField(constchar* edge_name,
208208
const T& value,
209209
constchar* node_name) {

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Commit 3cfe194

Browse files
jasnelladuh95
authored andcommitted
src: use concepts where appropriate
Some general modernizations of templates Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65148 Reviewed-By: Aviv Keller <me@aviv.sh> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
1 parent 40b1b18 commit 3cfe194

28 files changed

Lines changed: 161 additions & 141 deletions

‎node.gyp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@
254254
'src/node_blob.h',
255255
'src/node_buffer.h',
256256
'src/node_builtins.h',
257+
'src/node_concepts.h',
257258
'src/node_config_file.h',
258259
'src/node_constants.h',
259260
'src/node_context_data.h',

‎src/aliased_buffer-inl.h‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ namespace node {
1212
typedefsize_t AliasedBufferIndex;
1313

1414
template <typename NativeT, typenameV8T>
15+
requires std::is_scalar_v<NativeT>
1516
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
1617
v8::Isolate* isolate, constsize_t count, const AliasedBufferIndex* index)
1718
: isolate_(isolate), count_(count), byte_offset_(0), index_(index) {
@@ -34,6 +35,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3435
}
3536

3637
template <typename NativeT, typenameV8T>
38+
requires std::is_scalar_v<NativeT>
3739
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3840
v8::Isolate* isolate,
3941
constsize_t byte_offset,
@@ -65,6 +67,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6567
}
6668

6769
template <typename NativeT, typenameV8T>
70+
requires std::is_scalar_v<NativeT>
6871
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6972
const AliasedBufferBase& that)
7073
: isolate_(that.isolate_),
@@ -76,13 +79,15 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
7679
}
7780

7881
template <typename NativeT, typenameV8T>
82+
requires std::is_scalar_v<NativeT>
7983
AliasedBufferIndex AliasedBufferBase<NativeT, V8T>::Serialize(
8084
v8::Local<v8::Context> context, v8::SnapshotCreator* creator) {
8185
DCHECK(is_valid());
8286
return creator->AddData(context, GetJSArray());
8387
}
8488

8589
template <typename NativeT, typenameV8T>
90+
requires std::is_scalar_v<NativeT>
8691
inlinevoid AliasedBufferBase<NativeT, V8T>::Deserialize(
8792
v8::Local<v8::Context> context) {
8893
DCHECK_NOT_NULL(index_);
@@ -99,6 +104,7 @@ inline void AliasedBufferBase<NativeT, V8T>::Deserialize(
99104
}
100105

101106
template <typename NativeT, typenameV8T>
107+
requires std::is_scalar_v<NativeT>
102108
AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
103109
AliasedBufferBase<NativeT, V8T>&& that) noexcept {
104110
DCHECK(is_valid());
@@ -116,41 +122,48 @@ AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
116122
}
117123

118124
template <typename NativeT, typenameV8T>
125+
requires std::is_scalar_v<NativeT>
119126
v8::Local<V8T> AliasedBufferBase<NativeT, V8T>::GetJSArray() const {
120127
DCHECK(is_valid());
121128
return js_array_.Get(isolate_);
122129
}
123130

124131
template <typename NativeT, typenameV8T>
132+
requires std::is_scalar_v<NativeT>
125133
void AliasedBufferBase<NativeT, V8T>::Release() {
126134
DCHECK_NULL(index_);
127135
js_array_.Reset();
128136
}
129137

130138
template <typename NativeT, typenameV8T>
139+
requires std::is_scalar_v<NativeT>
131140
inlinevoid AliasedBufferBase<NativeT, V8T>::MakeWeak() {
132141
DCHECK(is_valid());
133142
js_array_.SetWeak();
134143
}
135144

136145
template <typename NativeT, typenameV8T>
146+
requires std::is_scalar_v<NativeT>
137147
v8::Local<v8::ArrayBuffer> AliasedBufferBase<NativeT, V8T>::GetArrayBuffer()
138148
const {
139149
returnGetJSArray()->Buffer();
140150
}
141151

142152
template <typename NativeT, typenameV8T>
153+
requires std::is_scalar_v<NativeT>
143154
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::GetNativeBuffer() const {
144155
DCHECK(is_valid());
145156
return buffer_;
146157
}
147158

148159
template <typename NativeT, typenameV8T>
160+
requires std::is_scalar_v<NativeT>
149161
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::operator*() const {
150162
returnGetNativeBuffer();
151163
}
152164

153165
template <typename NativeT, typenameV8T>
166+
requires std::is_scalar_v<NativeT>
154167
inlinevoid AliasedBufferBase<NativeT, V8T>::SetValue(constsize_t index,
155168
NativeT value) {
156169
DCHECK_LT(index, count_);
@@ -159,6 +172,7 @@ inline void AliasedBufferBase<NativeT, V8T>::SetValue(const size_t index,
159172
}
160173

161174
template <typename NativeT, typenameV8T>
175+
requires std::is_scalar_v<NativeT>
162176
inlineconst NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
163177
constsize_t index) const {
164178
DCHECK(is_valid());
@@ -167,23 +181,27 @@ inline const NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
167181
}
168182

169183
template <typename NativeT, typenameV8T>
184+
requires std::is_scalar_v<NativeT>
170185
typename AliasedBufferBase<NativeT, V8T>::Reference
171186
AliasedBufferBase<NativeT, V8T>::operator[](size_t index) {
172187
DCHECK(is_valid());
173188
returnReference(this, index);
174189
}
175190

176191
template <typename NativeT, typenameV8T>
192+
requires std::is_scalar_v<NativeT>
177193
NativeT AliasedBufferBase<NativeT, V8T>::operator[](size_t index) const {
178194
returnGetValue(index);
179195
}
180196

181197
template <typename NativeT, typenameV8T>
198+
requires std::is_scalar_v<NativeT>
182199
size_t AliasedBufferBase<NativeT, V8T>::Length() const {
183200
return count_;
184201
}
185202

186203
template <typename NativeT, typenameV8T>
204+
requires std::is_scalar_v<NativeT>
187205
void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
188206
DCHECK(is_valid());
189207
DCHECK_GE(new_capacity, count_);
@@ -214,11 +232,13 @@ void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
214232
}
215233

216234
template <typename NativeT, typenameV8T>
235+
requires std::is_scalar_v<NativeT>
217236
inlinebool AliasedBufferBase<NativeT, V8T>::is_valid() const {
218237
return index_ == nullptr && !js_array_.IsEmpty();
219238
}
220239

221240
template <typename NativeT, typenameV8T>
241+
requires std::is_scalar_v<NativeT>
222242
inlinesize_t AliasedBufferBase<NativeT, V8T>::SelfSize() const {
223243
returnsizeof(*this);
224244
}

‎src/aliased_buffer.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ typedef size_t AliasedBufferIndex;
2929
* observed. Any notification APIs will be left as a future exercise.
3030
*/
3131
template <classNativeT, classV8T>
32+
requires std::is_scalar_v<NativeT>
3233
classAliasedBufferBasefinal : public MemoryRetainer {
3334
public:
34-
static_assert(std::is_scalar_v<NativeT>);
35-
3635
AliasedBufferBase(v8::Isolate* isolate,
3736
size_t count,
3837
const AliasedBufferIndex* index = nullptr);

‎src/blob_serializer_deserializer-inl.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ std::string BlobSerializerDeserializer::GetName() const {
9090
// Helper for reading numeric types.
9191
template <typename Impl>
9292
template <typename T>
93+
requires std::is_arithmetic_v<T>
9394
T BlobDeserializer<Impl>::ReadArithmetic() {
94-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
9595
T result;
9696
ReadArithmetic(&result, 1);
9797
return result;
@@ -158,8 +158,8 @@ std::string_view BlobDeserializer<Impl>::ReadStringView(StringLogMode mode) {
158158
// Helper for reading an array of numeric types.
159159
template <typename Impl>
160160
template <typename T>
161+
requires std::is_arithmetic_v<T>
161162
void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
162-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
163163
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
164164
if (is_debug) {
165165
std::string name = GetName<T>();
@@ -180,8 +180,8 @@ void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
180180
// Helper for reading numeric vectors.
181181
template <typename Impl>
182182
template <typename Number>
183+
requires std::is_arithmetic_v<Number>
183184
std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
184-
static_assert(std::is_arithmetic_v<Number>, "Not an arithmetic type");
185185
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
186186
std::vector<Number> result(count);
187187
ReadArithmetic(result.data(), count);
@@ -191,8 +191,8 @@ std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
191191
// Helper for reading non-numeric vectors.
192192
template <typename Impl>
193193
template <typename T>
194+
requires(!std::is_arithmetic_v<T>)
194195
std::vector<T> BlobDeserializer<Impl>::ReadNonArithmeticVector(size_t count) {
195-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
196196
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
197197
std::vector<T> result;
198198
result.reserve(count);
@@ -224,8 +224,8 @@ T BlobDeserializer<Impl>::ReadElement() {
224224
// Helper for writing numeric types.
225225
template <typename Impl>
226226
template <typename T>
227+
requires std::is_arithmetic_v<T>
227228
size_t BlobSerializer<Impl>::WriteArithmetic(const T& data) {
228-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
229229
returnWriteArithmetic(&data, 1);
230230
}
231231

@@ -303,8 +303,8 @@ static size_t kPreviewCount = 16;
303303
// Helper for writing an array of numeric types.
304304
template <typename Impl>
305305
template <typename T>
306+
requires std::is_arithmetic_v<T>
306307
size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
307-
static_assert(std::is_arithmetic_v<T>, "Arithmetic type");
308308
DCHECK_GT(count, 0); // Should not write contents for vectors of size 0.
309309
if (is_debug) {
310310
size_t preview_count = count < kPreviewCount ? count : kPreviewCount;
@@ -338,18 +338,18 @@ size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
338338
// Helper for writing numeric vectors.
339339
template <typename Impl>
340340
template <typename Number>
341+
requires std::is_arithmetic_v<Number>
341342
size_t BlobSerializer<Impl>::WriteArithmeticVector(
342343
const std::vector<Number>& data) {
343-
static_assert(std::is_arithmetic_v<Number>, "Arithmetic type");
344344
returnWriteArithmetic(data.data(), data.size());
345345
}
346346

347347
// Helper for writing non-numeric vectors.
348348
template <typename Impl>
349349
template <typename T>
350-
size_t BlobSerializer<Impl>::WriteNonArithmeticVector(
351-
const std::vector<T>& data) {
352-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
350+
requires(!std::is_arithmetic_v<T>)
351+
size_t
352+
BlobSerializer<Impl>::WriteNonArithmeticVector(conststd::vector<T>& data) {
353353
DCHECK_GT(data.size(),
354354
0); // Should not write contents for vectors of size 0.
355355
size_t written_total = 0;

‎src/blob_serializer_deserializer.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#ifndef SRC_BLOB_SERIALIZER_DESERIALIZER_H_
22
#defineSRC_BLOB_SERIALIZER_DESERIALIZER_H_
33

4+
#include<concepts>
45
#include<string>
6+
#include<type_traits>
57
#include<vector>
68

79
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
@@ -49,6 +51,7 @@ class BlobDeserializer : public BlobSerializerDeserializer {
4951

5052
// Helper for reading numeric types.
5153
template <typename T>
54+
requires std::is_arithmetic_v<T>
5255
T ReadArithmetic();
5356

5457
// Layout of vectors:
@@ -63,15 +66,18 @@ class BlobDeserializer : public BlobSerializerDeserializer {
6366

6467
// Helper for reading an array of numeric types.
6568
template <typename T>
69+
requires std::is_arithmetic_v<T>
6670
voidReadArithmetic(T* out, size_t count);
6771

6872
// Helper for reading numeric vectors.
6973
template <typename Number>
74+
requires std::is_arithmetic_v<Number>
7075
std::vector<Number> ReadArithmeticVector(size_t count);
7176

7277
private:
7378
// Helper for reading non-numeric vectors.
7479
template <typename T>
80+
requires(!std::is_arithmetic_v<T>)
7581
std::vector<T> ReadNonArithmeticVector(size_t count);
7682

7783
template <typename T>
@@ -94,6 +100,7 @@ class BlobSerializer : public BlobSerializerDeserializer {
94100

95101
// Helper for writing numeric types.
96102
template <typename T>
103+
requires std::is_arithmetic_v<T>
97104
size_tWriteArithmetic(const T& data);
98105

99106
// Layout of vectors:
@@ -110,15 +117,18 @@ class BlobSerializer : public BlobSerializerDeserializer {
110117

111118
// Helper for writing an array of numeric types.
112119
template <typename T>
120+
requires std::is_arithmetic_v<T>
113121
size_tWriteArithmetic(const T* data, size_t count);
114122

115123
// Helper for writing numeric vectors.
116124
template <typename Number>
125+
requires std::is_arithmetic_v<Number>
117126
size_tWriteArithmeticVector(const std::vector<Number>& data);
118127

119128
private:
120129
// Helper for writing non-numeric vectors.
121130
template <typename T>
131+
requires(!std::is_arithmetic_v<T>)
122132
size_tWriteNonArithmeticVector(const std::vector<T>& data);
123133

124134
template <typename T>

‎src/crypto/crypto_aes.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ WebCryptoCipherStatus AES_KW_Cipher(Environment* env,
259259
// implementation here:
260260
// https://github.com/chromium/chromium/blob/7af6cfd/components/webcrypto/algorithms/aes_ctr.cc
261261

262-
template <typename T>
262+
template <std::integral T>
263263
T CeilDiv(T a, T b) {
264264
return a == 0 ? 0 : 1 + (a - 1) / b;
265265
}

‎src/crypto/crypto_util.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,8 @@ class ArrayBufferOrViewContents final {
732732
}
733733

734734
template <typename M>
735+
requires(sizeof(M) == 1)
735736
voidCopyTo(M* dest, size_t len) const {
736-
static_assert(sizeof(M) == 1, "sizeof(M) must equal 1");
737737
len = std::min(len, size());
738738
if (len > 0 && data() != nullptr) {
739739
memcpy(dest, data(), len);

‎src/debug_utils-inl.h‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ struct ToStringHelper {
4949
return value.ToStringView();
5050
}
5151

52-
template <typename T,
53-
typename test_for_number = typename std::
54-
enable_if_t<std::is_arithmetic_v<T> || std::is_enum_v<T>, bool>,
55-
typename dummy = bool>
52+
template <NumericOrEnum T>
5653
static std::string Convert(const T& value) {
5754
returnstd::to_string(value);
5855
}
@@ -81,9 +78,7 @@ struct ToStringHelper {
8178
return utf8_value.ToString();
8279
}
8380

84-
template <unsignedBASE_BITS,
85-
typename T,
86-
typename = std::enable_if_t<std::is_integral_v<T>>>
81+
template <unsignedBASE_BITS, std::integral T>
8782
static std::string BaseConvert(const T& value) {
8883
auto v = static_cast<uint64_t>(value);
8984
char ret[3 * sizeof(T)];
@@ -96,9 +91,8 @@ struct ToStringHelper {
9691
} while ((v >>= BASE_BITS) != 0);
9792
return ptr;
9893
}
99-
template <unsignedBASE_BITS,
100-
typename T,
101-
typename = std::enable_if_t<!std::is_integral_v<T>>>
94+
template <unsignedBASE_BITS, typename T>
95+
requires(!std::integral<T>)
10296
staticautoBaseConvert(T&& value) {
10397
returnConvert(std::forward<T>(value));
10498
}

‎src/json_utils.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6+
#include"node_concepts.h"
7+
68
#include<iomanip>
79
#include<limits>
810
#include<ostream>
@@ -132,9 +134,7 @@ class JSONWriter {
132134
};
133135

134136
private:
135-
template <typename T,
136-
typename test_for_number = typename std::
137-
enable_if<std::numeric_limits<T>::is_specialized, bool>::type>
137+
template <NumericValue T>
138138
inlinevoidwrite_value(T number) {
139139
ifconstexpr (std::is_same<T, bool>::value)
140140
out_ << (number ? "true" : "false");

‎src/memory_tracker-inl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void MemoryTracker::TrackField(const char* edge_name,
203203
TrackField(edge_name, container, node_name, element_name);
204204
}
205205

206-
template <typename T, typename test_for_number, typename dummy>
206+
template <NumericValue T>
207207
voidMemoryTracker::TrackField(constchar* edge_name,
208208
const T& value,
209209
constchar* node_name) {

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 3cfe194

Browse files
jasnelladuh95
authored andcommitted
src: use concepts where appropriate
Some general modernizations of templates Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65148 Reviewed-By: Aviv Keller <me@aviv.sh> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
1 parent 40b1b18 commit 3cfe194

28 files changed

Lines changed: 161 additions & 141 deletions

‎node.gyp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@
254254
'src/node_blob.h',
255255
'src/node_buffer.h',
256256
'src/node_builtins.h',
257+
'src/node_concepts.h',
257258
'src/node_config_file.h',
258259
'src/node_constants.h',
259260
'src/node_context_data.h',

‎src/aliased_buffer-inl.h‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ namespace node {
1212
typedefsize_t AliasedBufferIndex;
1313

1414
template <typename NativeT, typenameV8T>
15+
requires std::is_scalar_v<NativeT>
1516
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
1617
v8::Isolate* isolate, constsize_t count, const AliasedBufferIndex* index)
1718
: isolate_(isolate), count_(count), byte_offset_(0), index_(index) {
@@ -34,6 +35,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3435
}
3536

3637
template <typename NativeT, typenameV8T>
38+
requires std::is_scalar_v<NativeT>
3739
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3840
v8::Isolate* isolate,
3941
constsize_t byte_offset,
@@ -65,6 +67,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6567
}
6668

6769
template <typename NativeT, typenameV8T>
70+
requires std::is_scalar_v<NativeT>
6871
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6972
const AliasedBufferBase& that)
7073
: isolate_(that.isolate_),
@@ -76,13 +79,15 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
7679
}
7780

7881
template <typename NativeT, typenameV8T>
82+
requires std::is_scalar_v<NativeT>
7983
AliasedBufferIndex AliasedBufferBase<NativeT, V8T>::Serialize(
8084
v8::Local<v8::Context> context, v8::SnapshotCreator* creator) {
8185
DCHECK(is_valid());
8286
return creator->AddData(context, GetJSArray());
8387
}
8488

8589
template <typename NativeT, typenameV8T>
90+
requires std::is_scalar_v<NativeT>
8691
inlinevoid AliasedBufferBase<NativeT, V8T>::Deserialize(
8792
v8::Local<v8::Context> context) {
8893
DCHECK_NOT_NULL(index_);
@@ -99,6 +104,7 @@ inline void AliasedBufferBase<NativeT, V8T>::Deserialize(
99104
}
100105

101106
template <typename NativeT, typenameV8T>
107+
requires std::is_scalar_v<NativeT>
102108
AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
103109
AliasedBufferBase<NativeT, V8T>&& that) noexcept {
104110
DCHECK(is_valid());
@@ -116,41 +122,48 @@ AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
116122
}
117123

118124
template <typename NativeT, typenameV8T>
125+
requires std::is_scalar_v<NativeT>
119126
v8::Local<V8T> AliasedBufferBase<NativeT, V8T>::GetJSArray() const {
120127
DCHECK(is_valid());
121128
return js_array_.Get(isolate_);
122129
}
123130

124131
template <typename NativeT, typenameV8T>
132+
requires std::is_scalar_v<NativeT>
125133
void AliasedBufferBase<NativeT, V8T>::Release() {
126134
DCHECK_NULL(index_);
127135
js_array_.Reset();
128136
}
129137

130138
template <typename NativeT, typenameV8T>
139+
requires std::is_scalar_v<NativeT>
131140
inlinevoid AliasedBufferBase<NativeT, V8T>::MakeWeak() {
132141
DCHECK(is_valid());
133142
js_array_.SetWeak();
134143
}
135144

136145
template <typename NativeT, typenameV8T>
146+
requires std::is_scalar_v<NativeT>
137147
v8::Local<v8::ArrayBuffer> AliasedBufferBase<NativeT, V8T>::GetArrayBuffer()
138148
const {
139149
returnGetJSArray()->Buffer();
140150
}
141151

142152
template <typename NativeT, typenameV8T>
153+
requires std::is_scalar_v<NativeT>
143154
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::GetNativeBuffer() const {
144155
DCHECK(is_valid());
145156
return buffer_;
146157
}
147158

148159
template <typename NativeT, typenameV8T>
160+
requires std::is_scalar_v<NativeT>
149161
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::operator*() const {
150162
returnGetNativeBuffer();
151163
}
152164

153165
template <typename NativeT, typenameV8T>
166+
requires std::is_scalar_v<NativeT>
154167
inlinevoid AliasedBufferBase<NativeT, V8T>::SetValue(constsize_t index,
155168
NativeT value) {
156169
DCHECK_LT(index, count_);
@@ -159,6 +172,7 @@ inline void AliasedBufferBase<NativeT, V8T>::SetValue(const size_t index,
159172
}
160173

161174
template <typename NativeT, typenameV8T>
175+
requires std::is_scalar_v<NativeT>
162176
inlineconst NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
163177
constsize_t index) const {
164178
DCHECK(is_valid());
@@ -167,23 +181,27 @@ inline const NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
167181
}
168182

169183
template <typename NativeT, typenameV8T>
184+
requires std::is_scalar_v<NativeT>
170185
typename AliasedBufferBase<NativeT, V8T>::Reference
171186
AliasedBufferBase<NativeT, V8T>::operator[](size_t index) {
172187
DCHECK(is_valid());
173188
returnReference(this, index);
174189
}
175190

176191
template <typename NativeT, typenameV8T>
192+
requires std::is_scalar_v<NativeT>
177193
NativeT AliasedBufferBase<NativeT, V8T>::operator[](size_t index) const {
178194
returnGetValue(index);
179195
}
180196

181197
template <typename NativeT, typenameV8T>
198+
requires std::is_scalar_v<NativeT>
182199
size_t AliasedBufferBase<NativeT, V8T>::Length() const {
183200
return count_;
184201
}
185202

186203
template <typename NativeT, typenameV8T>
204+
requires std::is_scalar_v<NativeT>
187205
void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
188206
DCHECK(is_valid());
189207
DCHECK_GE(new_capacity, count_);
@@ -214,11 +232,13 @@ void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
214232
}
215233

216234
template <typename NativeT, typenameV8T>
235+
requires std::is_scalar_v<NativeT>
217236
inlinebool AliasedBufferBase<NativeT, V8T>::is_valid() const {
218237
return index_ == nullptr && !js_array_.IsEmpty();
219238
}
220239

221240
template <typename NativeT, typenameV8T>
241+
requires std::is_scalar_v<NativeT>
222242
inlinesize_t AliasedBufferBase<NativeT, V8T>::SelfSize() const {
223243
returnsizeof(*this);
224244
}

‎src/aliased_buffer.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ typedef size_t AliasedBufferIndex;
2929
* observed. Any notification APIs will be left as a future exercise.
3030
*/
3131
template <classNativeT, classV8T>
32+
requires std::is_scalar_v<NativeT>
3233
classAliasedBufferBasefinal : public MemoryRetainer {
3334
public:
34-
static_assert(std::is_scalar_v<NativeT>);
35-
3635
AliasedBufferBase(v8::Isolate* isolate,
3736
size_t count,
3837
const AliasedBufferIndex* index = nullptr);

‎src/blob_serializer_deserializer-inl.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ std::string BlobSerializerDeserializer::GetName() const {
9090
// Helper for reading numeric types.
9191
template <typename Impl>
9292
template <typename T>
93+
requires std::is_arithmetic_v<T>
9394
T BlobDeserializer<Impl>::ReadArithmetic() {
94-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
9595
T result;
9696
ReadArithmetic(&result, 1);
9797
return result;
@@ -158,8 +158,8 @@ std::string_view BlobDeserializer<Impl>::ReadStringView(StringLogMode mode) {
158158
// Helper for reading an array of numeric types.
159159
template <typename Impl>
160160
template <typename T>
161+
requires std::is_arithmetic_v<T>
161162
void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
162-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
163163
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
164164
if (is_debug) {
165165
std::string name = GetName<T>();
@@ -180,8 +180,8 @@ void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
180180
// Helper for reading numeric vectors.
181181
template <typename Impl>
182182
template <typename Number>
183+
requires std::is_arithmetic_v<Number>
183184
std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
184-
static_assert(std::is_arithmetic_v<Number>, "Not an arithmetic type");
185185
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
186186
std::vector<Number> result(count);
187187
ReadArithmetic(result.data(), count);
@@ -191,8 +191,8 @@ std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
191191
// Helper for reading non-numeric vectors.
192192
template <typename Impl>
193193
template <typename T>
194+
requires(!std::is_arithmetic_v<T>)
194195
std::vector<T> BlobDeserializer<Impl>::ReadNonArithmeticVector(size_t count) {
195-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
196196
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
197197
std::vector<T> result;
198198
result.reserve(count);
@@ -224,8 +224,8 @@ T BlobDeserializer<Impl>::ReadElement() {
224224
// Helper for writing numeric types.
225225
template <typename Impl>
226226
template <typename T>
227+
requires std::is_arithmetic_v<T>
227228
size_t BlobSerializer<Impl>::WriteArithmetic(const T& data) {
228-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
229229
returnWriteArithmetic(&data, 1);
230230
}
231231

@@ -303,8 +303,8 @@ static size_t kPreviewCount = 16;
303303
// Helper for writing an array of numeric types.
304304
template <typename Impl>
305305
template <typename T>
306+
requires std::is_arithmetic_v<T>
306307
size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
307-
static_assert(std::is_arithmetic_v<T>, "Arithmetic type");
308308
DCHECK_GT(count, 0); // Should not write contents for vectors of size 0.
309309
if (is_debug) {
310310
size_t preview_count = count < kPreviewCount ? count : kPreviewCount;
@@ -338,18 +338,18 @@ size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
338338
// Helper for writing numeric vectors.
339339
template <typename Impl>
340340
template <typename Number>
341+
requires std::is_arithmetic_v<Number>
341342
size_t BlobSerializer<Impl>::WriteArithmeticVector(
342343
const std::vector<Number>& data) {
343-
static_assert(std::is_arithmetic_v<Number>, "Arithmetic type");
344344
returnWriteArithmetic(data.data(), data.size());
345345
}
346346

347347
// Helper for writing non-numeric vectors.
348348
template <typename Impl>
349349
template <typename T>
350-
size_t BlobSerializer<Impl>::WriteNonArithmeticVector(
351-
const std::vector<T>& data) {
352-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
350+
requires(!std::is_arithmetic_v<T>)
351+
size_t
352+
BlobSerializer<Impl>::WriteNonArithmeticVector(conststd::vector<T>& data) {
353353
DCHECK_GT(data.size(),
354354
0); // Should not write contents for vectors of size 0.
355355
size_t written_total = 0;

‎src/blob_serializer_deserializer.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#ifndef SRC_BLOB_SERIALIZER_DESERIALIZER_H_
22
#defineSRC_BLOB_SERIALIZER_DESERIALIZER_H_
33

4+
#include<concepts>
45
#include<string>
6+
#include<type_traits>
57
#include<vector>
68

79
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
@@ -49,6 +51,7 @@ class BlobDeserializer : public BlobSerializerDeserializer {
4951

5052
// Helper for reading numeric types.
5153
template <typename T>
54+
requires std::is_arithmetic_v<T>
5255
T ReadArithmetic();
5356

5457
// Layout of vectors:
@@ -63,15 +66,18 @@ class BlobDeserializer : public BlobSerializerDeserializer {
6366

6467
// Helper for reading an array of numeric types.
6568
template <typename T>
69+
requires std::is_arithmetic_v<T>
6670
voidReadArithmetic(T* out, size_t count);
6771

6872
// Helper for reading numeric vectors.
6973
template <typename Number>
74+
requires std::is_arithmetic_v<Number>
7075
std::vector<Number> ReadArithmeticVector(size_t count);
7176

7277
private:
7378
// Helper for reading non-numeric vectors.
7479
template <typename T>
80+
requires(!std::is_arithmetic_v<T>)
7581
std::vector<T> ReadNonArithmeticVector(size_t count);
7682

7783
template <typename T>
@@ -94,6 +100,7 @@ class BlobSerializer : public BlobSerializerDeserializer {
94100

95101
// Helper for writing numeric types.
96102
template <typename T>
103+
requires std::is_arithmetic_v<T>
97104
size_tWriteArithmetic(const T& data);
98105

99106
// Layout of vectors:
@@ -110,15 +117,18 @@ class BlobSerializer : public BlobSerializerDeserializer {
110117

111118
// Helper for writing an array of numeric types.
112119
template <typename T>
120+
requires std::is_arithmetic_v<T>
113121
size_tWriteArithmetic(const T* data, size_t count);
114122

115123
// Helper for writing numeric vectors.
116124
template <typename Number>
125+
requires std::is_arithmetic_v<Number>
117126
size_tWriteArithmeticVector(const std::vector<Number>& data);
118127

119128
private:
120129
// Helper for writing non-numeric vectors.
121130
template <typename T>
131+
requires(!std::is_arithmetic_v<T>)
122132
size_tWriteNonArithmeticVector(const std::vector<T>& data);
123133

124134
template <typename T>

‎src/crypto/crypto_aes.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ WebCryptoCipherStatus AES_KW_Cipher(Environment* env,
259259
// implementation here:
260260
// https://github.com/chromium/chromium/blob/7af6cfd/components/webcrypto/algorithms/aes_ctr.cc
261261

262-
template <typename T>
262+
template <std::integral T>
263263
T CeilDiv(T a, T b) {
264264
return a == 0 ? 0 : 1 + (a - 1) / b;
265265
}

‎src/crypto/crypto_util.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,8 @@ class ArrayBufferOrViewContents final {
732732
}
733733

734734
template <typename M>
735+
requires(sizeof(M) == 1)
735736
voidCopyTo(M* dest, size_t len) const {
736-
static_assert(sizeof(M) == 1, "sizeof(M) must equal 1");
737737
len = std::min(len, size());
738738
if (len > 0 && data() != nullptr) {
739739
memcpy(dest, data(), len);

‎src/debug_utils-inl.h‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ struct ToStringHelper {
4949
return value.ToStringView();
5050
}
5151

52-
template <typename T,
53-
typename test_for_number = typename std::
54-
enable_if_t<std::is_arithmetic_v<T> || std::is_enum_v<T>, bool>,
55-
typename dummy = bool>
52+
template <NumericOrEnum T>
5653
static std::string Convert(const T& value) {
5754
returnstd::to_string(value);
5855
}
@@ -81,9 +78,7 @@ struct ToStringHelper {
8178
return utf8_value.ToString();
8279
}
8380

84-
template <unsignedBASE_BITS,
85-
typename T,
86-
typename = std::enable_if_t<std::is_integral_v<T>>>
81+
template <unsignedBASE_BITS, std::integral T>
8782
static std::string BaseConvert(const T& value) {
8883
auto v = static_cast<uint64_t>(value);
8984
char ret[3 * sizeof(T)];
@@ -96,9 +91,8 @@ struct ToStringHelper {
9691
} while ((v >>= BASE_BITS) != 0);
9792
return ptr;
9893
}
99-
template <unsignedBASE_BITS,
100-
typename T,
101-
typename = std::enable_if_t<!std::is_integral_v<T>>>
94+
template <unsignedBASE_BITS, typename T>
95+
requires(!std::integral<T>)
10296
staticautoBaseConvert(T&& value) {
10397
returnConvert(std::forward<T>(value));
10498
}

‎src/json_utils.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6+
#include"node_concepts.h"
7+
68
#include<iomanip>
79
#include<limits>
810
#include<ostream>
@@ -132,9 +134,7 @@ class JSONWriter {
132134
};
133135

134136
private:
135-
template <typename T,
136-
typename test_for_number = typename std::
137-
enable_if<std::numeric_limits<T>::is_specialized, bool>::type>
137+
template <NumericValue T>
138138
inlinevoidwrite_value(T number) {
139139
ifconstexpr (std::is_same<T, bool>::value)
140140
out_ << (number ? "true" : "false");

‎src/memory_tracker-inl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void MemoryTracker::TrackField(const char* edge_name,
203203
TrackField(edge_name, container, node_name, element_name);
204204
}
205205

206-
template <typename T, typename test_for_number, typename dummy>
206+
template <NumericValue T>
207207
voidMemoryTracker::TrackField(constchar* edge_name,
208208
const T& value,
209209
constchar* node_name) {

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 3cfe194

Browse files
jasnelladuh95
authored andcommitted
src: use concepts where appropriate
Some general modernizations of templates Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65148 Reviewed-By: Aviv Keller <me@aviv.sh> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
1 parent 40b1b18 commit 3cfe194

28 files changed

Lines changed: 161 additions & 141 deletions

‎node.gyp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@
254254
'src/node_blob.h',
255255
'src/node_buffer.h',
256256
'src/node_builtins.h',
257+
'src/node_concepts.h',
257258
'src/node_config_file.h',
258259
'src/node_constants.h',
259260
'src/node_context_data.h',

‎src/aliased_buffer-inl.h‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ namespace node {
1212
typedefsize_t AliasedBufferIndex;
1313

1414
template <typename NativeT, typenameV8T>
15+
requires std::is_scalar_v<NativeT>
1516
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
1617
v8::Isolate* isolate, constsize_t count, const AliasedBufferIndex* index)
1718
: isolate_(isolate), count_(count), byte_offset_(0), index_(index) {
@@ -34,6 +35,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3435
}
3536

3637
template <typename NativeT, typenameV8T>
38+
requires std::is_scalar_v<NativeT>
3739
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3840
v8::Isolate* isolate,
3941
constsize_t byte_offset,
@@ -65,6 +67,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6567
}
6668

6769
template <typename NativeT, typenameV8T>
70+
requires std::is_scalar_v<NativeT>
6871
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6972
const AliasedBufferBase& that)
7073
: isolate_(that.isolate_),
@@ -76,13 +79,15 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
7679
}
7780

7881
template <typename NativeT, typenameV8T>
82+
requires std::is_scalar_v<NativeT>
7983
AliasedBufferIndex AliasedBufferBase<NativeT, V8T>::Serialize(
8084
v8::Local<v8::Context> context, v8::SnapshotCreator* creator) {
8185
DCHECK(is_valid());
8286
return creator->AddData(context, GetJSArray());
8387
}
8488

8589
template <typename NativeT, typenameV8T>
90+
requires std::is_scalar_v<NativeT>
8691
inlinevoid AliasedBufferBase<NativeT, V8T>::Deserialize(
8792
v8::Local<v8::Context> context) {
8893
DCHECK_NOT_NULL(index_);
@@ -99,6 +104,7 @@ inline void AliasedBufferBase<NativeT, V8T>::Deserialize(
99104
}
100105

101106
template <typename NativeT, typenameV8T>
107+
requires std::is_scalar_v<NativeT>
102108
AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
103109
AliasedBufferBase<NativeT, V8T>&& that) noexcept {
104110
DCHECK(is_valid());
@@ -116,41 +122,48 @@ AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
116122
}
117123

118124
template <typename NativeT, typenameV8T>
125+
requires std::is_scalar_v<NativeT>
119126
v8::Local<V8T> AliasedBufferBase<NativeT, V8T>::GetJSArray() const {
120127
DCHECK(is_valid());
121128
return js_array_.Get(isolate_);
122129
}
123130

124131
template <typename NativeT, typenameV8T>
132+
requires std::is_scalar_v<NativeT>
125133
void AliasedBufferBase<NativeT, V8T>::Release() {
126134
DCHECK_NULL(index_);
127135
js_array_.Reset();
128136
}
129137

130138
template <typename NativeT, typenameV8T>
139+
requires std::is_scalar_v<NativeT>
131140
inlinevoid AliasedBufferBase<NativeT, V8T>::MakeWeak() {
132141
DCHECK(is_valid());
133142
js_array_.SetWeak();
134143
}
135144

136145
template <typename NativeT, typenameV8T>
146+
requires std::is_scalar_v<NativeT>
137147
v8::Local<v8::ArrayBuffer> AliasedBufferBase<NativeT, V8T>::GetArrayBuffer()
138148
const {
139149
returnGetJSArray()->Buffer();
140150
}
141151

142152
template <typename NativeT, typenameV8T>
153+
requires std::is_scalar_v<NativeT>
143154
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::GetNativeBuffer() const {
144155
DCHECK(is_valid());
145156
return buffer_;
146157
}
147158

148159
template <typename NativeT, typenameV8T>
160+
requires std::is_scalar_v<NativeT>
149161
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::operator*() const {
150162
returnGetNativeBuffer();
151163
}
152164

153165
template <typename NativeT, typenameV8T>
166+
requires std::is_scalar_v<NativeT>
154167
inlinevoid AliasedBufferBase<NativeT, V8T>::SetValue(constsize_t index,
155168
NativeT value) {
156169
DCHECK_LT(index, count_);
@@ -159,6 +172,7 @@ inline void AliasedBufferBase<NativeT, V8T>::SetValue(const size_t index,
159172
}
160173

161174
template <typename NativeT, typenameV8T>
175+
requires std::is_scalar_v<NativeT>
162176
inlineconst NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
163177
constsize_t index) const {
164178
DCHECK(is_valid());
@@ -167,23 +181,27 @@ inline const NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
167181
}
168182

169183
template <typename NativeT, typenameV8T>
184+
requires std::is_scalar_v<NativeT>
170185
typename AliasedBufferBase<NativeT, V8T>::Reference
171186
AliasedBufferBase<NativeT, V8T>::operator[](size_t index) {
172187
DCHECK(is_valid());
173188
returnReference(this, index);
174189
}
175190

176191
template <typename NativeT, typenameV8T>
192+
requires std::is_scalar_v<NativeT>
177193
NativeT AliasedBufferBase<NativeT, V8T>::operator[](size_t index) const {
178194
returnGetValue(index);
179195
}
180196

181197
template <typename NativeT, typenameV8T>
198+
requires std::is_scalar_v<NativeT>
182199
size_t AliasedBufferBase<NativeT, V8T>::Length() const {
183200
return count_;
184201
}
185202

186203
template <typename NativeT, typenameV8T>
204+
requires std::is_scalar_v<NativeT>
187205
void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
188206
DCHECK(is_valid());
189207
DCHECK_GE(new_capacity, count_);
@@ -214,11 +232,13 @@ void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
214232
}
215233

216234
template <typename NativeT, typenameV8T>
235+
requires std::is_scalar_v<NativeT>
217236
inlinebool AliasedBufferBase<NativeT, V8T>::is_valid() const {
218237
return index_ == nullptr && !js_array_.IsEmpty();
219238
}
220239

221240
template <typename NativeT, typenameV8T>
241+
requires std::is_scalar_v<NativeT>
222242
inlinesize_t AliasedBufferBase<NativeT, V8T>::SelfSize() const {
223243
returnsizeof(*this);
224244
}

‎src/aliased_buffer.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ typedef size_t AliasedBufferIndex;
2929
* observed. Any notification APIs will be left as a future exercise.
3030
*/
3131
template <classNativeT, classV8T>
32+
requires std::is_scalar_v<NativeT>
3233
classAliasedBufferBasefinal : public MemoryRetainer {
3334
public:
34-
static_assert(std::is_scalar_v<NativeT>);
35-
3635
AliasedBufferBase(v8::Isolate* isolate,
3736
size_t count,
3837
const AliasedBufferIndex* index = nullptr);

‎src/blob_serializer_deserializer-inl.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ std::string BlobSerializerDeserializer::GetName() const {
9090
// Helper for reading numeric types.
9191
template <typename Impl>
9292
template <typename T>
93+
requires std::is_arithmetic_v<T>
9394
T BlobDeserializer<Impl>::ReadArithmetic() {
94-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
9595
T result;
9696
ReadArithmetic(&result, 1);
9797
return result;
@@ -158,8 +158,8 @@ std::string_view BlobDeserializer<Impl>::ReadStringView(StringLogMode mode) {
158158
// Helper for reading an array of numeric types.
159159
template <typename Impl>
160160
template <typename T>
161+
requires std::is_arithmetic_v<T>
161162
void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
162-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
163163
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
164164
if (is_debug) {
165165
std::string name = GetName<T>();
@@ -180,8 +180,8 @@ void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
180180
// Helper for reading numeric vectors.
181181
template <typename Impl>
182182
template <typename Number>
183+
requires std::is_arithmetic_v<Number>
183184
std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
184-
static_assert(std::is_arithmetic_v<Number>, "Not an arithmetic type");
185185
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
186186
std::vector<Number> result(count);
187187
ReadArithmetic(result.data(), count);
@@ -191,8 +191,8 @@ std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
191191
// Helper for reading non-numeric vectors.
192192
template <typename Impl>
193193
template <typename T>
194+
requires(!std::is_arithmetic_v<T>)
194195
std::vector<T> BlobDeserializer<Impl>::ReadNonArithmeticVector(size_t count) {
195-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
196196
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
197197
std::vector<T> result;
198198
result.reserve(count);
@@ -224,8 +224,8 @@ T BlobDeserializer<Impl>::ReadElement() {
224224
// Helper for writing numeric types.
225225
template <typename Impl>
226226
template <typename T>
227+
requires std::is_arithmetic_v<T>
227228
size_t BlobSerializer<Impl>::WriteArithmetic(const T& data) {
228-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
229229
returnWriteArithmetic(&data, 1);
230230
}
231231

@@ -303,8 +303,8 @@ static size_t kPreviewCount = 16;
303303
// Helper for writing an array of numeric types.
304304
template <typename Impl>
305305
template <typename T>
306+
requires std::is_arithmetic_v<T>
306307
size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
307-
static_assert(std::is_arithmetic_v<T>, "Arithmetic type");
308308
DCHECK_GT(count, 0); // Should not write contents for vectors of size 0.
309309
if (is_debug) {
310310
size_t preview_count = count < kPreviewCount ? count : kPreviewCount;
@@ -338,18 +338,18 @@ size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
338338
// Helper for writing numeric vectors.
339339
template <typename Impl>
340340
template <typename Number>
341+
requires std::is_arithmetic_v<Number>
341342
size_t BlobSerializer<Impl>::WriteArithmeticVector(
342343
const std::vector<Number>& data) {
343-
static_assert(std::is_arithmetic_v<Number>, "Arithmetic type");
344344
returnWriteArithmetic(data.data(), data.size());
345345
}
346346

347347
// Helper for writing non-numeric vectors.
348348
template <typename Impl>
349349
template <typename T>
350-
size_t BlobSerializer<Impl>::WriteNonArithmeticVector(
351-
const std::vector<T>& data) {
352-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
350+
requires(!std::is_arithmetic_v<T>)
351+
size_t
352+
BlobSerializer<Impl>::WriteNonArithmeticVector(conststd::vector<T>& data) {
353353
DCHECK_GT(data.size(),
354354
0); // Should not write contents for vectors of size 0.
355355
size_t written_total = 0;

‎src/blob_serializer_deserializer.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#ifndef SRC_BLOB_SERIALIZER_DESERIALIZER_H_
22
#defineSRC_BLOB_SERIALIZER_DESERIALIZER_H_
33

4+
#include<concepts>
45
#include<string>
6+
#include<type_traits>
57
#include<vector>
68

79
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
@@ -49,6 +51,7 @@ class BlobDeserializer : public BlobSerializerDeserializer {
4951

5052
// Helper for reading numeric types.
5153
template <typename T>
54+
requires std::is_arithmetic_v<T>
5255
T ReadArithmetic();
5356

5457
// Layout of vectors:
@@ -63,15 +66,18 @@ class BlobDeserializer : public BlobSerializerDeserializer {
6366

6467
// Helper for reading an array of numeric types.
6568
template <typename T>
69+
requires std::is_arithmetic_v<T>
6670
voidReadArithmetic(T* out, size_t count);
6771

6872
// Helper for reading numeric vectors.
6973
template <typename Number>
74+
requires std::is_arithmetic_v<Number>
7075
std::vector<Number> ReadArithmeticVector(size_t count);
7176

7277
private:
7378
// Helper for reading non-numeric vectors.
7479
template <typename T>
80+
requires(!std::is_arithmetic_v<T>)
7581
std::vector<T> ReadNonArithmeticVector(size_t count);
7682

7783
template <typename T>
@@ -94,6 +100,7 @@ class BlobSerializer : public BlobSerializerDeserializer {
94100

95101
// Helper for writing numeric types.
96102
template <typename T>
103+
requires std::is_arithmetic_v<T>
97104
size_tWriteArithmetic(const T& data);
98105

99106
// Layout of vectors:
@@ -110,15 +117,18 @@ class BlobSerializer : public BlobSerializerDeserializer {
110117

111118
// Helper for writing an array of numeric types.
112119
template <typename T>
120+
requires std::is_arithmetic_v<T>
113121
size_tWriteArithmetic(const T* data, size_t count);
114122

115123
// Helper for writing numeric vectors.
116124
template <typename Number>
125+
requires std::is_arithmetic_v<Number>
117126
size_tWriteArithmeticVector(const std::vector<Number>& data);
118127

119128
private:
120129
// Helper for writing non-numeric vectors.
121130
template <typename T>
131+
requires(!std::is_arithmetic_v<T>)
122132
size_tWriteNonArithmeticVector(const std::vector<T>& data);
123133

124134
template <typename T>

‎src/crypto/crypto_aes.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ WebCryptoCipherStatus AES_KW_Cipher(Environment* env,
259259
// implementation here:
260260
// https://github.com/chromium/chromium/blob/7af6cfd/components/webcrypto/algorithms/aes_ctr.cc
261261

262-
template <typename T>
262+
template <std::integral T>
263263
T CeilDiv(T a, T b) {
264264
return a == 0 ? 0 : 1 + (a - 1) / b;
265265
}

‎src/crypto/crypto_util.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,8 @@ class ArrayBufferOrViewContents final {
732732
}
733733

734734
template <typename M>
735+
requires(sizeof(M) == 1)
735736
voidCopyTo(M* dest, size_t len) const {
736-
static_assert(sizeof(M) == 1, "sizeof(M) must equal 1");
737737
len = std::min(len, size());
738738
if (len > 0 && data() != nullptr) {
739739
memcpy(dest, data(), len);

‎src/debug_utils-inl.h‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ struct ToStringHelper {
4949
return value.ToStringView();
5050
}
5151

52-
template <typename T,
53-
typename test_for_number = typename std::
54-
enable_if_t<std::is_arithmetic_v<T> || std::is_enum_v<T>, bool>,
55-
typename dummy = bool>
52+
template <NumericOrEnum T>
5653
static std::string Convert(const T& value) {
5754
returnstd::to_string(value);
5855
}
@@ -81,9 +78,7 @@ struct ToStringHelper {
8178
return utf8_value.ToString();
8279
}
8380

84-
template <unsignedBASE_BITS,
85-
typename T,
86-
typename = std::enable_if_t<std::is_integral_v<T>>>
81+
template <unsignedBASE_BITS, std::integral T>
8782
static std::string BaseConvert(const T& value) {
8883
auto v = static_cast<uint64_t>(value);
8984
char ret[3 * sizeof(T)];
@@ -96,9 +91,8 @@ struct ToStringHelper {
9691
} while ((v >>= BASE_BITS) != 0);
9792
return ptr;
9893
}
99-
template <unsignedBASE_BITS,
100-
typename T,
101-
typename = std::enable_if_t<!std::is_integral_v<T>>>
94+
template <unsignedBASE_BITS, typename T>
95+
requires(!std::integral<T>)
10296
staticautoBaseConvert(T&& value) {
10397
returnConvert(std::forward<T>(value));
10498
}

‎src/json_utils.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6+
#include"node_concepts.h"
7+
68
#include<iomanip>
79
#include<limits>
810
#include<ostream>
@@ -132,9 +134,7 @@ class JSONWriter {
132134
};
133135

134136
private:
135-
template <typename T,
136-
typename test_for_number = typename std::
137-
enable_if<std::numeric_limits<T>::is_specialized, bool>::type>
137+
template <NumericValue T>
138138
inlinevoidwrite_value(T number) {
139139
ifconstexpr (std::is_same<T, bool>::value)
140140
out_ << (number ? "true" : "false");

‎src/memory_tracker-inl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void MemoryTracker::TrackField(const char* edge_name,
203203
TrackField(edge_name, container, node_name, element_name);
204204
}
205205

206-
template <typename T, typename test_for_number, typename dummy>
206+
template <NumericValue T>
207207
voidMemoryTracker::TrackField(constchar* edge_name,
208208
const T& value,
209209
constchar* node_name) {

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Commit 3cfe194

Browse files
jasnelladuh95
authored andcommitted
src: use concepts where appropriate
Some general modernizations of templates Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65148 Reviewed-By: Aviv Keller <me@aviv.sh> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
1 parent 40b1b18 commit 3cfe194

28 files changed

Lines changed: 161 additions & 141 deletions

‎node.gyp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@
254254
'src/node_blob.h',
255255
'src/node_buffer.h',
256256
'src/node_builtins.h',
257+
'src/node_concepts.h',
257258
'src/node_config_file.h',
258259
'src/node_constants.h',
259260
'src/node_context_data.h',

‎src/aliased_buffer-inl.h‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ namespace node {
1212
typedefsize_t AliasedBufferIndex;
1313

1414
template <typename NativeT, typenameV8T>
15+
requires std::is_scalar_v<NativeT>
1516
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
1617
v8::Isolate* isolate, constsize_t count, const AliasedBufferIndex* index)
1718
: isolate_(isolate), count_(count), byte_offset_(0), index_(index) {
@@ -34,6 +35,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3435
}
3536

3637
template <typename NativeT, typenameV8T>
38+
requires std::is_scalar_v<NativeT>
3739
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3840
v8::Isolate* isolate,
3941
constsize_t byte_offset,
@@ -65,6 +67,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6567
}
6668

6769
template <typename NativeT, typenameV8T>
70+
requires std::is_scalar_v<NativeT>
6871
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6972
const AliasedBufferBase& that)
7073
: isolate_(that.isolate_),
@@ -76,13 +79,15 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
7679
}
7780

7881
template <typename NativeT, typenameV8T>
82+
requires std::is_scalar_v<NativeT>
7983
AliasedBufferIndex AliasedBufferBase<NativeT, V8T>::Serialize(
8084
v8::Local<v8::Context> context, v8::SnapshotCreator* creator) {
8185
DCHECK(is_valid());
8286
return creator->AddData(context, GetJSArray());
8387
}
8488

8589
template <typename NativeT, typenameV8T>
90+
requires std::is_scalar_v<NativeT>
8691
inlinevoid AliasedBufferBase<NativeT, V8T>::Deserialize(
8792
v8::Local<v8::Context> context) {
8893
DCHECK_NOT_NULL(index_);
@@ -99,6 +104,7 @@ inline void AliasedBufferBase<NativeT, V8T>::Deserialize(
99104
}
100105

101106
template <typename NativeT, typenameV8T>
107+
requires std::is_scalar_v<NativeT>
102108
AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
103109
AliasedBufferBase<NativeT, V8T>&& that) noexcept {
104110
DCHECK(is_valid());
@@ -116,41 +122,48 @@ AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
116122
}
117123

118124
template <typename NativeT, typenameV8T>
125+
requires std::is_scalar_v<NativeT>
119126
v8::Local<V8T> AliasedBufferBase<NativeT, V8T>::GetJSArray() const {
120127
DCHECK(is_valid());
121128
return js_array_.Get(isolate_);
122129
}
123130

124131
template <typename NativeT, typenameV8T>
132+
requires std::is_scalar_v<NativeT>
125133
void AliasedBufferBase<NativeT, V8T>::Release() {
126134
DCHECK_NULL(index_);
127135
js_array_.Reset();
128136
}
129137

130138
template <typename NativeT, typenameV8T>
139+
requires std::is_scalar_v<NativeT>
131140
inlinevoid AliasedBufferBase<NativeT, V8T>::MakeWeak() {
132141
DCHECK(is_valid());
133142
js_array_.SetWeak();
134143
}
135144

136145
template <typename NativeT, typenameV8T>
146+
requires std::is_scalar_v<NativeT>
137147
v8::Local<v8::ArrayBuffer> AliasedBufferBase<NativeT, V8T>::GetArrayBuffer()
138148
const {
139149
returnGetJSArray()->Buffer();
140150
}
141151

142152
template <typename NativeT, typenameV8T>
153+
requires std::is_scalar_v<NativeT>
143154
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::GetNativeBuffer() const {
144155
DCHECK(is_valid());
145156
return buffer_;
146157
}
147158

148159
template <typename NativeT, typenameV8T>
160+
requires std::is_scalar_v<NativeT>
149161
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::operator*() const {
150162
returnGetNativeBuffer();
151163
}
152164

153165
template <typename NativeT, typenameV8T>
166+
requires std::is_scalar_v<NativeT>
154167
inlinevoid AliasedBufferBase<NativeT, V8T>::SetValue(constsize_t index,
155168
NativeT value) {
156169
DCHECK_LT(index, count_);
@@ -159,6 +172,7 @@ inline void AliasedBufferBase<NativeT, V8T>::SetValue(const size_t index,
159172
}
160173

161174
template <typename NativeT, typenameV8T>
175+
requires std::is_scalar_v<NativeT>
162176
inlineconst NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
163177
constsize_t index) const {
164178
DCHECK(is_valid());
@@ -167,23 +181,27 @@ inline const NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
167181
}
168182

169183
template <typename NativeT, typenameV8T>
184+
requires std::is_scalar_v<NativeT>
170185
typename AliasedBufferBase<NativeT, V8T>::Reference
171186
AliasedBufferBase<NativeT, V8T>::operator[](size_t index) {
172187
DCHECK(is_valid());
173188
returnReference(this, index);
174189
}
175190

176191
template <typename NativeT, typenameV8T>
192+
requires std::is_scalar_v<NativeT>
177193
NativeT AliasedBufferBase<NativeT, V8T>::operator[](size_t index) const {
178194
returnGetValue(index);
179195
}
180196

181197
template <typename NativeT, typenameV8T>
198+
requires std::is_scalar_v<NativeT>
182199
size_t AliasedBufferBase<NativeT, V8T>::Length() const {
183200
return count_;
184201
}
185202

186203
template <typename NativeT, typenameV8T>
204+
requires std::is_scalar_v<NativeT>
187205
void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
188206
DCHECK(is_valid());
189207
DCHECK_GE(new_capacity, count_);
@@ -214,11 +232,13 @@ void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
214232
}
215233

216234
template <typename NativeT, typenameV8T>
235+
requires std::is_scalar_v<NativeT>
217236
inlinebool AliasedBufferBase<NativeT, V8T>::is_valid() const {
218237
return index_ == nullptr && !js_array_.IsEmpty();
219238
}
220239

221240
template <typename NativeT, typenameV8T>
241+
requires std::is_scalar_v<NativeT>
222242
inlinesize_t AliasedBufferBase<NativeT, V8T>::SelfSize() const {
223243
returnsizeof(*this);
224244
}

‎src/aliased_buffer.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ typedef size_t AliasedBufferIndex;
2929
* observed. Any notification APIs will be left as a future exercise.
3030
*/
3131
template <classNativeT, classV8T>
32+
requires std::is_scalar_v<NativeT>
3233
classAliasedBufferBasefinal : public MemoryRetainer {
3334
public:
34-
static_assert(std::is_scalar_v<NativeT>);
35-
3635
AliasedBufferBase(v8::Isolate* isolate,
3736
size_t count,
3837
const AliasedBufferIndex* index = nullptr);

‎src/blob_serializer_deserializer-inl.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ std::string BlobSerializerDeserializer::GetName() const {
9090
// Helper for reading numeric types.
9191
template <typename Impl>
9292
template <typename T>
93+
requires std::is_arithmetic_v<T>
9394
T BlobDeserializer<Impl>::ReadArithmetic() {
94-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
9595
T result;
9696
ReadArithmetic(&result, 1);
9797
return result;
@@ -158,8 +158,8 @@ std::string_view BlobDeserializer<Impl>::ReadStringView(StringLogMode mode) {
158158
// Helper for reading an array of numeric types.
159159
template <typename Impl>
160160
template <typename T>
161+
requires std::is_arithmetic_v<T>
161162
void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
162-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
163163
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
164164
if (is_debug) {
165165
std::string name = GetName<T>();
@@ -180,8 +180,8 @@ void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
180180
// Helper for reading numeric vectors.
181181
template <typename Impl>
182182
template <typename Number>
183+
requires std::is_arithmetic_v<Number>
183184
std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
184-
static_assert(std::is_arithmetic_v<Number>, "Not an arithmetic type");
185185
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
186186
std::vector<Number> result(count);
187187
ReadArithmetic(result.data(), count);
@@ -191,8 +191,8 @@ std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
191191
// Helper for reading non-numeric vectors.
192192
template <typename Impl>
193193
template <typename T>
194+
requires(!std::is_arithmetic_v<T>)
194195
std::vector<T> BlobDeserializer<Impl>::ReadNonArithmeticVector(size_t count) {
195-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
196196
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
197197
std::vector<T> result;
198198
result.reserve(count);
@@ -224,8 +224,8 @@ T BlobDeserializer<Impl>::ReadElement() {
224224
// Helper for writing numeric types.
225225
template <typename Impl>
226226
template <typename T>
227+
requires std::is_arithmetic_v<T>
227228
size_t BlobSerializer<Impl>::WriteArithmetic(const T& data) {
228-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
229229
returnWriteArithmetic(&data, 1);
230230
}
231231

@@ -303,8 +303,8 @@ static size_t kPreviewCount = 16;
303303
// Helper for writing an array of numeric types.
304304
template <typename Impl>
305305
template <typename T>
306+
requires std::is_arithmetic_v<T>
306307
size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
307-
static_assert(std::is_arithmetic_v<T>, "Arithmetic type");
308308
DCHECK_GT(count, 0); // Should not write contents for vectors of size 0.
309309
if (is_debug) {
310310
size_t preview_count = count < kPreviewCount ? count : kPreviewCount;
@@ -338,18 +338,18 @@ size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
338338
// Helper for writing numeric vectors.
339339
template <typename Impl>
340340
template <typename Number>
341+
requires std::is_arithmetic_v<Number>
341342
size_t BlobSerializer<Impl>::WriteArithmeticVector(
342343
const std::vector<Number>& data) {
343-
static_assert(std::is_arithmetic_v<Number>, "Arithmetic type");
344344
returnWriteArithmetic(data.data(), data.size());
345345
}
346346

347347
// Helper for writing non-numeric vectors.
348348
template <typename Impl>
349349
template <typename T>
350-
size_t BlobSerializer<Impl>::WriteNonArithmeticVector(
351-
const std::vector<T>& data) {
352-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
350+
requires(!std::is_arithmetic_v<T>)
351+
size_t
352+
BlobSerializer<Impl>::WriteNonArithmeticVector(conststd::vector<T>& data) {
353353
DCHECK_GT(data.size(),
354354
0); // Should not write contents for vectors of size 0.
355355
size_t written_total = 0;

‎src/blob_serializer_deserializer.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#ifndef SRC_BLOB_SERIALIZER_DESERIALIZER_H_
22
#defineSRC_BLOB_SERIALIZER_DESERIALIZER_H_
33

4+
#include<concepts>
45
#include<string>
6+
#include<type_traits>
57
#include<vector>
68

79
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
@@ -49,6 +51,7 @@ class BlobDeserializer : public BlobSerializerDeserializer {
4951

5052
// Helper for reading numeric types.
5153
template <typename T>
54+
requires std::is_arithmetic_v<T>
5255
T ReadArithmetic();
5356

5457
// Layout of vectors:
@@ -63,15 +66,18 @@ class BlobDeserializer : public BlobSerializerDeserializer {
6366

6467
// Helper for reading an array of numeric types.
6568
template <typename T>
69+
requires std::is_arithmetic_v<T>
6670
voidReadArithmetic(T* out, size_t count);
6771

6872
// Helper for reading numeric vectors.
6973
template <typename Number>
74+
requires std::is_arithmetic_v<Number>
7075
std::vector<Number> ReadArithmeticVector(size_t count);
7176

7277
private:
7378
// Helper for reading non-numeric vectors.
7479
template <typename T>
80+
requires(!std::is_arithmetic_v<T>)
7581
std::vector<T> ReadNonArithmeticVector(size_t count);
7682

7783
template <typename T>
@@ -94,6 +100,7 @@ class BlobSerializer : public BlobSerializerDeserializer {
94100

95101
// Helper for writing numeric types.
96102
template <typename T>
103+
requires std::is_arithmetic_v<T>
97104
size_tWriteArithmetic(const T& data);
98105

99106
// Layout of vectors:
@@ -110,15 +117,18 @@ class BlobSerializer : public BlobSerializerDeserializer {
110117

111118
// Helper for writing an array of numeric types.
112119
template <typename T>
120+
requires std::is_arithmetic_v<T>
113121
size_tWriteArithmetic(const T* data, size_t count);
114122

115123
// Helper for writing numeric vectors.
116124
template <typename Number>
125+
requires std::is_arithmetic_v<Number>
117126
size_tWriteArithmeticVector(const std::vector<Number>& data);
118127

119128
private:
120129
// Helper for writing non-numeric vectors.
121130
template <typename T>
131+
requires(!std::is_arithmetic_v<T>)
122132
size_tWriteNonArithmeticVector(const std::vector<T>& data);
123133

124134
template <typename T>

‎src/crypto/crypto_aes.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ WebCryptoCipherStatus AES_KW_Cipher(Environment* env,
259259
// implementation here:
260260
// https://github.com/chromium/chromium/blob/7af6cfd/components/webcrypto/algorithms/aes_ctr.cc
261261

262-
template <typename T>
262+
template <std::integral T>
263263
T CeilDiv(T a, T b) {
264264
return a == 0 ? 0 : 1 + (a - 1) / b;
265265
}

‎src/crypto/crypto_util.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,8 @@ class ArrayBufferOrViewContents final {
732732
}
733733

734734
template <typename M>
735+
requires(sizeof(M) == 1)
735736
voidCopyTo(M* dest, size_t len) const {
736-
static_assert(sizeof(M) == 1, "sizeof(M) must equal 1");
737737
len = std::min(len, size());
738738
if (len > 0 && data() != nullptr) {
739739
memcpy(dest, data(), len);

‎src/debug_utils-inl.h‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ struct ToStringHelper {
4949
return value.ToStringView();
5050
}
5151

52-
template <typename T,
53-
typename test_for_number = typename std::
54-
enable_if_t<std::is_arithmetic_v<T> || std::is_enum_v<T>, bool>,
55-
typename dummy = bool>
52+
template <NumericOrEnum T>
5653
static std::string Convert(const T& value) {
5754
returnstd::to_string(value);
5855
}
@@ -81,9 +78,7 @@ struct ToStringHelper {
8178
return utf8_value.ToString();
8279
}
8380

84-
template <unsignedBASE_BITS,
85-
typename T,
86-
typename = std::enable_if_t<std::is_integral_v<T>>>
81+
template <unsignedBASE_BITS, std::integral T>
8782
static std::string BaseConvert(const T& value) {
8883
auto v = static_cast<uint64_t>(value);
8984
char ret[3 * sizeof(T)];
@@ -96,9 +91,8 @@ struct ToStringHelper {
9691
} while ((v >>= BASE_BITS) != 0);
9792
return ptr;
9893
}
99-
template <unsignedBASE_BITS,
100-
typename T,
101-
typename = std::enable_if_t<!std::is_integral_v<T>>>
94+
template <unsignedBASE_BITS, typename T>
95+
requires(!std::integral<T>)
10296
staticautoBaseConvert(T&& value) {
10397
returnConvert(std::forward<T>(value));
10498
}

‎src/json_utils.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6+
#include"node_concepts.h"
7+
68
#include<iomanip>
79
#include<limits>
810
#include<ostream>
@@ -132,9 +134,7 @@ class JSONWriter {
132134
};
133135

134136
private:
135-
template <typename T,
136-
typename test_for_number = typename std::
137-
enable_if<std::numeric_limits<T>::is_specialized, bool>::type>
137+
template <NumericValue T>
138138
inlinevoidwrite_value(T number) {
139139
ifconstexpr (std::is_same<T, bool>::value)
140140
out_ << (number ? "true" : "false");

‎src/memory_tracker-inl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void MemoryTracker::TrackField(const char* edge_name,
203203
TrackField(edge_name, container, node_name, element_name);
204204
}
205205

206-
template <typename T, typename test_for_number, typename dummy>
206+
template <NumericValue T>
207207
voidMemoryTracker::TrackField(constchar* edge_name,
208208
const T& value,
209209
constchar* node_name) {

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 3cfe194

Browse files
jasnelladuh95
authored andcommitted
src: use concepts where appropriate
Some general modernizations of templates Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65148 Reviewed-By: Aviv Keller <me@aviv.sh> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
1 parent 40b1b18 commit 3cfe194

28 files changed

Lines changed: 161 additions & 141 deletions

‎node.gyp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@
254254
'src/node_blob.h',
255255
'src/node_buffer.h',
256256
'src/node_builtins.h',
257+
'src/node_concepts.h',
257258
'src/node_config_file.h',
258259
'src/node_constants.h',
259260
'src/node_context_data.h',

‎src/aliased_buffer-inl.h‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ namespace node {
1212
typedefsize_t AliasedBufferIndex;
1313

1414
template <typename NativeT, typenameV8T>
15+
requires std::is_scalar_v<NativeT>
1516
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
1617
v8::Isolate* isolate, constsize_t count, const AliasedBufferIndex* index)
1718
: isolate_(isolate), count_(count), byte_offset_(0), index_(index) {
@@ -34,6 +35,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3435
}
3536

3637
template <typename NativeT, typenameV8T>
38+
requires std::is_scalar_v<NativeT>
3739
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3840
v8::Isolate* isolate,
3941
constsize_t byte_offset,
@@ -65,6 +67,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6567
}
6668

6769
template <typename NativeT, typenameV8T>
70+
requires std::is_scalar_v<NativeT>
6871
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6972
const AliasedBufferBase& that)
7073
: isolate_(that.isolate_),
@@ -76,13 +79,15 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
7679
}
7780

7881
template <typename NativeT, typenameV8T>
82+
requires std::is_scalar_v<NativeT>
7983
AliasedBufferIndex AliasedBufferBase<NativeT, V8T>::Serialize(
8084
v8::Local<v8::Context> context, v8::SnapshotCreator* creator) {
8185
DCHECK(is_valid());
8286
return creator->AddData(context, GetJSArray());
8387
}
8488

8589
template <typename NativeT, typenameV8T>
90+
requires std::is_scalar_v<NativeT>
8691
inlinevoid AliasedBufferBase<NativeT, V8T>::Deserialize(
8792
v8::Local<v8::Context> context) {
8893
DCHECK_NOT_NULL(index_);
@@ -99,6 +104,7 @@ inline void AliasedBufferBase<NativeT, V8T>::Deserialize(
99104
}
100105

101106
template <typename NativeT, typenameV8T>
107+
requires std::is_scalar_v<NativeT>
102108
AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
103109
AliasedBufferBase<NativeT, V8T>&& that) noexcept {
104110
DCHECK(is_valid());
@@ -116,41 +122,48 @@ AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
116122
}
117123

118124
template <typename NativeT, typenameV8T>
125+
requires std::is_scalar_v<NativeT>
119126
v8::Local<V8T> AliasedBufferBase<NativeT, V8T>::GetJSArray() const {
120127
DCHECK(is_valid());
121128
return js_array_.Get(isolate_);
122129
}
123130

124131
template <typename NativeT, typenameV8T>
132+
requires std::is_scalar_v<NativeT>
125133
void AliasedBufferBase<NativeT, V8T>::Release() {
126134
DCHECK_NULL(index_);
127135
js_array_.Reset();
128136
}
129137

130138
template <typename NativeT, typenameV8T>
139+
requires std::is_scalar_v<NativeT>
131140
inlinevoid AliasedBufferBase<NativeT, V8T>::MakeWeak() {
132141
DCHECK(is_valid());
133142
js_array_.SetWeak();
134143
}
135144

136145
template <typename NativeT, typenameV8T>
146+
requires std::is_scalar_v<NativeT>
137147
v8::Local<v8::ArrayBuffer> AliasedBufferBase<NativeT, V8T>::GetArrayBuffer()
138148
const {
139149
returnGetJSArray()->Buffer();
140150
}
141151

142152
template <typename NativeT, typenameV8T>
153+
requires std::is_scalar_v<NativeT>
143154
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::GetNativeBuffer() const {
144155
DCHECK(is_valid());
145156
return buffer_;
146157
}
147158

148159
template <typename NativeT, typenameV8T>
160+
requires std::is_scalar_v<NativeT>
149161
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::operator*() const {
150162
returnGetNativeBuffer();
151163
}
152164

153165
template <typename NativeT, typenameV8T>
166+
requires std::is_scalar_v<NativeT>
154167
inlinevoid AliasedBufferBase<NativeT, V8T>::SetValue(constsize_t index,
155168
NativeT value) {
156169
DCHECK_LT(index, count_);
@@ -159,6 +172,7 @@ inline void AliasedBufferBase<NativeT, V8T>::SetValue(const size_t index,
159172
}
160173

161174
template <typename NativeT, typenameV8T>
175+
requires std::is_scalar_v<NativeT>
162176
inlineconst NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
163177
constsize_t index) const {
164178
DCHECK(is_valid());
@@ -167,23 +181,27 @@ inline const NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
167181
}
168182

169183
template <typename NativeT, typenameV8T>
184+
requires std::is_scalar_v<NativeT>
170185
typename AliasedBufferBase<NativeT, V8T>::Reference
171186
AliasedBufferBase<NativeT, V8T>::operator[](size_t index) {
172187
DCHECK(is_valid());
173188
returnReference(this, index);
174189
}
175190

176191
template <typename NativeT, typenameV8T>
192+
requires std::is_scalar_v<NativeT>
177193
NativeT AliasedBufferBase<NativeT, V8T>::operator[](size_t index) const {
178194
returnGetValue(index);
179195
}
180196

181197
template <typename NativeT, typenameV8T>
198+
requires std::is_scalar_v<NativeT>
182199
size_t AliasedBufferBase<NativeT, V8T>::Length() const {
183200
return count_;
184201
}
185202

186203
template <typename NativeT, typenameV8T>
204+
requires std::is_scalar_v<NativeT>
187205
void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
188206
DCHECK(is_valid());
189207
DCHECK_GE(new_capacity, count_);
@@ -214,11 +232,13 @@ void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
214232
}
215233

216234
template <typename NativeT, typenameV8T>
235+
requires std::is_scalar_v<NativeT>
217236
inlinebool AliasedBufferBase<NativeT, V8T>::is_valid() const {
218237
return index_ == nullptr && !js_array_.IsEmpty();
219238
}
220239

221240
template <typename NativeT, typenameV8T>
241+
requires std::is_scalar_v<NativeT>
222242
inlinesize_t AliasedBufferBase<NativeT, V8T>::SelfSize() const {
223243
returnsizeof(*this);
224244
}

‎src/aliased_buffer.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ typedef size_t AliasedBufferIndex;
2929
* observed. Any notification APIs will be left as a future exercise.
3030
*/
3131
template <classNativeT, classV8T>
32+
requires std::is_scalar_v<NativeT>
3233
classAliasedBufferBasefinal : public MemoryRetainer {
3334
public:
34-
static_assert(std::is_scalar_v<NativeT>);
35-
3635
AliasedBufferBase(v8::Isolate* isolate,
3736
size_t count,
3837
const AliasedBufferIndex* index = nullptr);

‎src/blob_serializer_deserializer-inl.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ std::string BlobSerializerDeserializer::GetName() const {
9090
// Helper for reading numeric types.
9191
template <typename Impl>
9292
template <typename T>
93+
requires std::is_arithmetic_v<T>
9394
T BlobDeserializer<Impl>::ReadArithmetic() {
94-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
9595
T result;
9696
ReadArithmetic(&result, 1);
9797
return result;
@@ -158,8 +158,8 @@ std::string_view BlobDeserializer<Impl>::ReadStringView(StringLogMode mode) {
158158
// Helper for reading an array of numeric types.
159159
template <typename Impl>
160160
template <typename T>
161+
requires std::is_arithmetic_v<T>
161162
void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
162-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
163163
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
164164
if (is_debug) {
165165
std::string name = GetName<T>();
@@ -180,8 +180,8 @@ void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
180180
// Helper for reading numeric vectors.
181181
template <typename Impl>
182182
template <typename Number>
183+
requires std::is_arithmetic_v<Number>
183184
std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
184-
static_assert(std::is_arithmetic_v<Number>, "Not an arithmetic type");
185185
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
186186
std::vector<Number> result(count);
187187
ReadArithmetic(result.data(), count);
@@ -191,8 +191,8 @@ std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
191191
// Helper for reading non-numeric vectors.
192192
template <typename Impl>
193193
template <typename T>
194+
requires(!std::is_arithmetic_v<T>)
194195
std::vector<T> BlobDeserializer<Impl>::ReadNonArithmeticVector(size_t count) {
195-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
196196
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
197197
std::vector<T> result;
198198
result.reserve(count);
@@ -224,8 +224,8 @@ T BlobDeserializer<Impl>::ReadElement() {
224224
// Helper for writing numeric types.
225225
template <typename Impl>
226226
template <typename T>
227+
requires std::is_arithmetic_v<T>
227228
size_t BlobSerializer<Impl>::WriteArithmetic(const T& data) {
228-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
229229
returnWriteArithmetic(&data, 1);
230230
}
231231

@@ -303,8 +303,8 @@ static size_t kPreviewCount = 16;
303303
// Helper for writing an array of numeric types.
304304
template <typename Impl>
305305
template <typename T>
306+
requires std::is_arithmetic_v<T>
306307
size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
307-
static_assert(std::is_arithmetic_v<T>, "Arithmetic type");
308308
DCHECK_GT(count, 0); // Should not write contents for vectors of size 0.
309309
if (is_debug) {
310310
size_t preview_count = count < kPreviewCount ? count : kPreviewCount;
@@ -338,18 +338,18 @@ size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
338338
// Helper for writing numeric vectors.
339339
template <typename Impl>
340340
template <typename Number>
341+
requires std::is_arithmetic_v<Number>
341342
size_t BlobSerializer<Impl>::WriteArithmeticVector(
342343
const std::vector<Number>& data) {
343-
static_assert(std::is_arithmetic_v<Number>, "Arithmetic type");
344344
returnWriteArithmetic(data.data(), data.size());
345345
}
346346

347347
// Helper for writing non-numeric vectors.
348348
template <typename Impl>
349349
template <typename T>
350-
size_t BlobSerializer<Impl>::WriteNonArithmeticVector(
351-
const std::vector<T>& data) {
352-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
350+
requires(!std::is_arithmetic_v<T>)
351+
size_t
352+
BlobSerializer<Impl>::WriteNonArithmeticVector(conststd::vector<T>& data) {
353353
DCHECK_GT(data.size(),
354354
0); // Should not write contents for vectors of size 0.
355355
size_t written_total = 0;

‎src/blob_serializer_deserializer.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#ifndef SRC_BLOB_SERIALIZER_DESERIALIZER_H_
22
#defineSRC_BLOB_SERIALIZER_DESERIALIZER_H_
33

4+
#include<concepts>
45
#include<string>
6+
#include<type_traits>
57
#include<vector>
68

79
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
@@ -49,6 +51,7 @@ class BlobDeserializer : public BlobSerializerDeserializer {
4951

5052
// Helper for reading numeric types.
5153
template <typename T>
54+
requires std::is_arithmetic_v<T>
5255
T ReadArithmetic();
5356

5457
// Layout of vectors:
@@ -63,15 +66,18 @@ class BlobDeserializer : public BlobSerializerDeserializer {
6366

6467
// Helper for reading an array of numeric types.
6568
template <typename T>
69+
requires std::is_arithmetic_v<T>
6670
voidReadArithmetic(T* out, size_t count);
6771

6872
// Helper for reading numeric vectors.
6973
template <typename Number>
74+
requires std::is_arithmetic_v<Number>
7075
std::vector<Number> ReadArithmeticVector(size_t count);
7176

7277
private:
7378
// Helper for reading non-numeric vectors.
7479
template <typename T>
80+
requires(!std::is_arithmetic_v<T>)
7581
std::vector<T> ReadNonArithmeticVector(size_t count);
7682

7783
template <typename T>
@@ -94,6 +100,7 @@ class BlobSerializer : public BlobSerializerDeserializer {
94100

95101
// Helper for writing numeric types.
96102
template <typename T>
103+
requires std::is_arithmetic_v<T>
97104
size_tWriteArithmetic(const T& data);
98105

99106
// Layout of vectors:
@@ -110,15 +117,18 @@ class BlobSerializer : public BlobSerializerDeserializer {
110117

111118
// Helper for writing an array of numeric types.
112119
template <typename T>
120+
requires std::is_arithmetic_v<T>
113121
size_tWriteArithmetic(const T* data, size_t count);
114122

115123
// Helper for writing numeric vectors.
116124
template <typename Number>
125+
requires std::is_arithmetic_v<Number>
117126
size_tWriteArithmeticVector(const std::vector<Number>& data);
118127

119128
private:
120129
// Helper for writing non-numeric vectors.
121130
template <typename T>
131+
requires(!std::is_arithmetic_v<T>)
122132
size_tWriteNonArithmeticVector(const std::vector<T>& data);
123133

124134
template <typename T>

‎src/crypto/crypto_aes.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ WebCryptoCipherStatus AES_KW_Cipher(Environment* env,
259259
// implementation here:
260260
// https://github.com/chromium/chromium/blob/7af6cfd/components/webcrypto/algorithms/aes_ctr.cc
261261

262-
template <typename T>
262+
template <std::integral T>
263263
T CeilDiv(T a, T b) {
264264
return a == 0 ? 0 : 1 + (a - 1) / b;
265265
}

‎src/crypto/crypto_util.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,8 @@ class ArrayBufferOrViewContents final {
732732
}
733733

734734
template <typename M>
735+
requires(sizeof(M) == 1)
735736
voidCopyTo(M* dest, size_t len) const {
736-
static_assert(sizeof(M) == 1, "sizeof(M) must equal 1");
737737
len = std::min(len, size());
738738
if (len > 0 && data() != nullptr) {
739739
memcpy(dest, data(), len);

‎src/debug_utils-inl.h‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ struct ToStringHelper {
4949
return value.ToStringView();
5050
}
5151

52-
template <typename T,
53-
typename test_for_number = typename std::
54-
enable_if_t<std::is_arithmetic_v<T> || std::is_enum_v<T>, bool>,
55-
typename dummy = bool>
52+
template <NumericOrEnum T>
5653
static std::string Convert(const T& value) {
5754
returnstd::to_string(value);
5855
}
@@ -81,9 +78,7 @@ struct ToStringHelper {
8178
return utf8_value.ToString();
8279
}
8380

84-
template <unsignedBASE_BITS,
85-
typename T,
86-
typename = std::enable_if_t<std::is_integral_v<T>>>
81+
template <unsignedBASE_BITS, std::integral T>
8782
static std::string BaseConvert(const T& value) {
8883
auto v = static_cast<uint64_t>(value);
8984
char ret[3 * sizeof(T)];
@@ -96,9 +91,8 @@ struct ToStringHelper {
9691
} while ((v >>= BASE_BITS) != 0);
9792
return ptr;
9893
}
99-
template <unsignedBASE_BITS,
100-
typename T,
101-
typename = std::enable_if_t<!std::is_integral_v<T>>>
94+
template <unsignedBASE_BITS, typename T>
95+
requires(!std::integral<T>)
10296
staticautoBaseConvert(T&& value) {
10397
returnConvert(std::forward<T>(value));
10498
}

‎src/json_utils.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6+
#include"node_concepts.h"
7+
68
#include<iomanip>
79
#include<limits>
810
#include<ostream>
@@ -132,9 +134,7 @@ class JSONWriter {
132134
};
133135

134136
private:
135-
template <typename T,
136-
typename test_for_number = typename std::
137-
enable_if<std::numeric_limits<T>::is_specialized, bool>::type>
137+
template <NumericValue T>
138138
inlinevoidwrite_value(T number) {
139139
ifconstexpr (std::is_same<T, bool>::value)
140140
out_ << (number ? "true" : "false");

‎src/memory_tracker-inl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void MemoryTracker::TrackField(const char* edge_name,
203203
TrackField(edge_name, container, node_name, element_name);
204204
}
205205

206-
template <typename T, typename test_for_number, typename dummy>
206+
template <NumericValue T>
207207
voidMemoryTracker::TrackField(constchar* edge_name,
208208
const T& value,
209209
constchar* node_name) {

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Commit 3cfe194

Browse files
jasnelladuh95
authored andcommitted
src: use concepts where appropriate
Some general modernizations of templates Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65148 Reviewed-By: Aviv Keller <me@aviv.sh> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
1 parent 40b1b18 commit 3cfe194

28 files changed

Lines changed: 161 additions & 141 deletions

‎node.gyp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@
254254
'src/node_blob.h',
255255
'src/node_buffer.h',
256256
'src/node_builtins.h',
257+
'src/node_concepts.h',
257258
'src/node_config_file.h',
258259
'src/node_constants.h',
259260
'src/node_context_data.h',

‎src/aliased_buffer-inl.h‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ namespace node {
1212
typedefsize_t AliasedBufferIndex;
1313

1414
template <typename NativeT, typenameV8T>
15+
requires std::is_scalar_v<NativeT>
1516
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
1617
v8::Isolate* isolate, constsize_t count, const AliasedBufferIndex* index)
1718
: isolate_(isolate), count_(count), byte_offset_(0), index_(index) {
@@ -34,6 +35,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3435
}
3536

3637
template <typename NativeT, typenameV8T>
38+
requires std::is_scalar_v<NativeT>
3739
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3840
v8::Isolate* isolate,
3941
constsize_t byte_offset,
@@ -65,6 +67,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6567
}
6668

6769
template <typename NativeT, typenameV8T>
70+
requires std::is_scalar_v<NativeT>
6871
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6972
const AliasedBufferBase& that)
7073
: isolate_(that.isolate_),
@@ -76,13 +79,15 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
7679
}
7780

7881
template <typename NativeT, typenameV8T>
82+
requires std::is_scalar_v<NativeT>
7983
AliasedBufferIndex AliasedBufferBase<NativeT, V8T>::Serialize(
8084
v8::Local<v8::Context> context, v8::SnapshotCreator* creator) {
8185
DCHECK(is_valid());
8286
return creator->AddData(context, GetJSArray());
8387
}
8488

8589
template <typename NativeT, typenameV8T>
90+
requires std::is_scalar_v<NativeT>
8691
inlinevoid AliasedBufferBase<NativeT, V8T>::Deserialize(
8792
v8::Local<v8::Context> context) {
8893
DCHECK_NOT_NULL(index_);
@@ -99,6 +104,7 @@ inline void AliasedBufferBase<NativeT, V8T>::Deserialize(
99104
}
100105

101106
template <typename NativeT, typenameV8T>
107+
requires std::is_scalar_v<NativeT>
102108
AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
103109
AliasedBufferBase<NativeT, V8T>&& that) noexcept {
104110
DCHECK(is_valid());
@@ -116,41 +122,48 @@ AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
116122
}
117123

118124
template <typename NativeT, typenameV8T>
125+
requires std::is_scalar_v<NativeT>
119126
v8::Local<V8T> AliasedBufferBase<NativeT, V8T>::GetJSArray() const {
120127
DCHECK(is_valid());
121128
return js_array_.Get(isolate_);
122129
}
123130

124131
template <typename NativeT, typenameV8T>
132+
requires std::is_scalar_v<NativeT>
125133
void AliasedBufferBase<NativeT, V8T>::Release() {
126134
DCHECK_NULL(index_);
127135
js_array_.Reset();
128136
}
129137

130138
template <typename NativeT, typenameV8T>
139+
requires std::is_scalar_v<NativeT>
131140
inlinevoid AliasedBufferBase<NativeT, V8T>::MakeWeak() {
132141
DCHECK(is_valid());
133142
js_array_.SetWeak();
134143
}
135144

136145
template <typename NativeT, typenameV8T>
146+
requires std::is_scalar_v<NativeT>
137147
v8::Local<v8::ArrayBuffer> AliasedBufferBase<NativeT, V8T>::GetArrayBuffer()
138148
const {
139149
returnGetJSArray()->Buffer();
140150
}
141151

142152
template <typename NativeT, typenameV8T>
153+
requires std::is_scalar_v<NativeT>
143154
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::GetNativeBuffer() const {
144155
DCHECK(is_valid());
145156
return buffer_;
146157
}
147158

148159
template <typename NativeT, typenameV8T>
160+
requires std::is_scalar_v<NativeT>
149161
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::operator*() const {
150162
returnGetNativeBuffer();
151163
}
152164

153165
template <typename NativeT, typenameV8T>
166+
requires std::is_scalar_v<NativeT>
154167
inlinevoid AliasedBufferBase<NativeT, V8T>::SetValue(constsize_t index,
155168
NativeT value) {
156169
DCHECK_LT(index, count_);
@@ -159,6 +172,7 @@ inline void AliasedBufferBase<NativeT, V8T>::SetValue(const size_t index,
159172
}
160173

161174
template <typename NativeT, typenameV8T>
175+
requires std::is_scalar_v<NativeT>
162176
inlineconst NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
163177
constsize_t index) const {
164178
DCHECK(is_valid());
@@ -167,23 +181,27 @@ inline const NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
167181
}
168182

169183
template <typename NativeT, typenameV8T>
184+
requires std::is_scalar_v<NativeT>
170185
typename AliasedBufferBase<NativeT, V8T>::Reference
171186
AliasedBufferBase<NativeT, V8T>::operator[](size_t index) {
172187
DCHECK(is_valid());
173188
returnReference(this, index);
174189
}
175190

176191
template <typename NativeT, typenameV8T>
192+
requires std::is_scalar_v<NativeT>
177193
NativeT AliasedBufferBase<NativeT, V8T>::operator[](size_t index) const {
178194
returnGetValue(index);
179195
}
180196

181197
template <typename NativeT, typenameV8T>
198+
requires std::is_scalar_v<NativeT>
182199
size_t AliasedBufferBase<NativeT, V8T>::Length() const {
183200
return count_;
184201
}
185202

186203
template <typename NativeT, typenameV8T>
204+
requires std::is_scalar_v<NativeT>
187205
void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
188206
DCHECK(is_valid());
189207
DCHECK_GE(new_capacity, count_);
@@ -214,11 +232,13 @@ void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
214232
}
215233

216234
template <typename NativeT, typenameV8T>
235+
requires std::is_scalar_v<NativeT>
217236
inlinebool AliasedBufferBase<NativeT, V8T>::is_valid() const {
218237
return index_ == nullptr && !js_array_.IsEmpty();
219238
}
220239

221240
template <typename NativeT, typenameV8T>
241+
requires std::is_scalar_v<NativeT>
222242
inlinesize_t AliasedBufferBase<NativeT, V8T>::SelfSize() const {
223243
returnsizeof(*this);
224244
}

‎src/aliased_buffer.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ typedef size_t AliasedBufferIndex;
2929
* observed. Any notification APIs will be left as a future exercise.
3030
*/
3131
template <classNativeT, classV8T>
32+
requires std::is_scalar_v<NativeT>
3233
classAliasedBufferBasefinal : public MemoryRetainer {
3334
public:
34-
static_assert(std::is_scalar_v<NativeT>);
35-
3635
AliasedBufferBase(v8::Isolate* isolate,
3736
size_t count,
3837
const AliasedBufferIndex* index = nullptr);

‎src/blob_serializer_deserializer-inl.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ std::string BlobSerializerDeserializer::GetName() const {
9090
// Helper for reading numeric types.
9191
template <typename Impl>
9292
template <typename T>
93+
requires std::is_arithmetic_v<T>
9394
T BlobDeserializer<Impl>::ReadArithmetic() {
94-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
9595
T result;
9696
ReadArithmetic(&result, 1);
9797
return result;
@@ -158,8 +158,8 @@ std::string_view BlobDeserializer<Impl>::ReadStringView(StringLogMode mode) {
158158
// Helper for reading an array of numeric types.
159159
template <typename Impl>
160160
template <typename T>
161+
requires std::is_arithmetic_v<T>
161162
void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
162-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
163163
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
164164
if (is_debug) {
165165
std::string name = GetName<T>();
@@ -180,8 +180,8 @@ void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
180180
// Helper for reading numeric vectors.
181181
template <typename Impl>
182182
template <typename Number>
183+
requires std::is_arithmetic_v<Number>
183184
std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
184-
static_assert(std::is_arithmetic_v<Number>, "Not an arithmetic type");
185185
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
186186
std::vector<Number> result(count);
187187
ReadArithmetic(result.data(), count);
@@ -191,8 +191,8 @@ std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
191191
// Helper for reading non-numeric vectors.
192192
template <typename Impl>
193193
template <typename T>
194+
requires(!std::is_arithmetic_v<T>)
194195
std::vector<T> BlobDeserializer<Impl>::ReadNonArithmeticVector(size_t count) {
195-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
196196
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
197197
std::vector<T> result;
198198
result.reserve(count);
@@ -224,8 +224,8 @@ T BlobDeserializer<Impl>::ReadElement() {
224224
// Helper for writing numeric types.
225225
template <typename Impl>
226226
template <typename T>
227+
requires std::is_arithmetic_v<T>
227228
size_t BlobSerializer<Impl>::WriteArithmetic(const T& data) {
228-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
229229
returnWriteArithmetic(&data, 1);
230230
}
231231

@@ -303,8 +303,8 @@ static size_t kPreviewCount = 16;
303303
// Helper for writing an array of numeric types.
304304
template <typename Impl>
305305
template <typename T>
306+
requires std::is_arithmetic_v<T>
306307
size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
307-
static_assert(std::is_arithmetic_v<T>, "Arithmetic type");
308308
DCHECK_GT(count, 0); // Should not write contents for vectors of size 0.
309309
if (is_debug) {
310310
size_t preview_count = count < kPreviewCount ? count : kPreviewCount;
@@ -338,18 +338,18 @@ size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
338338
// Helper for writing numeric vectors.
339339
template <typename Impl>
340340
template <typename Number>
341+
requires std::is_arithmetic_v<Number>
341342
size_t BlobSerializer<Impl>::WriteArithmeticVector(
342343
const std::vector<Number>& data) {
343-
static_assert(std::is_arithmetic_v<Number>, "Arithmetic type");
344344
returnWriteArithmetic(data.data(), data.size());
345345
}
346346

347347
// Helper for writing non-numeric vectors.
348348
template <typename Impl>
349349
template <typename T>
350-
size_t BlobSerializer<Impl>::WriteNonArithmeticVector(
351-
const std::vector<T>& data) {
352-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
350+
requires(!std::is_arithmetic_v<T>)
351+
size_t
352+
BlobSerializer<Impl>::WriteNonArithmeticVector(conststd::vector<T>& data) {
353353
DCHECK_GT(data.size(),
354354
0); // Should not write contents for vectors of size 0.
355355
size_t written_total = 0;

‎src/blob_serializer_deserializer.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#ifndef SRC_BLOB_SERIALIZER_DESERIALIZER_H_
22
#defineSRC_BLOB_SERIALIZER_DESERIALIZER_H_
33

4+
#include<concepts>
45
#include<string>
6+
#include<type_traits>
57
#include<vector>
68

79
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
@@ -49,6 +51,7 @@ class BlobDeserializer : public BlobSerializerDeserializer {
4951

5052
// Helper for reading numeric types.
5153
template <typename T>
54+
requires std::is_arithmetic_v<T>
5255
T ReadArithmetic();
5356

5457
// Layout of vectors:
@@ -63,15 +66,18 @@ class BlobDeserializer : public BlobSerializerDeserializer {
6366

6467
// Helper for reading an array of numeric types.
6568
template <typename T>
69+
requires std::is_arithmetic_v<T>
6670
voidReadArithmetic(T* out, size_t count);
6771

6872
// Helper for reading numeric vectors.
6973
template <typename Number>
74+
requires std::is_arithmetic_v<Number>
7075
std::vector<Number> ReadArithmeticVector(size_t count);
7176

7277
private:
7378
// Helper for reading non-numeric vectors.
7479
template <typename T>
80+
requires(!std::is_arithmetic_v<T>)
7581
std::vector<T> ReadNonArithmeticVector(size_t count);
7682

7783
template <typename T>
@@ -94,6 +100,7 @@ class BlobSerializer : public BlobSerializerDeserializer {
94100

95101
// Helper for writing numeric types.
96102
template <typename T>
103+
requires std::is_arithmetic_v<T>
97104
size_tWriteArithmetic(const T& data);
98105

99106
// Layout of vectors:
@@ -110,15 +117,18 @@ class BlobSerializer : public BlobSerializerDeserializer {
110117

111118
// Helper for writing an array of numeric types.
112119
template <typename T>
120+
requires std::is_arithmetic_v<T>
113121
size_tWriteArithmetic(const T* data, size_t count);
114122

115123
// Helper for writing numeric vectors.
116124
template <typename Number>
125+
requires std::is_arithmetic_v<Number>
117126
size_tWriteArithmeticVector(const std::vector<Number>& data);
118127

119128
private:
120129
// Helper for writing non-numeric vectors.
121130
template <typename T>
131+
requires(!std::is_arithmetic_v<T>)
122132
size_tWriteNonArithmeticVector(const std::vector<T>& data);
123133

124134
template <typename T>

‎src/crypto/crypto_aes.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ WebCryptoCipherStatus AES_KW_Cipher(Environment* env,
259259
// implementation here:
260260
// https://github.com/chromium/chromium/blob/7af6cfd/components/webcrypto/algorithms/aes_ctr.cc
261261

262-
template <typename T>
262+
template <std::integral T>
263263
T CeilDiv(T a, T b) {
264264
return a == 0 ? 0 : 1 + (a - 1) / b;
265265
}

‎src/crypto/crypto_util.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,8 @@ class ArrayBufferOrViewContents final {
732732
}
733733

734734
template <typename M>
735+
requires(sizeof(M) == 1)
735736
voidCopyTo(M* dest, size_t len) const {
736-
static_assert(sizeof(M) == 1, "sizeof(M) must equal 1");
737737
len = std::min(len, size());
738738
if (len > 0 && data() != nullptr) {
739739
memcpy(dest, data(), len);

‎src/debug_utils-inl.h‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ struct ToStringHelper {
4949
return value.ToStringView();
5050
}
5151

52-
template <typename T,
53-
typename test_for_number = typename std::
54-
enable_if_t<std::is_arithmetic_v<T> || std::is_enum_v<T>, bool>,
55-
typename dummy = bool>
52+
template <NumericOrEnum T>
5653
static std::string Convert(const T& value) {
5754
returnstd::to_string(value);
5855
}
@@ -81,9 +78,7 @@ struct ToStringHelper {
8178
return utf8_value.ToString();
8279
}
8380

84-
template <unsignedBASE_BITS,
85-
typename T,
86-
typename = std::enable_if_t<std::is_integral_v<T>>>
81+
template <unsignedBASE_BITS, std::integral T>
8782
static std::string BaseConvert(const T& value) {
8883
auto v = static_cast<uint64_t>(value);
8984
char ret[3 * sizeof(T)];
@@ -96,9 +91,8 @@ struct ToStringHelper {
9691
} while ((v >>= BASE_BITS) != 0);
9792
return ptr;
9893
}
99-
template <unsignedBASE_BITS,
100-
typename T,
101-
typename = std::enable_if_t<!std::is_integral_v<T>>>
94+
template <unsignedBASE_BITS, typename T>
95+
requires(!std::integral<T>)
10296
staticautoBaseConvert(T&& value) {
10397
returnConvert(std::forward<T>(value));
10498
}

‎src/json_utils.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6+
#include"node_concepts.h"
7+
68
#include<iomanip>
79
#include<limits>
810
#include<ostream>
@@ -132,9 +134,7 @@ class JSONWriter {
132134
};
133135

134136
private:
135-
template <typename T,
136-
typename test_for_number = typename std::
137-
enable_if<std::numeric_limits<T>::is_specialized, bool>::type>
137+
template <NumericValue T>
138138
inlinevoidwrite_value(T number) {
139139
ifconstexpr (std::is_same<T, bool>::value)
140140
out_ << (number ? "true" : "false");

‎src/memory_tracker-inl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void MemoryTracker::TrackField(const char* edge_name,
203203
TrackField(edge_name, container, node_name, element_name);
204204
}
205205

206-
template <typename T, typename test_for_number, typename dummy>
206+
template <NumericValue T>
207207
voidMemoryTracker::TrackField(constchar* edge_name,
208208
const T& value,
209209
constchar* node_name) {

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Commit 3cfe194

Browse files
jasnelladuh95
authored andcommitted
src: use concepts where appropriate
Some general modernizations of templates Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65148 Reviewed-By: Aviv Keller <me@aviv.sh> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
1 parent 40b1b18 commit 3cfe194

28 files changed

Lines changed: 161 additions & 141 deletions

‎node.gyp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@
254254
'src/node_blob.h',
255255
'src/node_buffer.h',
256256
'src/node_builtins.h',
257+
'src/node_concepts.h',
257258
'src/node_config_file.h',
258259
'src/node_constants.h',
259260
'src/node_context_data.h',

‎src/aliased_buffer-inl.h‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ namespace node {
1212
typedefsize_t AliasedBufferIndex;
1313

1414
template <typename NativeT, typenameV8T>
15+
requires std::is_scalar_v<NativeT>
1516
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
1617
v8::Isolate* isolate, constsize_t count, const AliasedBufferIndex* index)
1718
: isolate_(isolate), count_(count), byte_offset_(0), index_(index) {
@@ -34,6 +35,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3435
}
3536

3637
template <typename NativeT, typenameV8T>
38+
requires std::is_scalar_v<NativeT>
3739
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
3840
v8::Isolate* isolate,
3941
constsize_t byte_offset,
@@ -65,6 +67,7 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6567
}
6668

6769
template <typename NativeT, typenameV8T>
70+
requires std::is_scalar_v<NativeT>
6871
AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
6972
const AliasedBufferBase& that)
7073
: isolate_(that.isolate_),
@@ -76,13 +79,15 @@ AliasedBufferBase<NativeT, V8T>::AliasedBufferBase(
7679
}
7780

7881
template <typename NativeT, typenameV8T>
82+
requires std::is_scalar_v<NativeT>
7983
AliasedBufferIndex AliasedBufferBase<NativeT, V8T>::Serialize(
8084
v8::Local<v8::Context> context, v8::SnapshotCreator* creator) {
8185
DCHECK(is_valid());
8286
return creator->AddData(context, GetJSArray());
8387
}
8488

8589
template <typename NativeT, typenameV8T>
90+
requires std::is_scalar_v<NativeT>
8691
inlinevoid AliasedBufferBase<NativeT, V8T>::Deserialize(
8792
v8::Local<v8::Context> context) {
8893
DCHECK_NOT_NULL(index_);
@@ -99,6 +104,7 @@ inline void AliasedBufferBase<NativeT, V8T>::Deserialize(
99104
}
100105

101106
template <typename NativeT, typenameV8T>
107+
requires std::is_scalar_v<NativeT>
102108
AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
103109
AliasedBufferBase<NativeT, V8T>&& that) noexcept {
104110
DCHECK(is_valid());
@@ -116,41 +122,48 @@ AliasedBufferBase<NativeT, V8T>& AliasedBufferBase<NativeT, V8T>::operator=(
116122
}
117123

118124
template <typename NativeT, typenameV8T>
125+
requires std::is_scalar_v<NativeT>
119126
v8::Local<V8T> AliasedBufferBase<NativeT, V8T>::GetJSArray() const {
120127
DCHECK(is_valid());
121128
return js_array_.Get(isolate_);
122129
}
123130

124131
template <typename NativeT, typenameV8T>
132+
requires std::is_scalar_v<NativeT>
125133
void AliasedBufferBase<NativeT, V8T>::Release() {
126134
DCHECK_NULL(index_);
127135
js_array_.Reset();
128136
}
129137

130138
template <typename NativeT, typenameV8T>
139+
requires std::is_scalar_v<NativeT>
131140
inlinevoid AliasedBufferBase<NativeT, V8T>::MakeWeak() {
132141
DCHECK(is_valid());
133142
js_array_.SetWeak();
134143
}
135144

136145
template <typename NativeT, typenameV8T>
146+
requires std::is_scalar_v<NativeT>
137147
v8::Local<v8::ArrayBuffer> AliasedBufferBase<NativeT, V8T>::GetArrayBuffer()
138148
const {
139149
returnGetJSArray()->Buffer();
140150
}
141151

142152
template <typename NativeT, typenameV8T>
153+
requires std::is_scalar_v<NativeT>
143154
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::GetNativeBuffer() const {
144155
DCHECK(is_valid());
145156
return buffer_;
146157
}
147158

148159
template <typename NativeT, typenameV8T>
160+
requires std::is_scalar_v<NativeT>
149161
inlineconst NativeT* AliasedBufferBase<NativeT, V8T>::operator*() const {
150162
returnGetNativeBuffer();
151163
}
152164

153165
template <typename NativeT, typenameV8T>
166+
requires std::is_scalar_v<NativeT>
154167
inlinevoid AliasedBufferBase<NativeT, V8T>::SetValue(constsize_t index,
155168
NativeT value) {
156169
DCHECK_LT(index, count_);
@@ -159,6 +172,7 @@ inline void AliasedBufferBase<NativeT, V8T>::SetValue(const size_t index,
159172
}
160173

161174
template <typename NativeT, typenameV8T>
175+
requires std::is_scalar_v<NativeT>
162176
inlineconst NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
163177
constsize_t index) const {
164178
DCHECK(is_valid());
@@ -167,23 +181,27 @@ inline const NativeT AliasedBufferBase<NativeT, V8T>::GetValue(
167181
}
168182

169183
template <typename NativeT, typenameV8T>
184+
requires std::is_scalar_v<NativeT>
170185
typename AliasedBufferBase<NativeT, V8T>::Reference
171186
AliasedBufferBase<NativeT, V8T>::operator[](size_t index) {
172187
DCHECK(is_valid());
173188
returnReference(this, index);
174189
}
175190

176191
template <typename NativeT, typenameV8T>
192+
requires std::is_scalar_v<NativeT>
177193
NativeT AliasedBufferBase<NativeT, V8T>::operator[](size_t index) const {
178194
returnGetValue(index);
179195
}
180196

181197
template <typename NativeT, typenameV8T>
198+
requires std::is_scalar_v<NativeT>
182199
size_t AliasedBufferBase<NativeT, V8T>::Length() const {
183200
return count_;
184201
}
185202

186203
template <typename NativeT, typenameV8T>
204+
requires std::is_scalar_v<NativeT>
187205
void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
188206
DCHECK(is_valid());
189207
DCHECK_GE(new_capacity, count_);
@@ -214,11 +232,13 @@ void AliasedBufferBase<NativeT, V8T>::reserve(size_t new_capacity) {
214232
}
215233

216234
template <typename NativeT, typenameV8T>
235+
requires std::is_scalar_v<NativeT>
217236
inlinebool AliasedBufferBase<NativeT, V8T>::is_valid() const {
218237
return index_ == nullptr && !js_array_.IsEmpty();
219238
}
220239

221240
template <typename NativeT, typenameV8T>
241+
requires std::is_scalar_v<NativeT>
222242
inlinesize_t AliasedBufferBase<NativeT, V8T>::SelfSize() const {
223243
returnsizeof(*this);
224244
}

‎src/aliased_buffer.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ typedef size_t AliasedBufferIndex;
2929
* observed. Any notification APIs will be left as a future exercise.
3030
*/
3131
template <classNativeT, classV8T>
32+
requires std::is_scalar_v<NativeT>
3233
classAliasedBufferBasefinal : public MemoryRetainer {
3334
public:
34-
static_assert(std::is_scalar_v<NativeT>);
35-
3635
AliasedBufferBase(v8::Isolate* isolate,
3736
size_t count,
3837
const AliasedBufferIndex* index = nullptr);

‎src/blob_serializer_deserializer-inl.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ std::string BlobSerializerDeserializer::GetName() const {
9090
// Helper for reading numeric types.
9191
template <typename Impl>
9292
template <typename T>
93+
requires std::is_arithmetic_v<T>
9394
T BlobDeserializer<Impl>::ReadArithmetic() {
94-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
9595
T result;
9696
ReadArithmetic(&result, 1);
9797
return result;
@@ -158,8 +158,8 @@ std::string_view BlobDeserializer<Impl>::ReadStringView(StringLogMode mode) {
158158
// Helper for reading an array of numeric types.
159159
template <typename Impl>
160160
template <typename T>
161+
requires std::is_arithmetic_v<T>
161162
void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
162-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
163163
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
164164
if (is_debug) {
165165
std::string name = GetName<T>();
@@ -180,8 +180,8 @@ void BlobDeserializer<Impl>::ReadArithmetic(T* out, size_t count) {
180180
// Helper for reading numeric vectors.
181181
template <typename Impl>
182182
template <typename Number>
183+
requires std::is_arithmetic_v<Number>
183184
std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
184-
static_assert(std::is_arithmetic_v<Number>, "Not an arithmetic type");
185185
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
186186
std::vector<Number> result(count);
187187
ReadArithmetic(result.data(), count);
@@ -191,8 +191,8 @@ std::vector<Number> BlobDeserializer<Impl>::ReadArithmeticVector(size_t count) {
191191
// Helper for reading non-numeric vectors.
192192
template <typename Impl>
193193
template <typename T>
194+
requires(!std::is_arithmetic_v<T>)
194195
std::vector<T> BlobDeserializer<Impl>::ReadNonArithmeticVector(size_t count) {
195-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
196196
DCHECK_GT(count, 0); // Should not read contents for vectors of size 0.
197197
std::vector<T> result;
198198
result.reserve(count);
@@ -224,8 +224,8 @@ T BlobDeserializer<Impl>::ReadElement() {
224224
// Helper for writing numeric types.
225225
template <typename Impl>
226226
template <typename T>
227+
requires std::is_arithmetic_v<T>
227228
size_t BlobSerializer<Impl>::WriteArithmetic(const T& data) {
228-
static_assert(std::is_arithmetic_v<T>, "Not an arithmetic type");
229229
returnWriteArithmetic(&data, 1);
230230
}
231231

@@ -303,8 +303,8 @@ static size_t kPreviewCount = 16;
303303
// Helper for writing an array of numeric types.
304304
template <typename Impl>
305305
template <typename T>
306+
requires std::is_arithmetic_v<T>
306307
size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
307-
static_assert(std::is_arithmetic_v<T>, "Arithmetic type");
308308
DCHECK_GT(count, 0); // Should not write contents for vectors of size 0.
309309
if (is_debug) {
310310
size_t preview_count = count < kPreviewCount ? count : kPreviewCount;
@@ -338,18 +338,18 @@ size_t BlobSerializer<Impl>::WriteArithmetic(const T* data, size_t count) {
338338
// Helper for writing numeric vectors.
339339
template <typename Impl>
340340
template <typename Number>
341+
requires std::is_arithmetic_v<Number>
341342
size_t BlobSerializer<Impl>::WriteArithmeticVector(
342343
const std::vector<Number>& data) {
343-
static_assert(std::is_arithmetic_v<Number>, "Arithmetic type");
344344
returnWriteArithmetic(data.data(), data.size());
345345
}
346346

347347
// Helper for writing non-numeric vectors.
348348
template <typename Impl>
349349
template <typename T>
350-
size_t BlobSerializer<Impl>::WriteNonArithmeticVector(
351-
const std::vector<T>& data) {
352-
static_assert(!std::is_arithmetic_v<T>, "Arithmetic type");
350+
requires(!std::is_arithmetic_v<T>)
351+
size_t
352+
BlobSerializer<Impl>::WriteNonArithmeticVector(conststd::vector<T>& data) {
353353
DCHECK_GT(data.size(),
354354
0); // Should not write contents for vectors of size 0.
355355
size_t written_total = 0;

‎src/blob_serializer_deserializer.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#ifndef SRC_BLOB_SERIALIZER_DESERIALIZER_H_
22
#defineSRC_BLOB_SERIALIZER_DESERIALIZER_H_
33

4+
#include<concepts>
45
#include<string>
6+
#include<type_traits>
57
#include<vector>
68

79
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
@@ -49,6 +51,7 @@ class BlobDeserializer : public BlobSerializerDeserializer {
4951

5052
// Helper for reading numeric types.
5153
template <typename T>
54+
requires std::is_arithmetic_v<T>
5255
T ReadArithmetic();
5356

5457
// Layout of vectors:
@@ -63,15 +66,18 @@ class BlobDeserializer : public BlobSerializerDeserializer {
6366

6467
// Helper for reading an array of numeric types.
6568
template <typename T>
69+
requires std::is_arithmetic_v<T>
6670
voidReadArithmetic(T* out, size_t count);
6771

6872
// Helper for reading numeric vectors.
6973
template <typename Number>
74+
requires std::is_arithmetic_v<Number>
7075
std::vector<Number> ReadArithmeticVector(size_t count);
7176

7277
private:
7378
// Helper for reading non-numeric vectors.
7479
template <typename T>
80+
requires(!std::is_arithmetic_v<T>)
7581
std::vector<T> ReadNonArithmeticVector(size_t count);
7682

7783
template <typename T>
@@ -94,6 +100,7 @@ class BlobSerializer : public BlobSerializerDeserializer {
94100

95101
// Helper for writing numeric types.
96102
template <typename T>
103+
requires std::is_arithmetic_v<T>
97104
size_tWriteArithmetic(const T& data);
98105

99106
// Layout of vectors:
@@ -110,15 +117,18 @@ class BlobSerializer : public BlobSerializerDeserializer {
110117

111118
// Helper for writing an array of numeric types.
112119
template <typename T>
120+
requires std::is_arithmetic_v<T>
113121
size_tWriteArithmetic(const T* data, size_t count);
114122

115123
// Helper for writing numeric vectors.
116124
template <typename Number>
125+
requires std::is_arithmetic_v<Number>
117126
size_tWriteArithmeticVector(const std::vector<Number>& data);
118127

119128
private:
120129
// Helper for writing non-numeric vectors.
121130
template <typename T>
131+
requires(!std::is_arithmetic_v<T>)
122132
size_tWriteNonArithmeticVector(const std::vector<T>& data);
123133

124134
template <typename T>

‎src/crypto/crypto_aes.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ WebCryptoCipherStatus AES_KW_Cipher(Environment* env,
259259
// implementation here:
260260
// https://github.com/chromium/chromium/blob/7af6cfd/components/webcrypto/algorithms/aes_ctr.cc
261261

262-
template <typename T>
262+
template <std::integral T>
263263
T CeilDiv(T a, T b) {
264264
return a == 0 ? 0 : 1 + (a - 1) / b;
265265
}

‎src/crypto/crypto_util.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,8 @@ class ArrayBufferOrViewContents final {
732732
}
733733

734734
template <typename M>
735+
requires(sizeof(M) == 1)
735736
voidCopyTo(M* dest, size_t len) const {
736-
static_assert(sizeof(M) == 1, "sizeof(M) must equal 1");
737737
len = std::min(len, size());
738738
if (len > 0 && data() != nullptr) {
739739
memcpy(dest, data(), len);

‎src/debug_utils-inl.h‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ struct ToStringHelper {
4949
return value.ToStringView();
5050
}
5151

52-
template <typename T,
53-
typename test_for_number = typename std::
54-
enable_if_t<std::is_arithmetic_v<T> || std::is_enum_v<T>, bool>,
55-
typename dummy = bool>
52+
template <NumericOrEnum T>
5653
static std::string Convert(const T& value) {
5754
returnstd::to_string(value);
5855
}
@@ -81,9 +78,7 @@ struct ToStringHelper {
8178
return utf8_value.ToString();
8279
}
8380

84-
template <unsignedBASE_BITS,
85-
typename T,
86-
typename = std::enable_if_t<std::is_integral_v<T>>>
81+
template <unsignedBASE_BITS, std::integral T>
8782
static std::string BaseConvert(const T& value) {
8883
auto v = static_cast<uint64_t>(value);
8984
char ret[3 * sizeof(T)];
@@ -96,9 +91,8 @@ struct ToStringHelper {
9691
} while ((v >>= BASE_BITS) != 0);
9792
return ptr;
9893
}
99-
template <unsignedBASE_BITS,
100-
typename T,
101-
typename = std::enable_if_t<!std::is_integral_v<T>>>
94+
template <unsignedBASE_BITS, typename T>
95+
requires(!std::integral<T>)
10296
staticautoBaseConvert(T&& value) {
10397
returnConvert(std::forward<T>(value));
10498
}

‎src/json_utils.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6+
#include"node_concepts.h"
7+
68
#include<iomanip>
79
#include<limits>
810
#include<ostream>
@@ -132,9 +134,7 @@ class JSONWriter {
132134
};
133135

134136
private:
135-
template <typename T,
136-
typename test_for_number = typename std::
137-
enable_if<std::numeric_limits<T>::is_specialized, bool>::type>
137+
template <NumericValue T>
138138
inlinevoidwrite_value(T number) {
139139
ifconstexpr (std::is_same<T, bool>::value)
140140
out_ << (number ? "true" : "false");

‎src/memory_tracker-inl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void MemoryTracker::TrackField(const char* edge_name,
203203
TrackField(edge_name, container, node_name, element_name);
204204
}
205205

206-
template <typename T, typename test_for_number, typename dummy>
206+
template <NumericValue T>
207207
voidMemoryTracker::TrackField(constchar* edge_name,
208208
const T& value,
209209
constchar* node_name) {

0 commit comments

Comments
 (0)