Upgrade logos (#13)

* Update logos to 0.14.

* Bump minor version.

* Format and clippy fixes.

* Update workflow.

Author: tmpfs

Diff for: .github/workflows/audit.yaml

@@ -8,7 +8,15 @@ jobs:
   security_audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions-rs/audit-check@v1
+      - uses: actions/checkout@v4
+      - name: ⚡ Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - uses: rustsec/[email protected]
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

Diff for: .github/workflows/library.yaml

@@ -11,19 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          components: clippy
-      - name: Install cargo make
-        run: cargo install cargo-make
+      - name: Check
+        run: cargo check
       - name: Install webassembly target
         run: rustup target add wasm32-unknown-unknown
       - name: Check webassembly
-        run: cargo make check-wasm
+        run: cargo check --target wasm32-unknown-unknown
       - name: Check cargo fmt
-        run: cargo make format-check
+        run: cargo fmt --all -- --check
       - name: Check cargo clippy
-        run: cargo make clippy
+        run: cargo clippy
       - name: Run tests
-        run: cargo make test
+        run: cargo test

Diff for: Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vcard4"
-version = "0.4.4"
+version = "0.5.0"
 edition = "2021"
 description = "Fast and correct vCard parser for RFC6350"
 repository = "https://github.com/tmpfs/vcard4"
@@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 thiserror = "1"
-logos = "0.12"
+logos = { version = "0.14", features = ["export_derive"] }
 uriparse = "0.6.4"
 time = { version = "0.3.19", features = ["parsing", "formatting"] }
 unicode-segmentation="1"
@@ -22,7 +22,12 @@ base64 = "0.21.0"
 
 [features]
 default = ["zeroize"]
-serde = ["dep:serde", "time/serde-human-readable", "language-tags?/serde", "uriparse/serde"]
+serde = [
+  "dep:serde",
+  "time/serde-human-readable",
+  "language-tags?/serde",
+  "uriparse/serde",
+]
 zeroize = ["dep:zeroize"]
 mime = ["dep:mime"]
 language-tags = ["dep:language-tags"]

Diff for: rust-toolchain

@@ -0,0 +1,2 @@
+[toolchain]
+channel = "stable"

Diff for: rust-toolchain.toml

@@ -1,5 +1,15 @@
 use thiserror::Error;
 
+/// Error lexing a vcard string.
+#[derive(Debug, Error, PartialEq, Clone, Default)]
+#[doc(hidden)]
+pub enum LexError {
+    /// Generic lex error.
+    #[default]
+    #[error("vcard lex error")]
+    Other,
+}
+
 /// Errors generated by the vCard library.
 #[derive(Debug, Error)]
 pub enum Error {
@@ -170,4 +180,8 @@ pub enum Error {
     /// Error generated decoding from base64.
     #[error(transparent)]
     Base64(#[from] base64::DecodeError),
+
+    /// Error generated during lexing.
+    #[error(transparent)]
+    LexError(#[from] LexError),
 }

Diff for: src/error.rs

@@ -25,7 +25,7 @@ impl<'s> VcardIterator<'s> {
         let mut lex = self.parser.lexer();
         lex.bump(offset);
         while let Some(first) = lex.next() {
-            if first == Token::NewLine {
+            if first == Ok(Token::NewLine) {
                 continue;
             } else {
                 return self.parser.parse_one(&mut lex, Some(first));