RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:28:12 +00:00
Code Issues Activity Actions

AK: Make JSON parser return ErrorOr<JsonValue> (instead of Optional)

Browse source 
Also add slightly richer parse errors now that we can include a string
literal with returned errors.

This will allow us to use TRY() when working with JSON data.
This commit is contained in:
Andreas Kling 2021-11-15 01:46:51 +01:00
parent 304c03f457
commit 587f9af960
54 changed files with 172 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibKeyboard/CharacterMapFile.cpp
View file

@ -31,7 +31,7 @@ Optional<CharacterMapData> CharacterMapFile::load_from_file(const String& filena
auto file_contents = file->read_all();
auto json_result = JsonValue::from_string(file_contents);
if (!json_result.has_value()) {
if (json_result.is_error()) {
dbgln("Failed to load character map from file {}", path);
return {};
}