Skip to content

Commit 8d9e274

Browse files
Always use the error helper function
1 parent 535a2ac commit 8d9e274

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

include/rfl/cbor/Reader.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@ class Reader {
106106
rfl::Result<InputArrayType> to_array(
107107
const InputVarType& _var) const noexcept {
108108
if (!_var.val_->is_array()) {
109-
return Unexpected(Error("Could not cast to an array."));
109+
return error("Could not cast to an array.");
110110
}
111111
return InputArrayType{_var.val_};
112112
}
113113

114114
rfl::Result<InputObjectType> to_object(
115115
const InputVarType& _var) const noexcept {
116116
if (!_var.val_->is_object()) {
117-
return Unexpected(Error("Could not cast to an object."));
117+
return error("Could not cast to an object.");
118118
}
119119
return InputObjectType{_var.val_};
120120
}

include/rfl/parsing/FieldVariantParser.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct FieldVariantParser {
4343
&_r, &field_variant);
4444
auto err = _r.read_object(reader, _obj);
4545
if (err) {
46-
return rfl::Unexpected(*err);
46+
return error(*err);
4747
}
4848
if (!field_variant) {
4949
return error(

include/rfl/parsing/MapParser.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ struct MapParser {
6868
if constexpr (schemaful::IsSchemafulReader<R>) {
6969
const auto err = _r.read_map(map_reader, _obj_or_map);
7070
if (err) {
71-
return Unexpected(*err);
71+
return error(*err);
7272
}
7373
} else {
7474
const auto err = _r.read_object(map_reader, _obj_or_map);
7575
if (err) {
76-
return Unexpected(*err);
76+
return error(*err);
7777
}
7878
}
7979
if (errors.size() != 0) {

include/rfl/parsing/NamedTupleParser.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ struct NamedTupleParser {
9292
Parser<R, W, ViewType, ProcessorsType>::read_view(_r, _var, &view);
9393
if (err) [[unlikely]] {
9494
call_destructors_where_necessary(set, &view);
95-
return rfl::Unexpected(*err);
95+
return error(*err);
9696
}
9797
auto res = Result<NamedTuple<FieldTypes...>>(std::move(*ptr));
9898
call_destructors_where_necessary(set, &view);

include/rfl/parsing/Parser_array.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ struct Parser<R, W, std::array<T, _size>, ProcessorsType> {
4040
auto err = _r.read_array(array_reader, _arr);
4141
if (err) {
4242
call_destructors_on_array_where_necessary(array_reader.num_set(), ptr);
43-
return rfl::Unexpected(*err);
43+
return error(*err);
4444
}
4545
err = array_reader.check_size();
4646
if (err) {
4747
call_destructors_on_array_where_necessary(array_reader.num_set(), ptr);
48-
return rfl::Unexpected(*err);
48+
return error(*err);
4949
}
5050
auto result = Result<std::array<T, _size>>(std::move(*ptr));
5151
call_destructors_on_array_where_necessary(array_reader.num_set(), ptr);

include/rfl/parsing/Parser_default.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ struct Parser {
298298
Parser<R, W, ViewType, ProcessorsType>::read_view_with_default(_r, _var,
299299
&view);
300300
if (err) [[unlikely]] {
301-
return rfl::Unexpected(*err);
301+
return error(*err);
302302
}
303303
return t;
304304
}

include/rfl/parsing/TupleParser.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ struct TupleParser {
5555
if (err) {
5656
call_destructors_on_tuple_where_necessary(tuple_reader.num_set(),
5757
ptr);
58-
return Unexpected(*err);
58+
return error(*err);
5959
}
6060
err = tuple_reader.handle_missing_fields();
6161
if (err) {
6262
call_destructors_on_tuple_where_necessary(tuple_reader.num_set(),
6363
ptr);
64-
return Unexpected(*err);
64+
return error(*err);
6565
}
6666
auto res = Result<TupleType>(std::move(*ptr));
6767
call_destructors_on_tuple_where_necessary(tuple_reader.num_set(), ptr);

include/rfl/parsing/VectorParser.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ struct VectorParser {
5757
VectorReader<R, W, VecType, ProcessorsType>(&_r, &vec);
5858
const auto err = _r.read_array(vector_reader, _arr);
5959
if (err) {
60-
return rfl::Unexpected(*err);
60+
return error(*err);
6161
}
6262
return vec;
6363
};

0 commit comments

Comments
 (0)