summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibKeyboard
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2021-11-15 01:46:51 +0100
committerAndreas Kling <kling@serenityos.org>2021-11-17 00:21:10 +0100
commit587f9af960daa9f003ec9e41751cdc4ce50b87dd (patch)
tree41bc5b51741dffcc23e3e4b63d4c17a37e2e03d7 /Userland/Libraries/LibKeyboard
parent304c03f457e294a3d756860325d93b809f50f7a6 (diff)
downloadserenity-587f9af960daa9f003ec9e41751cdc4ce50b87dd.zip
AK: Make JSON parser return ErrorOr<JsonValue> (instead of Optional)
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.
Diffstat (limited to 'Userland/Libraries/LibKeyboard')
-rw-r--r--Userland/Libraries/LibKeyboard/CharacterMapFile.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp b/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp
index b36693c008..88f2df9b41 100644
--- a/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp
+++ b/Userland/Libraries/LibKeyboard/CharacterMapFile.cpp
@@ -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 {};
}