bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix test

Browse source
This commit is contained in:
Esteban Küber 2019-09-05 15:29:31 -07:00
parent afcf9b262d
commit dc613c6d05
1 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/test/ui-fulldeps/pprust-expr-roundtrip.rs
View file

@ -32,13 +32,15 @@ use syntax::print::pprust;
use syntax::ptr::P; use syntax::ptr::P;
fn parse_expr(ps: &ParseSess, src: &str) -> P<Expr> { fn parse_expr(ps: &ParseSess, src: &str) -> Option<P<Expr>> {
let src_as_string = src.to_string(); let src_as_string = src.to_string();
let mut p = parse::new_parser_from_source_str(ps, let mut p = parse::new_parser_from_source_str(
FileName::Custom(src_as_string.clone()), ps,
src_as_string); FileName::Custom(src_as_string.clone()),
p.parse_expr().unwrap() src_as_string,
);
p.parse_expr().map_err(|mut e| e.cancel()).ok()
} }
@ -209,22 +211,23 @@ fn run() {
let printed = pprust::expr_to_string(&e); let printed = pprust::expr_to_string(&e);
println!("printed: {}", printed); println!("printed: {}", printed);
let mut parsed = parse_expr(&ps, &printed); // Ignore expressions with chained comparisons that fail to parse
if let Some(mut parsed) = parse_expr(&ps, &printed) {
// We want to know if `parsed` is structurally identical to `e`, ignoring trivial // We want to know if `parsed` is structurally identical to `e`, ignoring trivial
// differences like placement of `Paren`s or the exact ranges of node spans. // differences like placement of `Paren`s or the exact ranges of node spans.
// Unfortunately, there is no easy way to make this comparison. Instead, we add `Paren`s // Unfortunately, there is no easy way to make this comparison. Instead, we add `Paren`s
// everywhere we can, then pretty-print. This should give an unambiguous representation of // everywhere we can, then pretty-print. This should give an unambiguous representation
// each `Expr`, and it bypasses nearly all of the parenthesization logic, so we aren't // of each `Expr`, and it bypasses nearly all of the parenthesization logic, so we
// relying on the correctness of the very thing we're testing. // aren't relying on the correctness of the very thing we're testing.
RemoveParens.visit_expr(&mut e); RemoveParens.visit_expr(&mut e);
AddParens.visit_expr(&mut e); AddParens.visit_expr(&mut e);
let text1 = pprust::expr_to_string(&e); let text1 = pprust::expr_to_string(&e);
RemoveParens.visit_expr(&mut parsed); RemoveParens.visit_expr(&mut parsed);
AddParens.visit_expr(&mut parsed); AddParens.visit_expr(&mut parsed);
let text2 = pprust::expr_to_string(&parsed); let text2 = pprust::expr_to_string(&parsed);
assert!(text1 == text2, assert!(text1 == text2,
"exprs are not equal:\n e = {:?}\n parsed = {:?}", "exprs are not equal:\n e = {:?}\n parsed = {:?}",
text1, text2); text1, text2);
}
}); });
} }