diff options
Diffstat (limited to 'helix-core')
| -rw-r--r-- | helix-core/src/commands.rs | 2 | ||||
| -rw-r--r-- | helix-core/src/transaction.rs | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/helix-core/src/commands.rs b/helix-core/src/commands.rs index 3bebd7b4..8dc817da 100644 --- a/helix-core/src/commands.rs +++ b/helix-core/src/commands.rs @@ -155,7 +155,7 @@ pub fn open_below(state: &mut State, _count: usize) { 0, ); - let transaction = Transaction::change(state, changes.collect()).with_selection(selection); + let transaction = Transaction::change(state, changes).with_selection(selection); transaction.apply(state); // TODO: need to store into history if successful diff --git a/helix-core/src/transaction.rs b/helix-core/src/transaction.rs index 12ed523e..4ecc575a 100644 --- a/helix-core/src/transaction.rs +++ b/helix-core/src/transaction.rs @@ -353,8 +353,10 @@ impl Transaction { } /// Generate a transaction from a set of changes. - // TODO: take an owned iter instead of Vec - pub fn change(state: &State, changes: Vec<Change>) -> Self { + pub fn change<I>(state: &State, changes: I) -> Self + where + I: IntoIterator<Item = Change> + ExactSizeIterator, + { let len = state.doc.len_chars(); let mut acc = Vec::with_capacity(2 * changes.len() + 1); @@ -381,7 +383,7 @@ impl Transaction { where F: Fn(&SelectionRange) -> Change, { - Self::change(state, state.selection.ranges.iter().map(f).collect()) + Self::change(state, state.selection.ranges.iter().map(f)) } /// Insert text at each selection head. |