Auto merge of #30339 - Manishearth:oops-i-did-it-again, r=eddyb

bors · bors · commit 33378f09fdd4 · 2015-12-13T13:34:46.000Z
r? @eddyb
diff --git a/src/librustc/middle/infer/error_reporting.rs b/src/librustc/middle/infer/error_reporting.rs
@@ -521,7 +521,6 @@ impl<'a, 'tcx> ErrorReporting<'tcx> for InferCtxt<'a, 'tcx> {
                 }
             },
             TypeError::Traits(ref exp_found) => {
-                self.tcx.sess.note("errrr0");
                 report_path_match(exp_found.expected, exp_found.found);
             },
             _ => () // FIXME(#22750) handle traits and stuff

Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,6 @@ impl<'a, 'tcx> ErrorReporting<'tcx> for InferCtxt<'a, 'tcx> {`
`521`	`521`	`}`
`522`	`522`	`},`
`523`	`523`	`TypeError::Traits(ref exp_found) => {`
`524`		`- self.tcx.sess.note("errrr0");`
`525`	`524`	`report_path_match(exp_found.expected, exp_found.found);`
`526`	`525`	`},`
`527`	`526`	`_ => () // FIXME(#22750) handle traits and stuff`