Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 22:14:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

screen: rename size() to len()

Browse source
This commit is contained in:
Johannes Altmanninger 2023-12-03 10:28:12 +01:00
parent fadf0f2e5b
commit f7b5ebc79f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fish-rust/src/screen.rs
View file

@ -78,7 +78,7 @@ impl Line {
} }
/// \return the number of characters. /// \return the number of characters.
pub fn size(&self) -> usize { pub fn len(&self) -> usize {
self.text.len() self.text.len()
} }
@ -944,7 +944,7 @@ impl Screen {
// Skip over skip_remaining width worth of characters. // Skip over skip_remaining width worth of characters.
let mut j = 0; let mut j = 0;
while j < o_line(&zelf, i).size() { while j < o_line(&zelf, i).len() {
let width = let width =
usize::try_from(fish_wcwidth_visible(o_line(&zelf, i).char_at(j))).unwrap(); usize::try_from(fish_wcwidth_visible(o_line(&zelf, i).char_at(j))).unwrap();
if skip_remaining < width { if skip_remaining < width {
@ -956,7 +956,7 @@ impl Screen {
} }
// Skip over zero-width characters (e.g. combining marks at the end of the prompt). // Skip over zero-width characters (e.g. combining marks at the end of the prompt).
while j < o_line(&zelf, i).size() { while j < o_line(&zelf, i).len() {
let width = fish_wcwidth_visible(o_line(&zelf, i).char_at(j)); let width = fish_wcwidth_visible(o_line(&zelf, i).char_at(j));
if width > 0 { if width > 0 {
break; break;
@ -966,7 +966,7 @@ impl Screen {
// Now actually output stuff. // Now actually output stuff.
loop { loop {
let done = j >= o_line(&zelf, i).size(); let done = j >= o_line(&zelf, i).len();
// Clear the screen if we have not done so yet. // Clear the screen if we have not done so yet.
// If we are about to output into the last column, clear the screen first. If we clear // If we are about to output into the last column, clear the screen first. If we clear
// the screen after we output into the last column, it can erase the last character due // the screen after we output into the last column, it can erase the last character due
@ -1617,7 +1617,7 @@ fn calc_prompt_lines(prompt: &wstr) -> usize {
/// in the prefix. /// in the prefix.
fn line_shared_prefix(a: &Line, b: &Line) -> usize { fn line_shared_prefix(a: &Line, b: &Line) -> usize {
let mut idx = 0; let mut idx = 0;
let max = std::cmp::min(a.size(), b.size()); let max = std::cmp::min(a.len(), b.len());
while idx < max { while idx < max {
let ac = a.char_at(idx); let ac = a.char_at(idx);
let bc = b.char_at(idx); let bc = b.char_at(idx);