Some cleanup.

Author: ibabushkin

src/semcheck/traverse.rs

@@ -910,6 +910,8 @@ fn match_inherent_impl<'a, 'tcx>(changes: &mut ChangeSet<'tcx>,
             return false;
         }
 
+        // at this point we have an impl match, so the return value is always `true`.
+
         if !register_errors {
             // checking backwards, impls match.
             return true;

src/semcheck/typeck.rs

@@ -255,9 +255,7 @@ impl<'a, 'gcx, 'tcx> TypeComparisonContext<'a, 'gcx, 'tcx> {
                     pred: err,
                 };
 
-                changes.add_change(err_type,
-                                   orig_def_id,
-                                   Some(tcx.def_span(orig_def_id)));
+                changes.add_change(err_type, orig_def_id, None);
             }
         }
 
@@ -275,9 +273,7 @@ impl<'a, 'gcx, 'tcx> TypeComparisonContext<'a, 'gcx, 'tcx> {
                     pred: err,
                 };
 
-                changes.add_change(err_type,
-                                   orig_def_id,
-                                   Some(tcx.def_span(orig_def_id)));
+                changes.add_change(err_type, orig_def_id, None);
             }
         }
     }

tests/cases/bounds/stdout

@@ -7,13 +7,7 @@ warning: breaking changes in `Abc`
 3 | | }
   | |_^
   |
-warning: added bound: `A: std::clone::Clone` (breaking)
- --> $REPO_PATH/tests/cases/bounds/old.rs:1:1
-  |
-1 | / pub struct Abc<A> {
-2 | |     pub a: A,
-3 | | }
-  | |_^
+  = warning: added bound: `A: std::clone::Clone` (breaking)
 
 warning: technically breaking changes in `Def`
  --> $REPO_PATH/tests/cases/bounds/new.rs:5:1
@@ -23,35 +17,21 @@ warning: technically breaking changes in `Def`
 7 | | }
   | |_^
   |
-note: removed bound: `A: std::clone::Clone` (technically breaking)
- --> $REPO_PATH/tests/cases/bounds/old.rs:5:1
-  |
-5 | / pub struct Def<A: Clone> {
-6 | |     pub d: A,
-7 | | }
-  | |_^
+  = note: removed bound: `A: std::clone::Clone` (technically breaking)
 
 warning: breaking changes in `abc`
  --> $REPO_PATH/tests/cases/bounds/new.rs:9:1
   |
 9 | pub fn abc<A: Clone>(_: A) {}
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
-warning: added bound: `A: std::clone::Clone` (breaking)
- --> $REPO_PATH/tests/cases/bounds/old.rs:9:1
-  |
-9 | pub fn abc<A>(_: A) {}
-  | ^^^^^^^^^^^^^^^^^^^^^^
+  = warning: added bound: `A: std::clone::Clone` (breaking)
 
 warning: technically breaking changes in `def`
   --> $REPO_PATH/tests/cases/bounds/new.rs:11:1
    |
 11 | pub fn def<A>(_: A) {}
    | ^^^^^^^^^^^^^^^^^^^^^^
    |
-note: removed bound: `A: std::clone::Clone` (technically breaking)
-  --> $REPO_PATH/tests/cases/bounds/old.rs:11:1
-   |
-11 | pub fn def<A: Clone>(_: A) {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: removed bound: `A: std::clone::Clone` (technically breaking)
 

tests/cases/inherent_impls/new.rs

@@ -10,13 +10,19 @@ impl Abc {
     }
 
     fn def(&self) { }
+
+    // TODO
+    /* pub fn ghi<A>(&self, _: A) -> u8 {
+        0
+    } */
 }
 
 #[allow(dead_code)]
 pub struct Def<A> {
     field: A,
 }
 
+#[allow(dead_code)]
 impl Def<u8> {
     pub fn def(&self) -> u16 {
         0
@@ -27,6 +33,7 @@ impl Def<u8> {
     fn abc2() { }
 }
 
+#[allow(dead_code)]
 impl Def<u16> {
     pub fn def(&self) -> u8 {
         0

tests/cases/inherent_impls/old.rs

@@ -10,19 +10,26 @@ impl Abc {
     }
 
     fn def(&self) { }
+
+    // TODO
+    /* pub fn ghi<A>(&self, a: A) -> A {
+        a
+    } */
 }
 
 #[allow(dead_code)]
 pub struct Def<A> {
     field: A,
 }
 
+#[allow(dead_code)]
 impl Def<bool> {
     pub fn def(&self) -> u8 {
         0
     }
 }
 
+#[allow(dead_code)]
 impl Def<u8> {
     pub fn def(&self) -> u8 {
         0

tests/cases/inherent_impls/stdout

@@ -1,46 +1,46 @@
 version bump: 1.0.0 -> (breaking) -> 2.0.0
 warning: breaking changes in `def`
-  --> $REPO_PATH/tests/cases/inherent_impls/old.rs:21:5
+  --> $REPO_PATH/tests/cases/inherent_impls/old.rs:27:5
    |
-21 | /     pub fn def(&self) -> u8 {
-22 | |         0
-23 | |     }
+27 | /     pub fn def(&self) -> u8 {
+28 | |         0
+29 | |     }
    | |_____^
    |
    = warning: removed item in inherent impl (breaking)
 
 warning: breaking changes in `def`
-  --> $REPO_PATH/tests/cases/inherent_impls/old.rs:27:5
+  --> $REPO_PATH/tests/cases/inherent_impls/old.rs:34:5
    |
-27 | /     pub fn def(&self) -> u8 {
-28 | |         0
-29 | |     }
+34 | /     pub fn def(&self) -> u8 {
+35 | |         0
+36 | |     }
    | |_____^
    |
    = warning: type error: expected u8, found u16 (breaking)
 
 warning: breaking changes in `ghi`
-  --> $REPO_PATH/tests/cases/inherent_impls/old.rs:31:5
+  --> $REPO_PATH/tests/cases/inherent_impls/old.rs:38:5
    |
-31 |     pub fn ghi() { }
+38 |     pub fn ghi() { }
    |     ^^^^^^^^^^^^^^^^
    |
    = warning: removed item in inherent impl (breaking)
 
 warning: technically breaking changes in `abc`
-  --> $REPO_PATH/tests/cases/inherent_impls/new.rs:25:5
+  --> $REPO_PATH/tests/cases/inherent_impls/new.rs:31:5
    |
-25 |     pub fn abc() { }
+31 |     pub fn abc() { }
    |     ^^^^^^^^^^^^^^^^
    |
    = note: added item in inherent impl (technically breaking)
 
 warning: technically breaking changes in `def`
-  --> $REPO_PATH/tests/cases/inherent_impls/new.rs:31:5
+  --> $REPO_PATH/tests/cases/inherent_impls/new.rs:38:5
    |
-31 | /     pub fn def(&self) -> u8 {
-32 | |         0
-33 | |     }
+38 | /     pub fn def(&self) -> u8 {
+39 | |         0
+40 | |     }
    | |_____^
    |
    = note: added item in inherent impl (technically breaking)