about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/librustc/traits/select.rs2
-rw-r--r--src/librustc/ty/mod.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc/traits/select.rs b/src/librustc/traits/select.rs
index 61bb53dd334..de1c71a1ba3 100644
--- a/src/librustc/traits/select.rs
+++ b/src/librustc/traits/select.rs
@@ -1326,7 +1326,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
         (result, dep_node)
     }
 
-    // Treat negative impls as unimplemented, and reservation impls as Ok(None)
+    // Treat negative impls as unimplemented, and reservation impls as ambiguity.
     fn filter_negative_and_reservation_impls(
         &self,
         candidate: SelectionCandidate<'tcx>,
diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs
index b546a245346..6a9d7eb0750 100644
--- a/src/librustc/ty/mod.rs
+++ b/src/librustc/ty/mod.rs
@@ -2931,7 +2931,7 @@ impl<'tcx> TyCtxt<'tcx> {
             }
             (ImplPolarity::Positive, ImplPolarity::Negative) |
             (ImplPolarity::Negative, ImplPolarity::Positive) => {
-                // FIXME: when can this happen?
+                // `impl AutoTrait for Type` + `impl !AutoTrait for Type`
                 debug!("impls_are_allowed_to_overlap({:?}, {:?}) - None (differing polarities)",
                        def_id1, def_id2);
                 return None;