Skip to content

Commit 890fbbc

Browse files
bavulapatijviotti
andauthored
style(clang-tidy): fix bugprone-unchecked-optional-access (#1762)
Signed-off-by: Balakrishna Avulapati <ba@bavulapati.com> Co-authored-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent 7945712 commit 890fbbc

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/core/jsonschema/frame.cc

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,11 @@ auto find_anchors(const sourcemeta::core::JSON &schema,
7676
const sourcemeta::core::URI identifier(schema.at("$id").to_string());
7777
if (identifier.is_fragment_only()) {
7878
result.insert(
79-
{sourcemeta::core::JSON::String{identifier.fragment().value()},
79+
{sourcemeta::core::JSON::String{
80+
identifier.fragment()
81+
.value()}, // NOLINT(bugprone-unchecked-optional-access):
82+
// Check for optional is happening
83+
// inside is_fragment_only()
8084
AnchorType::Static});
8185
}
8286
}
@@ -91,7 +95,11 @@ auto find_anchors(const sourcemeta::core::JSON &schema,
9195
const sourcemeta::core::URI identifier(schema.at("id").to_string());
9296
if (identifier.is_fragment_only()) {
9397
result.insert(
94-
{sourcemeta::core::JSON::String{identifier.fragment().value()},
98+
{sourcemeta::core::JSON::String{
99+
identifier.fragment()
100+
.value()}, // NOLINT(bugprone-unchecked-optional-access):
101+
// Check for optional is happening
102+
// inside is_fragment_only()
95103
AnchorType::Static});
96104
}
97105
}

src/core/jsonschema/walker.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ auto walk(const std::optional<sourcemeta::core::Pointer> &parent,
4747
const auto current_base_dialect{
4848
is_schema_resource
4949
? sourcemeta::core::base_dialect(subschema, resolver, current_dialect)
50-
.value()
50+
.value_or(base_dialect)
5151
: base_dialect};
5252

5353
const auto vocabularies{sourcemeta::core::vocabularies(

0 commit comments

Comments
 (0)