Skip to content

Commit ddd13fa

Browse files
authored
Upgrade Sourcemeta dependencies (#922)
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent c369ed6 commit ddd13fa

157 files changed

Lines changed: 2671 additions & 779 deletions

File tree

Some content is hidden

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

DEPENDENCIES

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
2-
core https://github.com/sourcemeta/core 1b3ab73db3f0a4dfe0e1ee1e59601a81bfe100fe
3-
blaze https://github.com/sourcemeta/blaze 04832d45bf4327d4ec874fa67f339797cd49b375
2+
core https://github.com/sourcemeta/core 428cbdf92f6330b0f6ae918ac0a9dce089a0470b
3+
blaze https://github.com/sourcemeta/blaze 90c9d98ebeb0c13bd1d75fd3b0e0fb89770cc53d
44
bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

src/runtime/encoder_any.cc

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ auto Encoder::LARGE_CHOICE_INDEX(const sourcemeta::core::JSON &document,
3131
const struct LARGE_CHOICE_INDEX &options)
3232
-> void {
3333
assert(options.choices.size() > 0);
34-
const auto iterator{
35-
std::ranges::find_if(options.choices, [&document](const auto &choice) {
36-
return choice == document;
37-
})};
34+
const auto iterator{std::ranges::find_if(
35+
options.choices,
36+
[&document](const auto &choice) -> bool { return choice == document; })};
3837
assert(iterator != std::cend(options.choices));
3938
const auto cursor{std::distance(std::cbegin(options.choices), iterator)};
4039
assert(sourcemeta::core::is_within(cursor, static_cast<std::uint64_t>(0),
@@ -47,10 +46,9 @@ auto Encoder::TOP_LEVEL_BYTE_CHOICE_INDEX(
4746
const struct TOP_LEVEL_BYTE_CHOICE_INDEX &options) -> void {
4847
assert(options.choices.size() > 0);
4948
assert(sourcemeta::core::is_byte(options.choices.size()));
50-
const auto iterator{
51-
std::ranges::find_if(options.choices, [&document](auto const &choice) {
52-
return choice == document;
53-
})};
49+
const auto iterator{std::ranges::find_if(
50+
options.choices,
51+
[&document](auto const &choice) -> bool { return choice == document; })};
5452
assert(iterator != std::cend(options.choices));
5553
const auto cursor{std::distance(std::cbegin(options.choices), iterator)};
5654
assert(sourcemeta::core::is_within(

src/runtime/loader_v1_array.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ auto FIXED_TYPED_ARRAY(const sourcemeta::core::JSON &options) -> Encoding {
2929
std::transform(prefix_encodings.as_array().cbegin(),
3030
prefix_encodings.as_array().cend(),
3131
std::back_inserter(encodings),
32-
[](const auto &element) { return load(element); });
32+
[](const auto &element) -> Encoding { return load(element); });
3333
assert(encodings.size() == prefix_encodings.size());
3434
return sourcemeta::jsonbinpack::FIXED_TYPED_ARRAY{
3535
.size = static_cast<std::uint64_t>(size.to_integer()),
@@ -57,7 +57,7 @@ auto BOUNDED_8BITS_TYPED_ARRAY(const sourcemeta::core::JSON &options)
5757
std::transform(prefix_encodings.as_array().cbegin(),
5858
prefix_encodings.as_array().cend(),
5959
std::back_inserter(encodings),
60-
[](const auto &element) { return load(element); });
60+
[](const auto &element) -> Encoding { return load(element); });
6161
assert(encodings.size() == prefix_encodings.size());
6262
return sourcemeta::jsonbinpack::BOUNDED_8BITS_TYPED_ARRAY{
6363
.minimum = static_cast<std::uint64_t>(minimum.to_integer()),
@@ -81,7 +81,7 @@ auto FLOOR_TYPED_ARRAY(const sourcemeta::core::JSON &options) -> Encoding {
8181
std::transform(prefix_encodings.as_array().cbegin(),
8282
prefix_encodings.as_array().cend(),
8383
std::back_inserter(encodings),
84-
[](const auto &element) { return load(element); });
84+
[](const auto &element) -> Encoding { return load(element); });
8585
assert(encodings.size() == prefix_encodings.size());
8686
return sourcemeta::jsonbinpack::FLOOR_TYPED_ARRAY{
8787
.minimum = static_cast<std::uint64_t>(minimum.to_integer()),
@@ -104,7 +104,7 @@ auto ROOF_TYPED_ARRAY(const sourcemeta::core::JSON &options) -> Encoding {
104104
std::transform(prefix_encodings.as_array().cbegin(),
105105
prefix_encodings.as_array().cend(),
106106
std::back_inserter(encodings),
107-
[](const auto &element) { return load(element); });
107+
[](const auto &element) -> Encoding { return load(element); });
108108
assert(encodings.size() == prefix_encodings.size());
109109
return sourcemeta::jsonbinpack::ROOF_TYPED_ARRAY{
110110
.maximum = static_cast<std::uint64_t>(maximum.to_integer()),

vendor/blaze/DEPENDENCIES

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/blaze/schemas/canonical-2019-09.json

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/blaze/schemas/canonical-2020-12.json

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/blaze/schemas/canonical-draft1.json

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/blaze/schemas/canonical-draft2.json

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)