Merge pull request #1009 from petertseng/clippyexit

test-exercise: Detect Clippy failure by exit code, not by grep

Author: petertseng

.github/workflows/tests.yml

@@ -126,29 +126,22 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      # We actually think explicitly installing Clippy isn't necessary,
-      # as it is currently installed by default.
-      # But we'll include this step anyway just in case that changes.
-      - name: Install Clippy
-        run: rustup component add clippy
-
       - name: Setup toolchain
         uses: actions-rs/toolchain@v1
         with:
           toolchain: ${{ matrix.rust }}
           default: true
 
-      - name: Clippy tests
+      # Clippy already installed on Stable, but not Beta.
+      # So, we must install here.
+      - name: Install Clippy
+        run: rustup component add clippy
+
+      - name: Clippy
         env:
-          CLIPPY: tests/
+          CLIPPY: true
         run: ./_test/check-exercises.sh
 
-      # Our examples currently have too much Clippy output to consider this.
-      # But maybe in the future.
-      #- name: Clippy examples
-      #  env:
-      #    CLIPPY: src/lib.rs
-      #  run: ./_test/check-exercises.sh
   nightly-compilation:
     name: Check exercises on nightly (benchmark enabled)
     runs-on: ubuntu-latest

bin/test-exercise

@@ -83,10 +83,12 @@ done
 (
    cd $exercise
    if [ -n "$CLIPPY" ]; then
-     cargo clippy --all-targets --color always "$@" 2>clippy.log
-     # Only consider it a failure if output contains the string in CLIPPY.
-     # For example, if we're only looking in tests, CLIPPY contains tests/
-     if grep -q $CLIPPY clippy.log; then
+     # Consider any Clippy to be an error in tests only.
+     # For now, not the example solutions since they have many Clippy warnings,
+     # and are not shown to students anyway.
+     sed -i -e '1i #![deny(clippy::all)]' tests/*.rs
+     cargo clippy --tests --color always "$@" 2>clippy.log
+     if [ $? -ne 0 ]; then
        cat clippy.log
        exit 1
      else

exercises/book-store/example.rs

@@ -10,7 +10,7 @@ type GroupedBasket = Vec<Group>;
 type Price = u32;
 const BOOK_PRICE: Price = 800;
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone)]
 struct Group(RefCell<BTreeSet<Book>>);
 
 impl Group {
@@ -65,6 +65,14 @@ impl PartialOrd for Group {
     }
 }
 
+impl PartialEq for Group {
+    fn eq(&self, other: &Group) -> bool {
+        self.0.borrow().eq(&other.0.borrow())
+    }
+}
+
+impl Eq for Group {}
+
 impl Hash for Group {
     fn hash<H: Hasher>(&self, hasher: &mut H) {
         self.0.borrow().hash(hasher);

exercises/decimal/example.rs

@@ -101,9 +101,10 @@ impl Decimal {
 }
 
 macro_rules! auto_impl_decimal_ops {
-    ($trait:ident, $func_name:ident, $digits_operation:expr, $index_operation:expr) => {
+    ($(#[$attr:meta])* $trait:ident, $func_name:ident, $digits_operation:expr, $index_operation:expr) => {
         impl $trait for Decimal {
             type Output = Self;
+            $(#[$attr])*
             fn $func_name(mut self, mut rhs: Self) -> Self {
                 Decimal::equalize_precision(&mut self, &mut rhs);
                 Decimal::new(
@@ -117,7 +118,7 @@ macro_rules! auto_impl_decimal_ops {
 
 auto_impl_decimal_ops!(Add, add, |s, o| s + o, |s, _| s);
 auto_impl_decimal_ops!(Sub, sub, |s, o| s - o, |s, _| s);
-auto_impl_decimal_ops!(Mul, mul, |s, o| s * o, |s, o| s + o);
+auto_impl_decimal_ops!(#[allow(clippy::suspicious_arithmetic_impl)] Mul, mul, |s, o| s * o, |s, o| s + o);
 
 macro_rules! auto_impl_decimal_cow {
     ($trait:ident, $func_name:ident, $digits_operation:expr, $return_type:ty) => {

exercises/decimal/tests/decimal.rs

@@ -8,7 +8,7 @@ fn decimal(input: &str) -> Decimal {
 }
 
 /// Some big and precise values we can use for testing. [0] + [1] == [2]
-const BIGS: [&'static str; 3] = [
+const BIGS: [&str; 3] = [
     "100000000000000000000000000000000000000000000.00000000000000000000000000000000000000001",
     "100000000000000000000000000000000000000000000.00000000000000000000000000000000000000002",
     "200000000000000000000000000000000000000000000.00000000000000000000000000000000000000003",