mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unicode test to use original error format

Browse Source
This commit is contained in:
jonathandturner 2016-04-30 09:06:01 -07:00 committed by Niko Matsakis
parent 64e0819fc2
commit f359aa2762
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/test/run-make/unicode-input/span_length.rs
View File

@ -65,8 +65,8 @@ fn main() {
let err = String::from_utf8_lossy(&result.stderr);
// the span should end the line (e.g no extra ^'s)
let expected_span = format!("^{}\n", repeat("^").take(n - 1)
// the span should end the line (e.g no extra ~'s)
let expected_span = format!("^{}\n", repeat("~").take(n - 1)
.collect::<String>());
assert!(err.contains(&expected_span));
}
@ -91,19 +91,17 @@ fn main() {
// Test both the length of the snake and the leading spaces up to it
// First snake is 9 ^s long.
let expected_1 = r#"
1 |> extern "路濫狼á́́" fn foo() {} extern "路濫狼á́" fn bar() {}
|> ^^^^^^^^^
"#;
assert!(err.contains(&expected_1));
// Second snake is only 8 ^s long, because rustc counts chars()
// now rather than width(). This is because width() functions are
// to be removed from librustc_unicode
let expected_2 = r#"
1 |> extern "路濫狼á́́" fn foo() {} extern "路濫狼á́" fn bar() {}
|> ^^^^^^^^
"#;
assert!(err.contains(&expected_2));
// First snake is 8 ~s long, with 7 preceding spaces (excluding file name/line offset)
let expected_span = format!("\n{}^{}\n",
repeat(" ").take(offset + 7).collect::<String>(),
repeat("~").take(8).collect::<String>());
assert!(err.contains(&expected_span));
// Second snake is only 7 ~s long, with 36 preceding spaces,
// because rustc counts chars() now rather than width(). This
// is because width() functions are to be removed from
// librustc_unicode
let expected_span = format!("\n{}^{}\n",
repeat(" ").take(offset + 36).collect::<String>(),
repeat("~").take(7).collect::<String>());
assert!(err.contains(&expected_span));
}