Merge branch 'main' into renovate/configure

.github/actions/setup/action.yml

@@ -6,7 +6,7 @@ runs:
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: nightly
+        toolchain: stable
         override: true
         components: rustfmt, clippy, llvm-tools-preview
 
@@ -30,6 +30,3 @@ runs:
           target/
         key: cargo-repo-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}
 
-    - name: Install cargo-binstall
-      shell: bash
-      run: cargo install cargo-binstall

.github/workflows/ci.yml

@@ -15,7 +15,9 @@ jobs:
         uses: ./.github/actions/setup
 
       - name: Install more cargo tools
-        run: echo yes | cargo binstall cargo-llvm-cov cargo-nextest
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-llvm-cov,cargo-nextest
 
       # test
       - name: Run tests and generate coverage

Cargo.toml

@@ -9,3 +9,4 @@ async-std = { version = "1", features = [ "attributes" ] }
 futures = "0.3.28"
 csv = "1.2.1"
 tempfile = "3.5.0"
+itertools = "0.11.0"

src/file/csv.rs

@@ -1,3 +1,5 @@
+use itertools::intersperse;
+
 use crate::model;
 use csv::StringRecord;
 use std::{error::Error, path::Path};
@@ -9,12 +11,14 @@ impl From<&model::Note> for StringRecord {
             value.word.to_owned(),
             value.stem.to_owned(),
             value.lang.to_owned(),
-            value
-                .usages
-                .iter()
-                .map(|usage| format!("<p>\n{}\n</p>", usage))
-                .intersperse("\n".to_owned())
-                .collect(),
+            intersperse(
+                value
+                    .usages
+                    .iter()
+                    .map(|usage| format!("<p>\n{}\n</p>", usage)),
+                "\n".to_owned(),
+            )
+            .collect(),
         ])
     }
 }

src/lib.rs

@@ -1,5 +1,3 @@
-#![feature(iter_intersperse)]
-
 use std::error;
 pub mod cli;
 mod db;
@@ -38,6 +36,8 @@ mod tests {
 
     use crate::{cli, export_to_csv};
 
+    use itertools::intersperse;
+
     #[async_std::test]
     async fn should_export_words_and_usage_to_csv() -> Result<(), Box<dyn error::Error>> {
         let csvfile = tempfile::NamedTempFile::new()?;
@@ -51,11 +51,11 @@ mod tests {
 
         // should output csv
         let contents = fs::read_to_string(csvfile.path())?;
-        let row_1: String = contents
-            .lines()
-            .take(3) // multiline contents
-            .intersperse("\n")
-            .collect::<String>();
+        let row_1: String = intersperse(
+            contents.lines().take(3), // multiline contents
+            "\n",
+        )
+        .collect::<String>();
         assert_eq!(
             row_1,
             "de:verwendet,verwendet,verwenden,de,\"<p>