nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-21 03:14:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement conversion to unix newlines

Browse Source
This commit is contained in:
Ruben Schmidmeister 2019-05-09 17:22:16 +02:00
parent 703a2eab19
commit f54fc2f2fc
No known key found for this signature in database
GPG Key ID: 29387B5A7AAF863F
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/formatting/newline_style.rs
View File

@ -11,11 +11,9 @@ pub(crate) fn apply_newline_style(
formatted_text: &mut String,
raw_input_text: &str,
) {
match effective_newline_style(newline_style, raw_input_text) {
EffectiveNewlineStyle::Windows => {
*formatted_text = convert_to_windows_newlines(formatted_text);
}
EffectiveNewlineStyle::Unix => {}
*formatted_text = match effective_newline_style(newline_style, raw_input_text) {
EffectiveNewlineStyle::Windows => convert_to_windows_newlines(formatted_text),
EffectiveNewlineStyle::Unix => convert_to_unix_newlines(formatted_text),
}
}
@ -39,6 +37,8 @@ fn effective_newline_style(
const LINE_FEED: char = '\n';
const CARRIAGE_RETURN: char = '\r';
const WINDOWS_NEWLINE: &str = "\r\n";
const UNIX_NEWLINE: &str = "\n";
fn auto_detect_newline_style(raw_input_text: &str) -> EffectiveNewlineStyle {
let first_line_feed_pos = raw_input_text.chars().position(|ch| ch == LINE_FEED);
@ -66,7 +66,6 @@ fn native_newline_style() -> EffectiveNewlineStyle {
fn convert_to_windows_newlines(formatted_text: &String) -> String {
let mut transformed = String::with_capacity(2 * formatted_text.capacity());
for c in formatted_text.chars() {
const WINDOWS_NEWLINE: &str = "\r\n";
match c {
LINE_FEED => transformed.push_str(WINDOWS_NEWLINE),
c => transformed.push(c),
@ -75,6 +74,10 @@ fn convert_to_windows_newlines(formatted_text: &String) -> String {
transformed
}
fn convert_to_unix_newlines(formatted_text: &String) -> String {
formatted_text.replace(WINDOWS_NEWLINE, UNIX_NEWLINE)
}
#[cfg(test)]
mod tests {
use super::*;
@ -157,6 +160,17 @@ mod tests {
}
}
#[test]
fn applies_unix_newlines() {
let formatted_text = "One\r\nTwo\nThree";
let raw_input_text = formatted_text;
let mut out = String::from(formatted_text);
apply_newline_style(NewlineStyle::Unix, &mut out, raw_input_text);
assert_eq!("One\nTwo\nThree", &out);
}
#[test]
fn preserves_standalone_carriage_returns_when_applying_windows_newlines() {
let formatted_text = "One\nTwo\nThree\rDrei";