lint fixes, added github actions, Makefile

Author: GregHanson

.github/workflows/format_check.yml

@@ -0,0 +1,22 @@
+name: Rustfmt Check
+
+on: [push]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  lint:
+    name: cargo fmt
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          components: rustfmt
+      - name: Rustfmt Check
+        uses: actions-rust-lang/rustfmt@v1
+      - name: Machete
+        uses: bnjbvr/cargo-machete@main
+      - name: Clippy Check
+        run: cargo clippy --benches --tests --bins --no-deps --all-features

.github/workflows/test_build.yml

@@ -0,0 +1,37 @@
+name: Building XML2RDF and testing
+
+on: 
+  schedule:
+    - cron: '0 0 * * SAT'
+  push:
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: ${{ github.event.schedule == '' && 'stable' || 'nightly' }}
+        cache: false
+
+    - name: Build
+      run: cargo build --verbose
+
+  end-to-end:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: ${{ github.event.schedule == '' && 'stable' || 'nightly' }}
+        cache: false
+
+    - name: Run Rust integration tests
+      run: cargo test
+

Cargo.lock

@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-clap = { version = "4.5.21", features = ["derive","cargo"] }
-convert_case = "0.6.0"
+clap = { version = "4.5.30", features = ["derive","cargo"] }
+convert_case = "0.7.1"
 csv = "1.3.1"
-log = "0.4.22"
-oxrdf = "0.2.3"
-oxrdfio = "0.1.3"
+log = "0.4.25"
+oxrdf = "0.2.4"
+oxrdfio = "0.1.6"

Cargo.toml

@@ -0,0 +1,14 @@
+
+lint:
+	cargo install  cargo-machete
+	cargo fmt --check
+	cargo machete
+	cargo clippy --benches --tests --bins --no-deps --all-features
+
+build:
+	cargo build
+
+test:
+	cargo test
+
+presubmit: lint test

Makefile

@@ -19,7 +19,7 @@ use csv::ReaderBuilder;
 use log::error;
 use oxrdf::{NamedNode, TermRef, TripleRef};
 
-const C2R: &'static str = "https://decisym.ai/csv2rdf/model#";
+const C2R: &str = "https://decisym.ai/csv2rdf/model#";
 
 /// Converts CSV data to RDF format.
 ///
@@ -58,9 +58,7 @@ pub fn parse_csv(
     };
 
     for file in files.into_iter() {
-        let mut rdr = ReaderBuilder::new()
-            .has_headers(true)
-            .from_path(file.to_string())?;
+        let mut rdr = ReaderBuilder::new().has_headers(true).from_path(&file)?;
 
         let mut headers: HashMap<i32, String> = HashMap::new();
         let mut column_index = 0;
@@ -86,7 +84,7 @@ pub fn parse_csv(
                     row_id = field.trim().replace(" ", "");
                 }
                 // do not append empty cells
-                else if field != "" {
+                else if !field.is_empty() {
                     let column_id = headers.get(&column_index).unwrap();
                     let subject = NamedNode::new(format!("{}{}", ns, row_id)).unwrap();
                     let predicate = NamedNode::new(format!("{}{}", C2R, column_id)).unwrap();

src/convert.rs

@@ -58,9 +58,9 @@ impl<'a> GraphWriter<'a> {
     }
 }
 
-impl<'a> RdfWriter for GraphWriter<'a> {
+impl RdfWriter for GraphWriter<'_> {
     fn add_triple(&mut self, triple: TripleRef) -> std::io::Result<()> {
-        self.graph.insert(triple.clone());
+        self.graph.insert(triple);
         Ok(())
     }
 }