system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-15 04:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kernel+LibVT: Use MUST + try_prepend / try_append

Browse source 
In preparation for making Vector::append + Vector::prepend
unavailable during compilation of the Kernel.

This specific file is compiled into the Kernel as well as LibVT.
This commit is contained in:
Brian Gianforcaro 2022-01-03 03:27:29 -08:00 committed by Andreas Kling
parent 6c66311ade
commit 538986c991
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibVT/Line.cpp
View file

@ -74,7 +74,7 @@ void Line::push_cells_into_next_line(size_t new_length, Line* next_line, bool cu
}
}
next_line->m_cells.prepend(m_cells.span().slice_from_end(cells_to_push_into_next_line).data(), cells_to_push_into_next_line);
MUST(next_line->m_cells.try_prepend(m_cells.span().slice_from_end(cells_to_push_into_next_line).data(), cells_to_push_into_next_line));
m_cells.remove(m_cells.size() - cells_to_push_into_next_line, cells_to_push_into_next_line);
if (m_terminated_at.has_value())
m_terminated_at = m_terminated_at.value() - cells_to_push_into_next_line;
@ -110,7 +110,7 @@ void Line::take_cells_from_next_line(size_t new_length, Line* next_line, bool cu
cursor->column -= cells_to_grab_from_next_line;
}
}
m_cells.append(next_line->m_cells.data(), cells_to_grab_from_next_line);
MUST(m_cells.try_append(next_line->m_cells.data(), cells_to_grab_from_next_line));
next_line->m_cells.remove(0, cells_to_grab_from_next_line);
}