caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-19 11:35:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Switch to borrowed strings in split_lines

Browse Source
This commit is contained in:
Laurenz 2021-10-29 16:32:17 +02:00
parent 1af194f383
commit 4645d1a517
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/parse/resolve.rs
View File

@ -94,13 +94,11 @@ fn trim_and_split_raw(column: usize, mut raw: &str) -> (String, bool) {
// Dedent based on column, but not for the first line. // Dedent based on column, but not for the first line.
for line in lines.iter_mut().skip(1) { for line in lines.iter_mut().skip(1) {
let offset = line.chars().take(column).take_while(|c| c.is_whitespace()).count(); let offset = line.chars().take(column).take_while(|c| c.is_whitespace()).count();
if offset > 0 { *line = &line[offset ..];
line.drain(.. offset);
}
} }
let had_newline = lines.len() > 1; let had_newline = lines.len() > 1;
let is_whitespace = |line: &String| line.chars().all(char::is_whitespace); let is_whitespace = |line: &&str| line.chars().all(char::is_whitespace);
// Trims a sequence of whitespace followed by a newline at the start. // Trims a sequence of whitespace followed by a newline at the start.
if lines.first().map_or(false, is_whitespace) { if lines.first().map_or(false, is_whitespace) {
@ -117,23 +115,25 @@ fn trim_and_split_raw(column: usize, mut raw: &str) -> (String, bool) {
/// Split a string into a vector of lines /// Split a string into a vector of lines
/// (respecting Unicode, Unix, Mac and Windows line breaks). /// (respecting Unicode, Unix, Mac and Windows line breaks).
fn split_lines(text: &str) -> Vec<String> { fn split_lines(text: &str) -> Vec<&str> {
let mut s = Scanner::new(text); let mut s = Scanner::new(text);
let mut line = String::new();
let mut lines = Vec::new(); let mut lines = Vec::new();
let mut start = 0;
let mut end = 0;
while let Some(c) = s.eat() { while let Some(c) = s.eat() {
if is_newline(c) { if is_newline(c) {
if c == '\r' { if c == '\r' {
s.eat_if('\n'); s.eat_if('\n');
} }
lines.push(std::mem::take(&mut line));
} else { lines.push(&text[start .. end]);
line.push(c); start = s.index();
} }
end = s.index();
} }
lines.push(line); lines.push(&text[start ..]);
lines lines
} }