diff --git a/Cargo.lock b/Cargo.lock index 03c5311..61b8f91 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -876,14 +876,14 @@ dependencies = [ [[package]] name = "fuzon" -version = "0.2.4" +version = "0.2.5" dependencies = [ "anyhow", "clap 4.5.18", "crossterm", "dirs", "lazy_static", - "oxrdf 0.1.7", + "oxrdf", "oxrdfio", "oxttl", "postcard", @@ -896,7 +896,7 @@ dependencies = [ [[package]] name = "fuzon-http" -version = "0.2.4" +version = "0.2.5" dependencies = [ "actix-web", "clap 4.5.18", @@ -1481,17 +1481,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85d9439ace287894b327bd5522d4f3d813311c719143a1af37826c6a12f808d0" -[[package]] -name = "oxrdf" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "309287c8a757e25e06a6156acbd73770bac3e319123f5b4bc0a42e232caf97a5" -dependencies = [ - "oxilangtag", - "oxiri", - "rand", -] - [[package]] name = "oxrdf" version = "0.2.1" @@ -1510,7 +1499,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62b05ae7eeab84240bdf87bc8db8da4622a0ad202375e4de50ce32e97ea4061b" dependencies = [ - "oxrdf 0.2.1", + "oxrdf", "oxrdfxml", "oxttl", "thiserror", @@ -1524,7 +1513,7 @@ checksum = "7f7b10f0ba68e0a300346264a97c33ad26d1e16700d481c4809caef26195a04a" dependencies = [ "oxilangtag", "oxiri", - "oxrdf 0.2.1", + "oxrdf", "quick-xml", "thiserror", ] @@ -1538,7 +1527,7 @@ dependencies = [ "memchr", "oxilangtag", "oxiri", - "oxrdf 0.2.1", + "oxrdf", "thiserror", ] @@ -1660,14 +1649,14 @@ dependencies = [ [[package]] name = "pyfuzon" -version = "0.2.4" +version = "0.2.5" dependencies = [ "anyhow", "clap 4.5.18", "crossterm", "fuzon", "lazy_static", - "oxrdf 0.1.7", + "oxrdf", "oxttl", "pyo3", "ratatui", diff --git a/fuzon-http/Cargo.toml b/fuzon-http/Cargo.toml index 13ffc45..c3a7dc4 100644 --- a/fuzon-http/Cargo.toml +++ b/fuzon-http/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fuzon-http" -version = "0.2.4" +version = "0.2.5" license.workspace = true edition.workspace = true @@ -8,7 +8,7 @@ edition.workspace = true actix-web = "4.9.0" clap = { version = "4.5.18", features = ["derive"] } env_logger = "0.11.5" -fuzon = { version = "0.2.4", path = "../fuzon" } +fuzon = { version = "0.2.5", path = "../fuzon" } log = "0.4.22" serde = { version = "1.0.210", features = ["derive"] } serde_json = "1.0.128" diff --git a/fuzon/Cargo.toml b/fuzon/Cargo.toml index 87248fa..4f1c5fd 100644 --- a/fuzon/Cargo.toml +++ b/fuzon/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fuzon" -version = "0.2.4" +version = "0.2.5" edition = "2021" [lib] @@ -12,7 +12,7 @@ clap = { version = "4.5.16", features = ["derive"] } crossterm = "0.28.1" dirs = "5.0.1" lazy_static = "1.5.0" -oxrdf = "0.1.7" +oxrdf = "0.2.1" oxrdfio = "0.1.0" oxttl = "0.1.0-rc.1" postcard = { version = "1.0.10", features = ["alloc"] } diff --git a/fuzon/src/lib.rs b/fuzon/src/lib.rs index 0ad24dc..3804ecc 100644 --- a/fuzon/src/lib.rs +++ b/fuzon/src/lib.rs @@ -11,6 +11,7 @@ use std::{ use anyhow::Result; use lazy_static::lazy_static; use oxrdfio::{RdfFormat, RdfParser}; +use oxrdf::Subject; use postcard; use reqwest::{blocking::Client, Url}; use serde::{Deserialize, Serialize}; @@ -164,8 +165,10 @@ pub fn gather_terms(readers: Vec<(impl BufRead, RdfFormat)>) -> impl Iterator