RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-30 12:37:49 +00:00
Code Issues Activity

paste: Store delimiters as chars, rather than strings

Browse source
This commit is contained in:
Zachary Dremann 2022-01-30 22:06:33 -05:00
parent fa44957a63
commit c6ec4f8f17
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/uu/paste/src/paste.rs
View file

@ -88,10 +88,7 @@ fn paste(filenames: Vec<String>, serial: bool, delimiters: &str) -> UResult<()>
files.push(file); files.push(file);
} }
let delimiters: Vec<String> = unescape(delimiters) let delimiters: Vec<char> = unescape(delimiters).chars().collect();
.chars()
.map(|x| x.to_string())
.collect();
let mut delim_count = 0; let mut delim_count = 0;
if serial { if serial {
@ -103,7 +100,7 @@ fn paste(filenames: Vec<String>, serial: bool, delimiters: &str) -> UResult<()>
Ok(0) => break, Ok(0) => break,
Ok(_) => { Ok(_) => {
output.push_str(line.trim_end()); output.push_str(line.trim_end());
output.push_str(&delimiters[delim_count % delimiters.len()]); output.push(delimiters[delim_count % delimiters.len()]);
} }
Err(e) => return Err(e.map_err_context(String::new)), Err(e) => return Err(e.map_err_context(String::new)),
} }
@ -131,7 +128,7 @@ fn paste(filenames: Vec<String>, serial: bool, delimiters: &str) -> UResult<()>
Err(e) => return Err(e.map_err_context(String::new)), Err(e) => return Err(e.map_err_context(String::new)),
} }
} }
output.push_str(&delimiters[delim_count % delimiters.len()]); output.push(delimiters[delim_count % delimiters.len()]);
delim_count += 1; delim_count += 1;
} }
if files.len() == eof_count { if files.len() == eof_count {