diff options
author | Andreas Kling <kling@serenityos.org> | 2021-11-15 01:46:51 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-11-17 00:21:10 +0100 |
commit | 587f9af960daa9f003ec9e41751cdc4ce50b87dd (patch) | |
tree | 41bc5b51741dffcc23e3e4b63d4c17a37e2e03d7 /Userland/Applications/SpaceAnalyzer | |
parent | 304c03f457e294a3d756860325d93b809f50f7a6 (diff) | |
download | serenity-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/Applications/SpaceAnalyzer')
-rw-r--r-- | Userland/Applications/SpaceAnalyzer/main.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Userland/Applications/SpaceAnalyzer/main.cpp b/Userland/Applications/SpaceAnalyzer/main.cpp index 31b5fc1264..ec41f9d4a5 100644 --- a/Userland/Applications/SpaceAnalyzer/main.cpp +++ b/Userland/Applications/SpaceAnalyzer/main.cpp @@ -84,10 +84,9 @@ static void fill_mounts(Vector<MountInfo>& output) } auto content = file->read_all(); - auto json = JsonValue::from_string(content); - VERIFY(json.has_value()); + auto json = JsonValue::from_string(content).release_value_but_fixme_should_propagate_errors(); - json.value().as_array().for_each([&output](auto& value) { + json.as_array().for_each([&output](auto& value) { auto& filesystem_object = value.as_object(); MountInfo mount_info; mount_info.mount_point = filesystem_object.get("mount_point").to_string(); |