Skip to content

make pretty source comparison check be fatal (fixes #52255) #52256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/test/pretty/cast-lt.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#[prelude_import]
use std::prelude::v1::*;
#[macro_use]
extern crate std as std;
extern crate std;
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand All @@ -21,4 +21,3 @@
macro_rules! negative(( $ e : expr ) => { $ e < 0 });

fn main() { (1 as i32) < 0; }

1 change: 0 additions & 1 deletion src/test/pretty/cast-lt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,3 @@ macro_rules! negative {
fn main() {
negative!(1 as i32);
}

2 changes: 1 addition & 1 deletion src/test/pretty/issue-4264.pp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#[prelude_import]
use std::prelude::v1::*;
#[macro_use]
extern crate std as std;
extern crate std;
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
Expand Down
7 changes: 3 additions & 4 deletions src/tools/compiletest/src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -519,9 +519,8 @@ impl<'test> TestCx<'test> {

fn compare_source(&self, expected: &str, actual: &str) {
if expected != actual {
self.error("pretty-printed source does not match expected source");
println!(
"\n\
self.fatal(&format!(
"pretty-printed source does not match expected source\n\
expected:\n\
------------------------------------------\n\
{}\n\
Expand All @@ -531,7 +530,7 @@ impl<'test> TestCx<'test> {
{}\n\
------------------------------------------\n\
\n",
expected, actual
expected, actual)
);
}
}
Expand Down