---

nikomatsakis · nikomatsakis · commit bdc63d0d7d9a · 2015-08-12T17:58:58.000-04:00
yaml --- r: 227327 b: refs/heads/auto c: c106dd4 h: refs/heads/master i: 227325: 1485770 227323: 6d24cc4 227319: 2503756 227311: fd9357c 227295: a60447f 227263: 04c50bb 227199: 1623721 227071: 321ba2b 226815: 18c79ac 226303: e42edea 225279: 130246f v: v3
diff --git a/[refs] b/[refs]
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 157422a0c7990234cc196793c41bea6302bbe488
+refs/heads/auto: c106dd449ce9b8e0230a832810a9598274de27e3
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1
diff --git a/branches/auto/src/librustc/middle/traits/error_reporting.rs b/branches/auto/src/librustc/middle/traits/error_reporting.rs
@@ -206,13 +206,10 @@ pub fn report_selection_error<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
                             // error message, report with that message if it does
                             let custom_note = report_on_unimplemented(infcx, &trait_ref.0,
                                                                       obligation.cause.span);
-                            if is_warning {
-                                note_obligation_cause(infcx, obligation);
-                            } else if let Some(s) = custom_note {
+                            if let Some(s) = custom_note {
                                 infcx.tcx.sess.span_note(obligation.cause.span, &s);
-                            } else {
-                                note_obligation_cause(infcx, obligation);
                             }
+                            note_obligation_cause(infcx, obligation);
                         }
                     }
 

Original file line number	Diff line number	Diff line change
`@@ -206,13 +206,10 @@ pub fn report_selection_error<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,`
`206`	`206`	`// error message, report with that message if it does`
`207`	`207`	`let custom_note = report_on_unimplemented(infcx, &trait_ref.0,`
`208`	`208`	`obligation.cause.span);`
`209`		`- if is_warning {`
`210`		`- note_obligation_cause(infcx, obligation);`
`211`		`- } else if let Some(s) = custom_note {`
	`209`	`+ if let Some(s) = custom_note {`
`212`	`210`	`infcx.tcx.sess.span_note(obligation.cause.span, &s);`
`213`		`- } else {`
`214`		`- note_obligation_cause(infcx, obligation);`
`215`	`211`	`}`
	`212`	`+ note_obligation_cause(infcx, obligation);`
`216`	`213`	`}`
`217`	`214`	`}`
`218`	`215`