diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/grid/mod.rs | 12 | ||||
| -rw-r--r-- | src/grid/storage.rs | 18 |
2 files changed, 12 insertions, 18 deletions
diff --git a/src/grid/mod.rs b/src/grid/mod.rs index 87ac3d05..803f1e6e 100644 --- a/src/grid/mod.rs +++ b/src/grid/mod.rs @@ -118,17 +118,7 @@ pub enum Scroll { impl<T: Copy + Clone> Grid<T> { pub fn new(lines: index::Line, cols: index::Column, scrollback: usize, template: T) -> Grid<T> { - let mut raw = Storage::with_capacity(*lines + scrollback, lines); - - // Allocate all lines in the buffer, including scrollback history - // - // TODO (jwilm) Allocating each line at this point is expensive and - // delays startup. A nice solution might be having `Row` delay - // allocation until it's actually used. - for _ in 0..raw.len() { - raw.push(Row::new(cols, &template)); - } - + let raw = Storage::with_capacity(*lines + scrollback, lines, Row::new(cols, &template)); Grid { raw, cols, diff --git a/src/grid/storage.rs b/src/grid/storage.rs index a50e8076..1f71b5b5 100644 --- a/src/grid/storage.rs +++ b/src/grid/storage.rs @@ -67,9 +67,18 @@ impl<T: PartialEq> ::std::cmp::PartialEq for Storage<T> { impl<T> Storage<T> { #[inline] - pub fn with_capacity(cap: usize, lines: Line) -> Storage<T> { + pub fn with_capacity(cap: usize, lines: Line, template: T) -> Storage<T> + where + T: Clone, + { + // Allocate all lines in the buffer, including scrollback history + // + // TODO (jwilm) Allocating each line at this point is expensive and + // delays startup. A nice solution might be having `Row` delay + // allocation until it's actually used. + let inner = vec![template; cap]; Storage { - inner: Vec::with_capacity(cap), + inner, zero: 0, visible_lines: lines - 1, len: cap, @@ -121,11 +130,6 @@ impl<T> Storage<T> { } #[inline] - pub fn push(&mut self, item: T) { - self.inner.push(item) - } - - #[inline] pub fn len(&self) -> usize { self.len } |