mirror/ helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix synced 2024-05-17 14:56:05 +02:00
Code Issues

Avoid collect() by accepting iterators into Transaction::change.

This commit is contained in:
Blaž Hrastnik 2020-09-13 23:12:14 +09:00
parent 2027f69eae
commit 0427acd18c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helix-core/src/commands.rs
View File

@ -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

8
helix-core/src/transaction.rs
View File

@ -353,8 +353,10 @@ pub fn with_selection(mut self, selection: Selection) -> Self {
}
/// 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 @@ pub fn change_by_selection<F>(state: &State, f: F) -> Self
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.