Merge pull request #20 from siketyan/fix-clippy

refactor: Fix clippy

Author: siketyan

.github/workflows/rust.yml

@@ -11,7 +11,7 @@ env:
 
 jobs:
   checks:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
         with:
@@ -33,24 +33,25 @@ jobs:
           components: rustfmt,clippy
 
       - name: Install libpcsclite
-        run: sudo apt install libudev-dev libpcsclite-dev
+        run: sudo apt update && sudo apt install libudev-dev libpcsclite-dev
 
       - name: Run clippy
         uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          args: --workspace
 
       - name: Run rustfmt
         uses: actions-rs/cargo@v1
         with:
           command: fmt
-          args: -- --check
+          args: --all --check
 
       - name: Run tests
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --verbose
+          args: --workspace --exclude jpki-android --verbose
 
   build:
     needs:
@@ -76,16 +77,16 @@ jobs:
             cli: true
             android: false
           - target: x86_64-unknown-linux-gnu
-            host: ubuntu-20.04
+            host: ubuntu-22.04
             artifact: jpki-cli
             cli: true
             android: false
           - target: aarch64-linux-android
-            host: ubuntu-20.04
+            host: ubuntu-22.04
             cli: false
             android: true
           - target: armv7-linux-androideabi
-            host: ubuntu-20.04
+            host: ubuntu-22.04
             cli: false
             android: true
 
@@ -111,8 +112,8 @@ jobs:
           target: ${{ matrix.target }}
 
       - name: Install libpcsclite
-        if: ${{ matrix.cli && matrix.host == 'ubuntu-20.04' }}
-        run: sudo apt install libudev-dev libpcsclite-dev
+        if: ${{ matrix.cli && startsWith(matrix.host, 'ubuntu-') }}
+        run: sudo apt update && sudo apt install libudev-dev libpcsclite-dev
 
       - name: Install Android NDK
         if: ${{ matrix.android }}
@@ -166,7 +167,7 @@ jobs:
           path: '.'
 
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: ${{ github.event_name == 'release' }}
     needs:
       - build
@@ -189,8 +190,8 @@ jobs:
           toolchain: stable
           override: true
 
-      - name: Install libnfc
-        run: sudo apt install libnfc5 libnfc-dev udev libudev-dev pcscd libpcsclite-dev
+      - name: Install libpcsclite
+        run: sudo apt update && sudo apt install libudev-dev libpcsclite-dev
 
       - name: Log into crates.io
         uses: actions-rs/cargo@v1

android/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::missing_safety_doc)]
+
 #[macro_use]
 extern crate log;
 extern crate android_log;

cli/src/main.rs

@@ -20,10 +20,10 @@ enum Error {
     IO(#[from] std::io::Error),
 
     #[error("Error occurred on communicating with NFC device: {0}")]
-    NFC(#[from] nfc::Error),
+    Nfc(#[from] nfc::Error),
 
     #[error("The card returned an error: {0}")]
-    APDU(#[from] jpki::nfc::apdu::Error),
+    Apdu(#[from] jpki::nfc::apdu::Error),
 }
 
 type Result<T> = std::result::Result<T, Error>;
@@ -52,15 +52,15 @@ enum CertType {
     AuthCA,
 }
 
-impl Into<jpki_ap::CertType> for CertType {
-    fn into(self) -> jpki_ap::CertType {
-        use jpki_ap::CertType::*;
+impl From<CertType> for jpki_ap::CertType {
+    fn from(ty: CertType) -> Self {
+        use CertType::*;
 
-        match self {
-            Self::Sign => Sign,
-            Self::SignCA => SignCA,
-            Self::Auth => Auth,
-            Self::AuthCA => AuthCA,
+        match ty {
+            Sign => Self::Sign,
+            SignCA => Self::SignCA,
+            Auth => Self::Auth,
+            AuthCA => Self::AuthCA,
         }
     }
 }
@@ -115,14 +115,14 @@ fn read_all<R: Read>(mut r: R) -> Result<Vec<u8>> {
 fn run() -> Result<()> {
     let cli: Cli = Cli::parse();
 
-    let ctx = Context::try_new().map_err(Error::NFC)?;
-    let device = ctx.open().map_err(Error::NFC)?;
+    let ctx = Context::try_new().map_err(Error::Nfc)?;
+    let device = ctx.open().map_err(Error::Nfc)?;
     let initiator = Initiator::from(device);
-    let target = initiator.select_dep_target(ctx).map_err(Error::NFC)?;
+    let target = initiator.select_dep_target(ctx).map_err(Error::Nfc)?;
 
     let nfc_card = NfcCard { target };
     let card = jpki::Card::new(Box::new(nfc_card));
-    let jpki_ap = jpki::ap::JpkiAp::open((), Box::new(card)).map_err(Error::APDU)?;
+    let jpki_ap = jpki::ap::JpkiAp::open((), Box::new(card)).map_err(Error::Apdu)?;
     match &cli.command {
         SubCommand::ReadCertificate { ty } => {
             let ty: jpki_ap::CertType = (*ty).into();
@@ -132,7 +132,7 @@ fn run() -> Result<()> {
                 vec![]
             };
 
-            let certificate = jpki_ap.read_certificate((), ty, pin).map_err(Error::APDU)?;
+            let certificate = jpki_ap.read_certificate((), ty, pin).map_err(Error::Apdu)?;
 
             stdout().write_all(&certificate).map_err(Error::IO)?;
         }

cli/src/nfc.rs

@@ -63,11 +63,9 @@ pub struct Initiator<'a> {
 
 impl<'a> Initiator<'a> {
     pub fn select_dep_target(self, ctx: Context) -> Result<Target<'a>> {
-        let reader = self.device.reader.clone();
-
         Ok(Target::new(
             ctx.ctx
-                .connect(&reader, ShareMode::Shared, Protocols::ANY)
+                .connect(&self.device.reader, ShareMode::Shared, Protocols::ANY)
                 .map_err(Error::PcscError)?,
         ))
     }

src/jpki/ap/jpki.rs

@@ -40,10 +40,7 @@ impl CertType {
 
     /// Determines whether it is needed for fetching the certificate to unlock it with a PIN.
     pub fn is_pin_required(&self) -> bool {
-        match self {
-            Self::Sign => true,
-            _ => false,
-        }
+        matches!(self, Self::Sign)
     }
 }
 
@@ -110,7 +107,7 @@ where
     fn verify_pin(&self, ctx: Ctx, ef: [u8; 2], pin: Vec<u8>) -> Result<(), apdu::Error> {
         self.card
             .select_ef(ctx, ef.into())
-            .and_then(|_| self.card.verify(ctx, pin.into()))
+            .and_then(|_| self.card.verify(ctx, pin))
     }
 
     fn read_certificate_size(&self, ctx: Ctx) -> Result<u16, apdu::Error> {

src/nfc/apdu/response.rs

@@ -1,6 +1,7 @@
 use crate::nfc::apdu::Error;
 
 /// An response that was received from the card
+#[derive(Default)]
 pub struct Response {
     payload: Vec<u8>,
     trailer: (u8, u8),
@@ -9,10 +10,7 @@ pub struct Response {
 impl Response {
     /// Creates an empty response.
     pub fn new() -> Self {
-        Self {
-            payload: vec![],
-            trailer: (0, 0),
-        }
+        Default::default()
     }
 
     /// Parses a response from the octets.
@@ -31,10 +29,7 @@ impl Response {
 
     /// Determines whether the response indicates success or not.
     pub fn is_ok(&self) -> bool {
-        match self.trailer {
-            (0x90, 0x00) | (0x91, 0x00) => true,
-            _ => false,
-        }
+        matches!(self.trailer, (0x90, 0x00) | (0x91, 0x00))
     }
 
     /// Converts the response to a result of octets.
@@ -49,10 +44,8 @@ impl Response {
     }
 }
 
-impl Into<Error> for (u8, u8) {
-    fn into(self) -> Error {
-        let (sw1, sw2) = self;
-
+impl From<(u8, u8)> for Error {
+    fn from((sw1, sw2): (u8, u8)) -> Self {
         Error { sw1, sw2 }
     }
 }