Switch to stable toolchain in CI, fix clippy/tests/fmt

src/interner.rs

@@ -240,7 +240,7 @@ mod tests {
         assert_eq!(actual_id, expected_id,);
     }
 
-    fn assert_resolve<E>(interner: &mut StringInterner, symbol_id: u32, expected_str: E)
+    fn assert_resolve<E>(interner: &StringInterner, symbol_id: u32, expected_str: E)
     where
         E: Into<Option<&'static str>>,
     {
@@ -259,9 +259,9 @@ mod tests {
         assert_id(&mut interner, "1 2 3", 2);
         assert_id(&mut interner, "Hello", 0);
 
-        assert_resolve(&mut interner, 0, "Hello");
-        assert_resolve(&mut interner, 1, ", World!");
-        assert_resolve(&mut interner, 2, "1 2 3");
-        assert_resolve(&mut interner, 3, None);
+        assert_resolve(&interner, 0, "Hello");
+        assert_resolve(&interner, 1, ", World!");
+        assert_resolve(&interner, 2, "1 2 3");
+        assert_resolve(&interner, 3, None);
     }
 }

src/meta_type.rs

@@ -59,7 +59,7 @@ impl Eq for MetaType {}
 
 impl PartialOrd for MetaType {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.type_id.partial_cmp(&other.type_id)
+        Some(self.cmp(other))
     }
 }
 

test_suite/tests/ui/fail_missing_derive.stderr

@@ -5,15 +5,15 @@ error[E0277]: the trait bound `PawType<u16>: TypeInfo` is not satisfied
    |                        ^^^^^^^^^^^^^^^^^^ the trait `TypeInfo` is not implemented for `PawType<u16>`
    |
    = help: the following other types implement trait `TypeInfo`:
-             &T
-             &mut T
-             ()
-             (A, B)
-             (A, B, C)
-             (A, B, C, D)
-             (A, B, C, D, E)
-             (A, B, C, D, E, F)
-           and $N others
+             bool
+             char
+             i8
+             i16
+             i32
+             i64
+             i128
+             u8
+           and 57 others
 note: required for `Cat<bool, u8, u16>` to implement `TypeInfo`
   --> tests/ui/fail_missing_derive.rs:8:10
    |

test_suite/tests/ui/fail_unions.stderr

@@ -15,15 +15,15 @@ error[E0277]: the trait bound `Commonwealth: TypeInfo` is not satisfied
    |                        ^^^^^^^^^^^^ the trait `TypeInfo` is not implemented for `Commonwealth`
    |
    = help: the following other types implement trait `TypeInfo`:
-             &T
-             &mut T
-             ()
-             (A, B)
-             (A, B, C)
-             (A, B, C, D)
-             (A, B, C, D, E)
-             (A, B, C, D, E, F)
-           and $N others
+             bool
+             char
+             i8
+             i16
+             i32
+             i64
+             i128
+             u8
+           and 56 others
 note: required by a bound in `assert_type_info`
   --> tests/ui/fail_unions.rs:11:24
    |