Skip to content
Merged
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 35 additions & 19 deletions src/strings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,28 @@ use std::str;

pub fn unescape(v: &mut Vec<u8>) {
let mut r = 0;
let mut sz = v.len();

while r < sz {
if v[r] == b'\\' && r + 1 < sz && ispunct(v[r + 1]) {
v.remove(r);
sz -= 1;
}
if r >= sz {
break;
let mut prev = None;
let mut found = 0;

while r < v.len() {
if v[r] == b'\\' && r + 1 < v.len() && ispunct(v[r + 1]) {
if let Some(prev) = prev {
let window = &mut v[(prev + 1 - found)..r];
shift_buf_left(window, found);
}
prev = Some(r);
found += 1;
}
r += 1;
}

if let Some(prev) = prev {
let window = &mut v[(prev + 1 - found)..r];
shift_buf_left(window, found);
}

let new_size = v.len() - found;
v.truncate(new_size);
}

pub fn clean_autolink(url: &[u8], kind: AutolinkType) -> Vec<u8> {
Expand Down Expand Up @@ -131,19 +141,16 @@ pub fn chop_trailing_hashtags(line: &mut Vec<u8>) {
}

pub fn rtrim(line: &mut Vec<u8>) {
let mut len = line.len();
while len > 0 && isspace(line[len - 1]) {
line.pop();
len -= 1;
}
let spaces = line.iter().rev().take_while(|&&b| isspace(b)).count();
let new_len = line.len() - spaces;
line.truncate(new_len);
}

pub fn ltrim(line: &mut Vec<u8>) {
let mut len = line.len();
while len > 0 && isspace(line[0]) {
line.remove(0);
len -= 1;
}
let spaces = line.iter().take_while(|&&b| isspace(b)).count();
shift_buf_left(line, spaces);
let new_len = line.len() - spaces;
line.truncate(new_len);
}

pub fn trim(line: &mut Vec<u8>) {
Expand All @@ -170,6 +177,15 @@ pub fn trim_slice(mut i: &[u8]) -> &[u8] {
i
}

fn shift_buf_left(buf: &mut [u8], n: usize) {
assert!(n <= buf.len());
let keep = buf.len() - n;
unsafe {
let p = buf.as_mut_ptr();
p.copy_from(p.offset(n as isize), keep);
}
}

pub fn clean_url(url: &[u8]) -> Vec<u8> {
let url = trim_slice(url);

Expand Down