---

yaml
---
r: 232389
b: refs/heads/try
c: c106dd4
h: refs/heads/master
i:
  232387: 101ddcc
v: v3

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 157422a0c7990234cc196793c41bea6302bbe488
+refs/heads/try: c106dd449ce9b8e0230a832810a9598274de27e3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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