about summary refs log tree commit diff
path: root/src/libsyntax/errors/snippet
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2016-04-27 10:45:35 -0400
committerNiko Matsakis <niko@alum.mit.edu>2016-05-02 11:49:25 -0400
commit790043b44e0c078c0f80b16cd03d1aeac6ef242b (patch)
tree5275136385667c670d6d1afc71a875524e4f1f32 /src/libsyntax/errors/snippet
parent8a9ad72c1d67261049aac1d067529da48adcc644 (diff)
downloadrust-790043b44e0c078c0f80b16cd03d1aeac6ef242b.tar.gz
rust-790043b44e0c078c0f80b16cd03d1aeac6ef242b.zip
fix snippet tests MORE!
Diffstat (limited to 'src/libsyntax/errors/snippet')
-rw-r--r--src/libsyntax/errors/snippet/test.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/errors/snippet/test.rs b/src/libsyntax/errors/snippet/test.rs
index 286a3e3d407..56c891daa12 100644
--- a/src/libsyntax/errors/snippet/test.rs
+++ b/src/libsyntax/errors/snippet/test.rs
@@ -404,7 +404,7 @@ impl SomeTrait for () {
     let text: String = make_string(&lines);
     println!("r#\"\n{}\"", text);
     assert_eq!(text, &r#"
->>>>>> foo.rs
+>>>> foo.rs
 3 |>     fn foo(x: u32) {
   |>     -
 "#[1..]);