---

yaml
---
r: 233388
b: refs/heads/beta
c: c106dd4
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 157422a0c7990234cc196793c41bea6302bbe488
+refs/heads/beta: c106dd449ce9b8e0230a832810a9598274de27e3
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/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);
                         }
                     }