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/DevTools/Profiler/Profile.cpp | |
| 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/DevTools/Profiler/Profile.cpp')
| -rw-r--r-- | Userland/DevTools/Profiler/Profile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Userland/DevTools/Profiler/Profile.cpp b/Userland/DevTools/Profiler/Profile.cpp index 194a9a9d4a..5166773352 100644 --- a/Userland/DevTools/Profiler/Profile.cpp +++ b/Userland/DevTools/Profiler/Profile.cpp @@ -220,7 +220,7 @@ ErrorOr<NonnullOwnPtr<Profile>> Profile::load_from_perfcore_file(StringView path auto file = TRY(Core::File::open(path, Core::OpenMode::ReadOnly)); auto json = JsonValue::from_string(file->read_all()); - if (!json.has_value() || !json.value().is_object()) + if (json.is_error() || !json.value().is_object()) return Error::from_string_literal("Invalid perfcore format (not a JSON object)"sv); auto& object = json.value().as_object(); |