RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:57:35 +00:00
Code Issues Activity Actions

LibCore+Everywhere: Make Core::Stream read_line() return StringView

Browse source 
Similar reasoning to making Core::Stream::read() return Bytes, except
that every user of read_line() creates a StringView from the result, so
let's just return one right away.
This commit is contained in:
Sam Atkins 2022-04-15 14:52:33 +01:00 • committed by Tim Flynn
parent c4134e9794
commit d564cf1e89
9 changed files with 40 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Meta/Lagom/Tools/CodeGenerators/LibTimeZone/GenerateTimeZoneData.cpp
View file

@ -316,8 +316,7 @@ static ErrorOr<void> parse_time_zones(StringView time_zone_path, TimeZoneData& t
Vector<TimeZoneOffset>* last_parsed_zone = nullptr;
while (TRY(file->can_read_line())) {
auto nread = TRY(file->read_line(buffer));
StringView line { buffer.data(), nread };
auto line = TRY(file->read_line(buffer));
if (line.is_empty() || line.trim_whitespace(TrimMode::Left).starts_with('#'))
continue;
@ -374,8 +373,7 @@ static ErrorOr<void> parse_time_zone_coordinates(Core::Stream::BufferedFile& fil
Array<u8, 1024> buffer {};
while (TRY(file.can_read_line())) {
auto nread = TRY(file.read_line(buffer));
StringView line { buffer.data(), nread };
auto line = TRY(file.read_line(buffer));
if (line.is_empty() || line.trim_whitespace(TrimMode::Left).starts_with('#'))
continue;

24
Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp
View file

@ -197,8 +197,7 @@ static ErrorOr<void> parse_special_casing(Core::Stream::BufferedFile& file, Unic
Array<u8, 1024> buffer;
while (TRY(file.can_read_line())) {
auto nread = TRY(file.read_line(buffer));
StringView line { buffer.data(), nread };
auto line = TRY(file.read_line(buffer));
if (line.is_empty() || line.starts_with('#'))
continue;
@ -264,8 +263,7 @@ static ErrorOr<void> parse_prop_list(Core::Stream::BufferedFile& file, PropList&
Array<u8, 1024> buffer;
while (TRY(file.can_read_line())) {
auto nread = TRY(file.read_line(buffer));
StringView line { buffer.data(), nread };
auto line = TRY(file.read_line(buffer));
if (line.is_empty() || line.starts_with('#'))
continue;
@ -311,8 +309,7 @@ static ErrorOr<void> parse_alias_list(Core::Stream::BufferedFile& file, PropList
};
while (TRY(file.can_read_line())) {
auto nread = TRY(file.read_line(buffer));
StringView line { buffer.data(), nread };
auto line = TRY(file.read_line(buffer));
if (line.is_empty() || line.starts_with('#')) {
if (line.ends_with("Properties"sv))
@ -345,8 +342,7 @@ static ErrorOr<void> parse_name_aliases(Core::Stream::BufferedFile& file, Unicod
Array<u8, 1024> buffer;
while (TRY(file.can_read_line())) {
auto nread = TRY(file.read_line(buffer));
StringView line { buffer.data(), nread };
auto line = TRY(file.read_line(buffer));
if (line.is_empty() || line.starts_with('#'))
continue;
@ -387,8 +383,7 @@ static ErrorOr<void> parse_value_alias_list(Core::Stream::BufferedFile& file, St
};
while (TRY(file.can_read_line())) {
auto nread = TRY(file.read_line(buffer));
StringView line { buffer.data(), nread };
auto line = TRY(file.read_line(buffer));
if (line.is_empty() || line.starts_with('#'))
continue;
@ -421,8 +416,7 @@ static ErrorOr<void> parse_normalization_props(Core::Stream::BufferedFile& file,
Array<u8, 1024> buffer;
while (TRY(file.can_read_line())) {
auto nread = TRY(file.read_line(buffer));
StringView line { buffer.data(), nread };
auto line = TRY(file.read_line(buffer));
if (line.is_empty() || line.starts_with('#'))
continue;
@ -518,8 +512,7 @@ static ErrorOr<void> parse_block_display_names(Core::Stream::BufferedFile& file,
{
Array<u8, 1024> buffer;
while (TRY(file.can_read_line())) {
auto nread = TRY(file.read_line(buffer));
StringView line { buffer.data(), nread };
auto line = TRY(file.read_line(buffer));
if (line.is_empty() || line.starts_with('#'))
continue;
@ -547,8 +540,7 @@ static ErrorOr<void> parse_unicode_data(Core::Stream::BufferedFile& file, Unicod
Array<u8, 1024> buffer;
while (TRY(file.can_read_line())) {
auto nread = TRY(file.read_line(buffer));
StringView line { buffer.data(), nread };
auto line = TRY(file.read_line(buffer));
if (line.is_empty())
continue;