nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run rustfmt on the new changes.

Browse Source
This commit is contained in:
Chris Emerson 2017-10-19 23:32:27 +01:00
parent f9bcb58eb3
commit 2a84352d1d
1 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/rustfmt_diff.rs
View File

@ -165,52 +165,72 @@ where
#[cfg(test)]
mod test {
use super::{make_diff,Mismatch};
use super::{make_diff, Mismatch};
use super::DiffLine::*;
#[test]
fn diff_simple() {
let src = "one\ntwo\nthree\nfour\nfive\n";
let dest= "one\ntwo\ntrois\nfour\nfive\n";
let dest = "one\ntwo\ntrois\nfour\nfive\n";
let diff = make_diff(src, dest, 1);
assert_eq!(diff, vec![Mismatch { line_number: 2,
lines: vec![
Context("two".into()),
Resulting("three".into()),
Expected("trois".into()),
Context("four".into()),
] }]);
assert_eq!(
diff,
vec![
Mismatch {
line_number: 2,
lines: vec![
Context("two".into()),
Resulting("three".into()),
Expected("trois".into()),
Context("four".into()),
],
},
]
);
}
#[test]
fn diff_simple2() {
let src = "one\ntwo\nthree\nfour\nfive\nsix\nseven\n";
let dest= "one\ntwo\ntrois\nfour\ncinq\nsix\nseven\n";
let dest = "one\ntwo\ntrois\nfour\ncinq\nsix\nseven\n";
let diff = make_diff(src, dest, 1);
assert_eq!(diff, vec![Mismatch { line_number: 2,
lines: vec![
Context("two".into()),
Resulting("three".into()),
Expected("trois".into()),
Context("four".into()),
] },
Mismatch { line_number: 5,
lines: vec![
Resulting("five".into()),
Expected("cinq".into()),
Context("six".into()),
] }]);
assert_eq!(
diff,
vec![
Mismatch {
line_number: 2,
lines: vec![
Context("two".into()),
Resulting("three".into()),
Expected("trois".into()),
Context("four".into()),
],
},
Mismatch {
line_number: 5,
lines: vec![
Resulting("five".into()),
Expected("cinq".into()),
Context("six".into()),
],
},
]
);
}
#[test]
fn diff_zerocontext() {
let src = "one\ntwo\nthree\nfour\nfive\n";
let dest= "one\ntwo\ntrois\nfour\nfive\n";
let dest = "one\ntwo\ntrois\nfour\nfive\n";
let diff = make_diff(src, dest, 0);
assert_eq!(diff, vec![Mismatch { line_number: 3,
lines: vec![
Resulting("three".into()),
Expected("trois".into()),
] }]);
assert_eq!(
diff,
vec![
Mismatch {
line_number: 3,
lines: vec![Resulting("three".into()), Expected("trois".into())],
},
]
);
}
}
}