Bump dependencies and fix new clippy feedbacks

Author: ithinuel

.github/workflows/rust.yml

@@ -1,29 +1,65 @@
-name: Rust
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
+on: [push, pull_request]
+name: Build and Test checks
 env:
   CARGO_TERM_COLOR: always
-
 jobs:
-  test:
-    runs-on: ubuntu-latest
+  rustfmt:
+    name: Rustfmt check
+    runs-on: ubuntu-20.04
     steps:
-    - name: Install latest nightly
-      uses: actions-rs/toolchain@v1
-      with:
-          toolchain: nightly
-          default: true
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
           override: true
-          target: thumbv7em-none-eabihf
-          components: rustfmt, clippy
+          profile: minimal
+      - name: "Rustfmt"
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: -- --check
 
-    - uses: actions/checkout@v2
-    - name: check style
-      run: cargo fmt -- --check
-    - name: Test
-      run: ./tests.sh
+  build_and_test:
+    name: "Build and test"
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        features: [
+          "parse-comments",
+          "parse-trailing-comment",
+          "parse-trailing-comment,parse-comments",
+          "parse-checksum",
+          "parse-trailing-comment,parse-checksum",
+          "parse-trailing-comment,parse-comments,parse-checksum",
+          "optional-value",
+          "string-value",
+          "parse-parameters",
+          "parse-parameters,optional-value",
+          "parse-parameters,string-value",
+          "parse-expressions",
+          "parse-expressions,parse-parameters",
+          "parse-comments,parse-trailing-comment,parse-checksum,parse-parameters,parse-expressions,optional-value,string-value"
+    ]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: thumbv7em-none-eabihf
+          override: true
+          profile: minimal
+      - name: "Clippy"
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --examples --features ${{ matrix.features }} -- -Dwarnings
+      - name: "Build"
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --release --no-default-features --features ${{ matrix.features }}
+      - name: "Test"
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --target x86_64-unknown-linux-gnu --features ${{ matrix.features }}

Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "async-gcode"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Wilfried Chauveau <[email protected]>"]
 description = "An async gcode parser for no_std targets."
 keywords = ["async", "await", "gcode"]
 license = "MIT"
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/ithinuel/async-gcode"
 categories = ["asynchronous", "embedded", "no-std", "parsing"]
 
@@ -24,9 +24,9 @@ string-value = []
 maintenance = { status = "experimental" }
 
 [dev-dependencies]
-futures-executor = { version = "0.3.5" }
+futures-executor = { version = "0.3.21" }
 
 [dependencies]
 either = {version = "^1", default-features = false }
-futures = { version = "0.3.5", default-features = false }
-pin-project-lite = { version = "0.1.7" }
+futures = { version = "0.3.21", default-features = false }
+pin-project-lite = { version = "0.2.9" }

examples/cli.rs

@@ -18,12 +18,8 @@ fn main() {
             std::io::stdin().bytes().map(|res| res.map_err(Error::Io)),
         ));
 
-        loop {
-            if let Some(res) = parser.next().await {
-                println!("{:?}", res);
-            } else {
-                break;
-            }
+        while let Some(res) = parser.next().await {
+            println!("{:?}", res);
         }
     });
 }

src/lib.rs

@@ -105,7 +105,7 @@ pub use types::RealValue;
 #[cfg(any(feature = "parse-expressions", feature = "parse-parameters"))]
 pub use types::expressions::Expression;
 
-#[derive(Debug, PartialEq, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
 pub enum Error {
     /// Error no the gcode syntax
     UnexpectedByte(u8),

src/parser.rs

@@ -272,14 +272,14 @@ where
                         let param_id = match try_await!(parse_real_value(&mut self.input)) {
                             #[cfg(feature = "optional-value")]
                             crate::RealValue::None => {
-                                let b = try_await_result!((&mut self.input).next());
+                                let b = try_await_result!(self.input.next());
                                 break Err(Error::UnexpectedByte(b).into());
                             }
                             id => id,
                         };
                         // println!("param_id: {:?}", param_id);
                         try_await_result!(skip_whitespaces(&mut self.input));
-                        let b = try_await_result!((&mut self.input).next());
+                        let b = try_await_result!(self.input.next());
                         if b'=' != b {
                             break Err(Error::UnexpectedByte(b).into());
                         }

src/types.rs

@@ -106,18 +106,18 @@ pub(crate) mod expressions {
     pub(crate) type ExprItem = Either<Operator, Literal>;
     pub(crate) type ExprInner = Vec<ExprItem>;
 
-    #[derive(Debug, PartialEq, Clone, Copy)]
+    #[derive(Debug, PartialEq, Eq, Clone, Copy)]
     pub enum OpType {
         Unary,
         Binary,
     }
-    #[derive(Debug, PartialEq, Clone, Copy)]
+    #[derive(Debug, PartialEq, Eq, Clone, Copy)]
     pub enum Associativity {
         Left,
         #[cfg(feature = "parse-parameters")]
         Right,
     }
-    #[derive(Debug, Clone, Copy, PartialOrd, PartialEq)]
+    #[derive(Debug, Clone, Copy, PartialOrd, PartialEq, Eq)]
     pub enum Precedence {
         Group1,
         Group2,
@@ -127,7 +127,7 @@ pub(crate) mod expressions {
         Group5,
     }
 
-    #[derive(Debug, PartialEq, Clone, Copy)]
+    #[derive(Debug, PartialEq, Eq, Clone, Copy)]
     pub enum Operator {
         // Binary operators
         Add,

tests.sh

@@ -3,12 +3,12 @@ set -e
 
 function run_test() {
     echo $1
-    cargo clippy --features $2
+    cargo clippy --examples --features $2 -- -Dwarnings
     cargo build --color=always --release --no-default-features \
             --features $2 \
-            --target thumbv7em-none-eabihf \
-            -Z features=dev_dep
+            --target thumbv7em-none-eabihf
     cargo test --color=always --features $2
+    cargo clean
 }
 
 cargo clippy