From d31ab983aed76c68a6ba73f2d99f2303338e6307 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Jun 2021 05:10:29 +0000 Subject: [PATCH 01/30] Bump mocha from 8.4.0 to 9.0.0 in /js Bumps [mocha](https://github.com/mochajs/mocha) from 8.4.0 to 9.0.0. - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](https://github.com/mochajs/mocha/compare/v8.4.0...v9.0.0) --- updated-dependencies: - dependency-name: mocha dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/package.json b/js/package.json index bf373b18..71c51ddd 100644 --- a/js/package.json +++ b/js/package.json @@ -3,7 +3,7 @@ "description": "Oxigraph JS build and tests", "private": true, "devDependencies": { - "mocha": "^8.0.1", + "mocha": "^9.0.0", "@rdfjs/data-model": "1.1.2", "standard": "^16.0.0" }, From bdb97aceaf6d1eae893e3861d1e863e02c8b9400 Mon Sep 17 00:00:00 2001 From: Thomas Tanon Date: Mon, 21 Jun 2021 10:54:11 +0200 Subject: [PATCH 02/30] Create FUNDING.yml --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..9a4dc9a6 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +github: [Tpt] From e5e1dbc720e292a42ee3196fc8bce5172ca3d731 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jul 2021 10:02:37 +0000 Subject: [PATCH 03/30] Update pyo3 requirement from 0.13 to 0.14 Updates the requirements on [pyo3](https://github.com/pyo3/pyo3) to permit the latest version. - [Release notes](https://github.com/pyo3/pyo3/releases) - [Changelog](https://github.com/PyO3/pyo3/blob/main/CHANGELOG.md) - [Commits](https://github.com/pyo3/pyo3/compare/v0.13.0...v0.14.1) --- updated-dependencies: - dependency-name: pyo3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- python/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/Cargo.toml b/python/Cargo.toml index 40045c9e..46bad11d 100644 --- a/python/Cargo.toml +++ b/python/Cargo.toml @@ -17,7 +17,7 @@ doctest = false [dependencies] oxigraph = {version = "0.2", path="../lib", features = ["sled", "http_client"]} -pyo3 = {version = "0.13", features = ["extension-module", "abi3-py36"]} +pyo3 = {version = "0.14", features = ["extension-module", "abi3-py36"]} native-tls = {version = "0.2", features = ["vendored"]} [package.metadata.maturin] From a58a6fac8e92372debfe5e91b535f3d7acf469de Mon Sep 17 00:00:00 2001 From: Tpt Date: Sat, 10 Jul 2021 21:43:02 +0200 Subject: [PATCH 04/30] Migrates from argh to clap --- server/Cargo.toml | 1 + server/src/main.rs | 43 +++++++++++--------- wikibase/Cargo.toml | 2 +- wikibase/src/main.rs | 97 +++++++++++++++++++++++++------------------- 4 files changed, 80 insertions(+), 63 deletions(-) diff --git a/server/Cargo.toml b/server/Cargo.toml index 5e827758..6b6d0130 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -20,6 +20,7 @@ default = ["rocksdb"] argh = "0.1" async-std = { version = "1", features = ["attributes"] } async-h1 = "2" +clap = "2" http-types = "2" oxigraph = { version = "0.2", path="../lib", features = ["http_client"] } rand = "0.8" diff --git a/server/src/main.rs b/server/src/main.rs index d6948761..fa5ea18a 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -9,12 +9,12 @@ unused_qualifications )] -use argh::FromArgs; use async_std::future::Future; use async_std::io::Read; use async_std::net::{TcpListener, TcpStream}; use async_std::prelude::*; use async_std::task::{block_on, spawn}; +use clap::{App, Arg}; use http_types::content::ContentType; use http_types::{ bail_status, format_err_status, headers, Error, Method, Mime, Request, Response, Result, @@ -39,28 +39,31 @@ const HTML_ROOT_PAGE: &str = include_str!("../templates/query.html"); const LOGO: &str = include_str!("../logo.svg"); const SERVER: &str = concat!("Oxigraph/", env!("CARGO_PKG_VERSION")); -#[derive(FromArgs)] -/// Oxigraph SPARQL server -struct Args { - /// specify a server socket to bind using the format $(HOST):$(PORT) - #[argh(option, short = 'b', default = "\"localhost:7878\".to_string()")] - bind: String, - - /// directory in which persist the data - #[argh(option, short = 'f')] - file: String, -} - #[async_std::main] pub async fn main() -> Result<()> { - let args: Args = argh::from_env(); - let store = Store::open(args.file)?; + let matches = App::new("Oxigraph SPARQL server") + .arg( + Arg::with_name("bind") + .short("b") + .long("bind") + .help("Sets a custom config file") + .takes_value(true), + ) + .arg( + Arg::with_name("file") + .short("f") + .long("file") + .help("directory in which persist the data") + .takes_value(true) + .required(true), + ) + .get_matches(); + let bind = matches.value_of("bind").unwrap_or("localhost:7878"); + let file = matches.value_of("file").unwrap(); - println!("Listening for requests at http://{}", &args.bind); - http_server(&args.bind, move |request| { - handle_request(request, store.clone()) - }) - .await + let store = Store::open(file)?; + println!("Listening for requests at http://{}", &bind); + http_server(&bind, move |request| handle_request(request, store.clone())).await } async fn handle_request(request: Request, store: Store) -> Result { diff --git a/wikibase/Cargo.toml b/wikibase/Cargo.toml index 07bf1352..8d2d447f 100644 --- a/wikibase/Cargo.toml +++ b/wikibase/Cargo.toml @@ -11,7 +11,7 @@ SPARQL server based on Oxigraph for Wikibase instances edition = "2018" [dependencies] -argh = "0.1" +clap = "2" async-std = { version = "1", features = ["attributes"] } async-h1 = "2" chrono = "0.4" diff --git a/wikibase/src/main.rs b/wikibase/src/main.rs index 021fd589..e688f14a 100644 --- a/wikibase/src/main.rs +++ b/wikibase/src/main.rs @@ -10,11 +10,11 @@ )] use crate::loader::WikibaseLoader; -use argh::FromArgs; use async_std::future::Future; use async_std::net::{TcpListener, TcpStream}; use async_std::prelude::*; use async_std::task::spawn; +use clap::{App, Arg}; use http_types::content::ContentType; use http_types::{ bail_status, format_err_status, headers, Error, Method, Mime, Request, Response, Result, @@ -33,43 +33,57 @@ mod loader; const MAX_SPARQL_BODY_SIZE: u64 = 1_048_576; const SERVER: &str = concat!("Oxigraph/", env!("CARGO_PKG_VERSION")); -#[derive(FromArgs)] -/// Oxigraph SPARQL server for Wikibase -struct Args { - /// specify a server socket to bind using the format $(HOST):$(PORT) - #[argh(option, short = 'b', default = "\"localhost:7878\".to_string()")] - bind: String, - - /// directory in which persist the data - #[argh(option, short = 'f')] - file: String, - - #[argh(option)] - /// base URL of the MediaWiki API like https://www.wikidata.org/w/api.php - mediawiki_api: String, - - #[argh(option)] - /// base URL of MediaWiki like https://www.wikidata.org/wiki/ - mediawiki_base_url: String, - - #[argh(option)] - /// namespaces ids to load like "0,120" - namespaces: Option, - - #[argh(option)] - /// slot to load like "mediainfo". Could not be use with namespaces - slot: Option, -} - #[async_std::main] pub async fn main() -> Result<()> { - let args: Args = argh::from_env(); - - let store = RocksDbStore::open(args.file)?; - let mediawiki_api = args.mediawiki_api.clone(); - let mediawiki_base_url = args.mediawiki_base_url.clone(); - let namespaces = args - .namespaces + let matches = App::new("Oxigraph SPARQL server for Wikibase") + .arg( + Arg::with_name("bind") + .short("b") + .long("bind") + .help("Sets a custom config file") + .takes_value(true), + ) + .arg( + Arg::with_name("file") + .short("f") + .long("file") + .help("directory in which persist the data") + .takes_value(true) + .required(true), + ) + .arg( + Arg::with_name("mediawiki_api") + .long("mediawiki_api") + .help("base URL of the MediaWiki API like https://www.wikidata.org/w/api.php") + .takes_value(true) + .required(true), + ) + .arg( + Arg::with_name("mediawiki_base_url") + .long("mediawiki_base_url") + .help("base URL of MediaWiki like https://www.wikidata.org/wiki/") + .takes_value(true) + .required(true), + ) + .arg( + Arg::with_name("namespaces") + .long("namespaces") + .help("namespaces ids to load like '0,120'") + .takes_value(true), + ) + .arg( + Arg::with_name("slot") + .long("slot") + .help("slot to load like 'mediainfo'. Could not be use with namespaces") + .takes_value(true), + ) + .get_matches(); + let bind = matches.value_of("bind").unwrap_or("localhost:7878"); + let file = matches.value_of("file").unwrap(); + let mediawiki_api = matches.value_of("mediawiki_api").unwrap(); + let mediawiki_base_url = matches.value_of("mediawiki_base_url").unwrap(); + let namespaces = matches + .value_of("namespaces") .as_deref() .unwrap_or("") .split(',') @@ -82,7 +96,9 @@ pub async fn main() -> Result<()> { } }) .collect::>(); - let slot = args.slot.clone(); + let slot = matches.value_of("slot"); + + let store = RocksDbStore::open(file)?; let repo = store.clone(); let mut loader = WikibaseLoader::new( repo, @@ -98,12 +114,9 @@ pub async fn main() -> Result<()> { loader.update_loop(); }); - println!("Listening for requests at http://{}", &args.bind); + println!("Listening for requests at http://{}", &bind); - http_server(&args.bind, move |request| { - handle_request(request, store.clone()) - }) - .await + http_server(&bind, move |request| handle_request(request, store.clone())).await } async fn handle_request(request: Request, store: RocksDbStore) -> Result { From 35ecc12557c033b06612505017724177a2a5c91b Mon Sep 17 00:00:00 2001 From: Tpt Date: Sat, 10 Jul 2021 18:53:57 +0200 Subject: [PATCH 05/30] Upgrades pyo3 to 0.14 --- python/src/io.rs | 4 ++-- python/src/memory_store.rs | 24 +++++++++++++----------- python/src/model.rs | 12 ++++++------ python/src/sled_store.rs | 24 +++++++++++++----------- 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/python/src/io.rs b/python/src/io.rs index 97086601..1327b63a 100644 --- a/python/src/io.rs +++ b/python/src/io.rs @@ -46,7 +46,7 @@ pub fn add_to_module(module: &PyModule) -> PyResult<()> { /// >>> list(parse(input, "text/turtle", base_iri="http://example.com/")) /// [ predicate= object=>>] #[pyfunction] -#[text_signature = "(input, /, mime_type, *, base_iri = None)"] +#[pyo3(text_signature = "(input, /, mime_type, *, base_iri = None)")] pub fn parse( input: PyObject, mime_type: &str, @@ -112,7 +112,7 @@ pub fn parse( /// >>> output.getvalue() /// b' "1" .\n' #[pyfunction] -#[text_signature = "(input, output, /, mime_type, *, base_iri = None)"] +#[pyo3(text_signature = "(input, output, /, mime_type, *, base_iri = None)")] pub fn serialize(input: &PyAny, output: PyObject, mime_type: &str) -> PyResult<()> { let output = PyFileLike::new(output); if let Some(graph_format) = GraphFormat::from_media_type(mime_type) { diff --git a/python/src/memory_store.rs b/python/src/memory_store.rs index 5202f38f..f8e1b54b 100644 --- a/python/src/memory_store.rs +++ b/python/src/memory_store.rs @@ -25,7 +25,7 @@ use std::io::BufReader; /// ' "1" .\n' #[pyclass(name = "MemoryStore", module = "oxigraph")] #[derive(Eq, PartialEq, Clone)] -#[text_signature = "()"] +#[pyo3(text_signature = "()")] pub struct PyMemoryStore { inner: MemoryStore, } @@ -48,7 +48,7 @@ impl PyMemoryStore { /// >>> store.add(Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), NamedNode('http://example.com/g'))) /// >>> list(store) /// [ predicate= object=> graph_name=>] - #[text_signature = "($self, quad)"] + #[pyo3(text_signature = "($self, quad)")] fn add(&self, quad: PyQuad) { self.inner.insert(quad) } @@ -64,7 +64,7 @@ impl PyMemoryStore { /// >>> store.remove(quad) /// >>> list(store) /// [] - #[text_signature = "($self, quad)"] + #[pyo3(text_signature = "($self, quad)")] fn remove(&self, quad: &PyQuad) { self.inner.remove(quad) } @@ -86,7 +86,7 @@ impl PyMemoryStore { /// >>> store.add(Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), NamedNode('http://example.com/g'))) /// >>> list(store.quads_for_pattern(NamedNode('http://example.com'), None, None, None)) /// [ predicate= object=> graph_name=>] - #[text_signature = "($self, subject, predicate, object, graph_name = None)"] + #[pyo3(text_signature = "($self, subject, predicate, object, graph_name = None)")] fn quads_for_pattern( &self, subject: &PyAny, @@ -140,7 +140,9 @@ impl PyMemoryStore { /// >>> store.add(Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'))) /// >>> store.query('ASK { ?s ?p ?o }') /// True - #[text_signature = "($self, query, *, use_default_graph_as_union, default_graph, named_graphs)"] + #[pyo3( + text_signature = "($self, query, *, use_default_graph_as_union, default_graph, named_graphs)" + )] #[args( query, "*", @@ -197,7 +199,7 @@ impl PyMemoryStore { /// >>> store.update('DELETE WHERE { ?p ?o }') /// >>> list(store) /// [] - #[text_signature = "($self, update)"] + #[pyo3(text_signature = "($self, update)")] fn update(&self, update: &str) -> PyResult<()> { self.inner.update(update).map_err(map_evaluation_error) } @@ -231,7 +233,7 @@ impl PyMemoryStore { /// >>> store.load(io.BytesIO(b'

"1" .'), "text/turtle", base_iri="http://example.com/", to_graph=NamedNode("http://example.com/g")) /// >>> list(store) /// [ predicate= object=> graph_name=>] - #[text_signature = "($self, input, /, mime_type, *, base_iri = None, to_graph = None)"] + #[pyo3(text_signature = "($self, input, /, mime_type, *, base_iri = None, to_graph = None)")] #[args(input, mime_type, "*", base_iri = "None", to_graph = "None")] fn load( &self, @@ -300,7 +302,7 @@ impl PyMemoryStore { /// >>> store.dump(output, "text/turtle", from_graph=NamedNode("http://example.com/g")) /// >>> output.getvalue() /// b' "1" .\n' - #[text_signature = "($self, output, /, mime_type, *, from_graph = None)"] + #[pyo3(text_signature = "($self, output, /, mime_type, *, from_graph = None)")] #[args(output, mime_type, "*", from_graph = "None")] fn dump(&self, output: PyObject, mime_type: &str, from_graph: Option<&PyAny>) -> PyResult<()> { let from_graph_name = if let Some(graph_name) = from_graph { @@ -343,7 +345,7 @@ impl PyMemoryStore { /// >>> store.add(Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), NamedNode('http://example.com/g'))) /// >>> list(store.named_graphs()) /// [] - #[text_signature = "($self)"] + #[pyo3(text_signature = "($self)")] fn named_graphs(&self) -> GraphNameIter { GraphNameIter { inner: self.inner.named_graphs(), @@ -359,7 +361,7 @@ impl PyMemoryStore { /// >>> store.add_graph(NamedNode('http://example.com/g')) /// >>> list(store.named_graphs()) /// [] - #[text_signature = "($self, graph_name)"] + #[pyo3(text_signature = "($self, graph_name)")] fn add_graph(&self, graph_name: PyGraphName) { match graph_name { PyGraphName::DefaultGraph(_) => (), @@ -380,7 +382,7 @@ impl PyMemoryStore { /// >>> store.remove_graph(NamedNode('http://example.com/g')) /// >>> list(store) /// [] - #[text_signature = "($self, graph_name)"] + #[pyo3(text_signature = "($self, graph_name)")] fn remove_graph(&self, graph_name: &PyAny) -> PyResult<()> { match PyGraphNameRef::try_from(graph_name)? { PyGraphNameRef::DefaultGraph => self.inner.clear_graph(GraphNameRef::DefaultGraph), diff --git a/python/src/model.rs b/python/src/model.rs index f30e67d0..30bdecd9 100644 --- a/python/src/model.rs +++ b/python/src/model.rs @@ -21,7 +21,7 @@ use std::vec::IntoIter; /// >>> str(NamedNode('http://example.com')) /// '' #[pyclass(name = "NamedNode", module = "oxigraph")] -#[text_signature = "(value)"] +#[pyo3(text_signature = "(value)")] #[derive(Eq, PartialEq, Ord, PartialOrd, Debug, Clone, Hash)] pub struct PyNamedNode { inner: NamedNode, @@ -120,7 +120,7 @@ impl PyObjectProtocol for PyNamedNode { /// >>> str(BlankNode('ex')) /// '_:ex' #[pyclass(name = "BlankNode", module = "oxigraph")] -#[text_signature = "(value)"] +#[pyo3(text_signature = "(value)")] #[derive(Eq, PartialEq, Debug, Clone, Hash)] pub struct PyBlankNode { inner: BlankNode, @@ -230,7 +230,7 @@ impl PyObjectProtocol for PyBlankNode { /// >>> str(Literal('11', datatype=NamedNode('http://www.w3.org/2001/XMLSchema#integer'))) /// '"11"^^' #[pyclass(name = "Literal", module = "oxigraph")] -#[text_signature = "(value, *, datatype = None, language = None)"] +#[pyo3(text_signature = "(value, *, datatype = None, language = None)")] #[derive(Eq, PartialEq, Debug, Clone, Hash)] pub struct PyLiteral { inner: Literal, @@ -493,7 +493,7 @@ impl IntoPy for PyTerm { /// >>> (s, p, o) = Triple(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1')) #[pyclass(name = "Triple", module = "oxigraph")] #[derive(Eq, PartialEq, Debug, Clone, Hash)] -#[text_signature = "(subject, predicate, object)"] +#[pyo3(text_signature = "(subject, predicate, object)")] pub struct PyTriple { inner: Triple, } @@ -672,7 +672,7 @@ impl IntoPy for PyGraphName { /// /// >>> (s, p, o, g) = Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), NamedNode('http://example.com/g')) #[pyclass(name = "Quad", module = "oxigraph")] -#[text_signature = "(subject, predicate, object, graph_name = None)"] +#[pyo3(text_signature = "(subject, predicate, object, graph_name = None)")] #[derive(Eq, PartialEq, Debug, Clone, Hash)] pub struct PyQuad { inner: Quad, @@ -843,7 +843,7 @@ impl PyIterProtocol for PyQuad { /// >>> str(Variable('foo')) /// '?foo' #[pyclass(name = "Variable", module = "oxigraph")] -#[text_signature = "(value)"] +#[pyo3(text_signature = "(value)")] #[derive(Eq, PartialEq, Debug, Clone, Hash)] pub struct PyVariable { inner: Variable, diff --git a/python/src/sled_store.rs b/python/src/sled_store.rs index 9c24b406..af404c1a 100644 --- a/python/src/sled_store.rs +++ b/python/src/sled_store.rs @@ -31,7 +31,7 @@ use std::io::BufReader; /// >>> str(store) /// ' "1" .\n' #[pyclass(name = "SledStore", module = "oxigraph")] -#[text_signature = "(path = None)"] +#[pyo3(text_signature = "(path = None)")] #[derive(Clone)] pub struct PySledStore { inner: SledStore, @@ -61,7 +61,7 @@ impl PySledStore { /// >>> store.add(Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), NamedNode('http://example.com/g'))) /// >>> list(store) /// [ predicate= object=> graph_name=>] - #[text_signature = "($self, quad)"] + #[pyo3(text_signature = "($self, quad)")] fn add(&self, quad: &PyQuad) -> PyResult<()> { self.inner.insert(quad).map_err(map_io_err) } @@ -78,7 +78,7 @@ impl PySledStore { /// >>> store.remove(quad) /// >>> list(store) /// [] - #[text_signature = "($self, quad)"] + #[pyo3(text_signature = "($self, quad)")] fn remove(&self, quad: &PyQuad) -> PyResult<()> { self.inner.remove(quad).map_err(map_io_err) } @@ -101,7 +101,7 @@ impl PySledStore { /// >>> store.add(Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), NamedNode('http://example.com/g'))) /// >>> list(store.quads_for_pattern(NamedNode('http://example.com'), None, None, None)) /// [ predicate= object=> graph_name=>] - #[text_signature = "($self, subject, predicate, object, graph_name = None)"] + #[pyo3(text_signature = "($self, subject, predicate, object, graph_name = None)")] fn quads_for_pattern( &self, subject: &PyAny, @@ -156,7 +156,9 @@ impl PySledStore { /// >>> store.add(Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'))) /// >>> store.query('ASK { ?s ?p ?o }') /// True - #[text_signature = "($self, query, *, use_default_graph_as_union, default_graph, named_graphs)"] + #[pyo3( + text_signature = "($self, query, *, use_default_graph_as_union, default_graph, named_graphs)" + )] #[args( query, "*", @@ -214,7 +216,7 @@ impl PySledStore { /// >>> store.update('DELETE WHERE { ?p ?o }') /// >>> list(store) /// [] - #[text_signature = "($self, update)"] + #[pyo3(text_signature = "($self, update)")] fn update(&self, update: &str) -> PyResult<()> { self.inner.update(update).map_err(map_evaluation_error) } @@ -249,7 +251,7 @@ impl PySledStore { /// >>> store.load(io.BytesIO(b'

"1" .'), "text/turtle", base_iri="http://example.com/", to_graph=NamedNode("http://example.com/g")) /// >>> list(store) /// [ predicate= object=> graph_name=>] - #[text_signature = "($self, data, /, mime_type, *, base_iri = None, to_graph = None)"] + #[pyo3(text_signature = "($self, data, /, mime_type, *, base_iri = None, to_graph = None)")] #[args(input, mime_type, "*", base_iri = "None", to_graph = "None")] fn load( &self, @@ -319,7 +321,7 @@ impl PySledStore { /// >>> store.dump(output, "text/turtle", from_graph=NamedNode("http://example.com/g")) /// >>> output.getvalue() /// b' "1" .\n' - #[text_signature = "($self, output, /, mime_type, *, from_graph = None)"] + #[pyo3(text_signature = "($self, output, /, mime_type, *, from_graph = None)")] #[args(output, mime_type, "*", from_graph = "None")] fn dump(&self, output: PyObject, mime_type: &str, from_graph: Option<&PyAny>) -> PyResult<()> { let from_graph_name = if let Some(graph_name) = from_graph { @@ -363,7 +365,7 @@ impl PySledStore { /// >>> store.add(Quad(NamedNode('http://example.com'), NamedNode('http://example.com/p'), Literal('1'), NamedNode('http://example.com/g'))) /// >>> list(store.named_graphs()) /// [] - #[text_signature = "($self)"] + #[pyo3(text_signature = "($self)")] fn named_graphs(&self) -> GraphNameIter { GraphNameIter { inner: self.inner.named_graphs(), @@ -380,7 +382,7 @@ impl PySledStore { /// >>> store.add_graph(NamedNode('http://example.com/g')) /// >>> list(store.named_graphs()) /// [] - #[text_signature = "($self, graph_name)"] + #[pyo3(text_signature = "($self, graph_name)")] fn add_graph(&self, graph_name: &PyAny) -> PyResult<()> { match PyGraphNameRef::try_from(graph_name)? { PyGraphNameRef::DefaultGraph => Ok(()), @@ -407,7 +409,7 @@ impl PySledStore { /// >>> store.remove_graph(NamedNode('http://example.com/g')) /// >>> list(store) /// [] - #[text_signature = "($self, graph_name)"] + #[pyo3(text_signature = "($self, graph_name)")] fn remove_graph(&self, graph_name: &PyAny) -> PyResult<()> { match PyGraphNameRef::try_from(graph_name)? { PyGraphNameRef::DefaultGraph => self.inner.clear_graph(GraphNameRef::DefaultGraph), From f898dd09ccb077c41e79bc9880db0028ffbf988b Mon Sep 17 00:00:00 2001 From: Tpt Date: Sun, 11 Jul 2021 12:37:37 +0200 Subject: [PATCH 06/30] Makes Clippy happy --- lib/src/lib.rs | 1 - lib/src/model/xsd/date_time.rs | 18 +++++++++--------- lib/src/model/xsd/decimal.rs | 6 +++--- lib/src/model/xsd/duration.rs | 6 +++--- lib/src/store/binary_encoder.rs | 2 +- lib/src/store/rocksdb.rs | 12 ++++-------- lib/src/store/sled.rs | 10 ++-------- 7 files changed, 22 insertions(+), 33 deletions(-) diff --git a/lib/src/lib.rs b/lib/src/lib.rs index 3e7c7ffd..2c5af743 100644 --- a/lib/src/lib.rs +++ b/lib/src/lib.rs @@ -76,7 +76,6 @@ clippy::explicit_iter_loop, clippy::expl_impl_clone_on_copy, clippy::fallible_impl_from, - clippy::filter_map, clippy::filter_map_next, clippy::manual_find_map, clippy::get_unwrap, diff --git a/lib/src/model/xsd/date_time.rs b/lib/src/model/xsd/date_time.rs index 90f04873..a2646ca8 100644 --- a/lib/src/model/xsd/date_time.rs +++ b/lib/src/model/xsd/date_time.rs @@ -104,7 +104,7 @@ impl DateTime { } } - pub fn to_be_bytes(&self) -> [u8; 18] { + pub fn to_be_bytes(self) -> [u8; 18] { self.timestamp.to_be_bytes() } @@ -283,7 +283,7 @@ impl Time { self.timestamp.timezone_offset() } - pub fn to_be_bytes(&self) -> [u8; 18] { + pub fn to_be_bytes(self) -> [u8; 18] { self.timestamp.to_be_bytes() } @@ -435,7 +435,7 @@ impl Date { self.timestamp.timezone_offset() } - pub fn to_be_bytes(&self) -> [u8; 18] { + pub fn to_be_bytes(self) -> [u8; 18] { self.timestamp.to_be_bytes() } @@ -576,7 +576,7 @@ impl GYearMonth { self.timestamp.timezone_offset() } - pub fn to_be_bytes(&self) -> [u8; 18] { + pub fn to_be_bytes(self) -> [u8; 18] { self.timestamp.to_be_bytes() } @@ -671,7 +671,7 @@ impl GYear { self.timestamp.timezone_offset() } - pub fn to_be_bytes(&self) -> [u8; 18] { + pub fn to_be_bytes(self) -> [u8; 18] { self.timestamp.to_be_bytes() } @@ -775,7 +775,7 @@ impl GMonthDay { self.timestamp.timezone_offset() } - pub fn to_be_bytes(&self) -> [u8; 18] { + pub fn to_be_bytes(self) -> [u8; 18] { self.timestamp.to_be_bytes() } @@ -866,7 +866,7 @@ impl GMonth { self.timestamp.timezone_offset() } - pub fn to_be_bytes(&self) -> [u8; 18] { + pub fn to_be_bytes(self) -> [u8; 18] { self.timestamp.to_be_bytes() } @@ -969,7 +969,7 @@ impl GDay { self.timestamp.timezone_offset() } - pub fn to_be_bytes(&self) -> [u8; 18] { + pub fn to_be_bytes(self) -> [u8; 18] { self.timestamp.to_be_bytes() } @@ -1326,7 +1326,7 @@ impl Timestamp { }) } - fn to_be_bytes(&self) -> [u8; 18] { + fn to_be_bytes(self) -> [u8; 18] { let mut bytes = [0; 18]; bytes[0..16].copy_from_slice(&self.value.to_be_bytes()); bytes[16..18].copy_from_slice(&match &self.timezone_offset { diff --git a/lib/src/model/xsd/decimal.rs b/lib/src/model/xsd/decimal.rs index 52fed161..04c49a71 100644 --- a/lib/src/model/xsd/decimal.rs +++ b/lib/src/model/xsd/decimal.rs @@ -39,7 +39,7 @@ impl Decimal { } #[inline] - pub fn to_be_bytes(&self) -> [u8; 16] { + pub fn to_be_bytes(self) -> [u8; 16] { self.value.to_be_bytes() } @@ -159,7 +159,7 @@ impl Decimal { /// Creates a `f32` from a `Decimal` without taking care of precision #[inline] #[allow(clippy::cast_possible_truncation)] - pub fn to_f32(&self) -> f32 { + pub fn to_f32(self) -> f32 { self.to_f64() as f32 } @@ -175,7 +175,7 @@ impl Decimal { /// Creates a `f64` from a `Decimal` without taking care of precision #[inline] #[allow(clippy::cast_possible_truncation, clippy::cast_precision_loss)] - pub fn to_f64(&self) -> f64 { + pub fn to_f64(self) -> f64 { (self.value as f64) / (DECIMAL_PART_POW as f64) } diff --git a/lib/src/model/xsd/duration.rs b/lib/src/model/xsd/duration.rs index 5349c167..3ea41ea2 100644 --- a/lib/src/model/xsd/duration.rs +++ b/lib/src/model/xsd/duration.rs @@ -74,7 +74,7 @@ impl Duration { self.day_time.all_seconds() } - pub fn to_be_bytes(&self) -> [u8; 24] { + pub fn to_be_bytes(self) -> [u8; 24] { let mut bytes = [0; 24]; bytes[0..8].copy_from_slice(&self.year_month.to_be_bytes()); bytes[8..24].copy_from_slice(&self.day_time.to_be_bytes()); @@ -273,7 +273,7 @@ impl YearMonthDuration { self.months } - pub fn to_be_bytes(&self) -> [u8; 8] { + pub fn to_be_bytes(self) -> [u8; 8] { self.months.to_be_bytes() } @@ -425,7 +425,7 @@ impl DayTimeDuration { self.seconds } - pub fn to_be_bytes(&self) -> [u8; 16] { + pub fn to_be_bytes(self) -> [u8; 16] { self.seconds.to_be_bytes() } diff --git a/lib/src/store/binary_encoder.rs b/lib/src/store/binary_encoder.rs index 95a81866..f8611443 100644 --- a/lib/src/store/binary_encoder.rs +++ b/lib/src/store/binary_encoder.rs @@ -74,7 +74,7 @@ impl StrHash { } #[inline] - pub fn to_be_bytes(&self) -> [u8; 16] { + pub fn to_be_bytes(self) -> [u8; 16] { self.hash.to_be_bytes() } } diff --git a/lib/src/store/rocksdb.rs b/lib/src/store/rocksdb.rs index c95c5070..49970a85 100644 --- a/lib/src/store/rocksdb.rs +++ b/lib/src/store/rocksdb.rs @@ -957,7 +957,6 @@ impl WritableEncodedStore for AutoBatchWriter<'_> { write_osp_quad(&mut self.buffer, quad); self.batch.put_cf(self.store.dosp_cf(), &self.buffer, &[]); - self.buffer.clear(); } else { write_spog_quad(&mut self.buffer, quad); self.batch.put_cf(self.store.spog_cf(), &self.buffer, &[]); @@ -985,8 +984,8 @@ impl WritableEncodedStore for AutoBatchWriter<'_> { write_term(&mut self.buffer, quad.graph_name); self.batch.put_cf(self.store.graphs_cf(), &self.buffer, &[]); - self.buffer.clear(); } + self.buffer.clear(); self.apply_if_big() } @@ -1003,7 +1002,6 @@ impl WritableEncodedStore for AutoBatchWriter<'_> { write_osp_quad(&mut self.buffer, quad); self.batch.delete_cf(self.store.dosp_cf(), &self.buffer); - self.buffer.clear(); } else { write_spog_quad(&mut self.buffer, quad); self.batch.delete_cf(self.store.spog_cf(), &self.buffer); @@ -1027,8 +1025,8 @@ impl WritableEncodedStore for AutoBatchWriter<'_> { write_gosp_quad(&mut self.buffer, quad); self.batch.delete_cf(self.store.gosp_cf(), &self.buffer); - self.buffer.clear(); } + self.buffer.clear(); self.apply_if_big() } @@ -1212,7 +1210,6 @@ impl WritableEncodedStore for RocksDbTransaction<'_> { write_osp_quad(&mut self.buffer, quad); self.batch.put_cf(self.store.dosp_cf(), &self.buffer, &[]); - self.buffer.clear(); } else { write_spog_quad(&mut self.buffer, quad); self.batch.put_cf(self.store.spog_cf(), &self.buffer, &[]); @@ -1240,8 +1237,8 @@ impl WritableEncodedStore for RocksDbTransaction<'_> { write_term(&mut self.buffer, quad.graph_name); self.batch.put_cf(self.store.graphs_cf(), &self.buffer, &[]); - self.buffer.clear(); } + self.buffer.clear(); Ok(()) } @@ -1258,7 +1255,6 @@ impl WritableEncodedStore for RocksDbTransaction<'_> { write_osp_quad(&mut self.buffer, quad); self.batch.delete_cf(self.store.dosp_cf(), &self.buffer); - self.buffer.clear(); } else { write_spog_quad(&mut self.buffer, quad); self.batch.delete_cf(self.store.spog_cf(), &self.buffer); @@ -1282,8 +1278,8 @@ impl WritableEncodedStore for RocksDbTransaction<'_> { write_gosp_quad(&mut self.buffer, quad); self.batch.delete_cf(self.store.gosp_cf(), &self.buffer); - self.buffer.clear(); } + self.buffer.clear(); Ok(()) } diff --git a/lib/src/store/sled.rs b/lib/src/store/sled.rs index e52b54a5..bee38660 100644 --- a/lib/src/store/sled.rs +++ b/lib/src/store/sled.rs @@ -1049,7 +1049,6 @@ impl<'a> WritableEncodedStore for &'a SledStore { write_osp_quad(&mut buffer, quad); self.dosp.insert(buffer.as_slice(), &[])?; - buffer.clear(); } else { write_spog_quad(&mut buffer, quad); self.spog.insert(buffer.as_slice(), &[])?; @@ -1077,7 +1076,6 @@ impl<'a> WritableEncodedStore for &'a SledStore { write_term(&mut buffer, quad.graph_name); self.graphs.insert(&buffer, &[])?; - buffer.clear(); } Ok(()) @@ -1097,7 +1095,6 @@ impl<'a> WritableEncodedStore for &'a SledStore { write_osp_quad(&mut buffer, quad); self.dosp.remove(buffer.as_slice())?; - buffer.clear(); } else { write_spog_quad(&mut buffer, quad); self.spog.remove(buffer.as_slice())?; @@ -1121,7 +1118,6 @@ impl<'a> WritableEncodedStore for &'a SledStore { write_gosp_quad(&mut buffer, quad); self.gosp.remove(buffer.as_slice())?; - buffer.clear(); } Ok(()) @@ -1352,7 +1348,6 @@ impl<'a> WritableEncodedStore for &'a SledTransaction<'a> { write_osp_quad(&mut buffer, quad); self.dosp.insert(buffer.as_slice(), &[])?; - buffer.clear(); } else { write_spog_quad(&mut buffer, quad); self.spog.insert(buffer.as_slice(), &[])?; @@ -1380,8 +1375,8 @@ impl<'a> WritableEncodedStore for &'a SledTransaction<'a> { write_term(&mut buffer, quad.graph_name); self.graphs.insert(buffer.as_slice(), &[])?; - buffer.clear(); } + buffer.clear(); Ok(()) } @@ -1403,7 +1398,6 @@ impl<'a> WritableEncodedStore for &'a SledTransaction<'a> { write_osp_quad(&mut buffer, quad); self.dosp.remove(buffer.as_slice())?; - buffer.clear(); } else { write_spog_quad(&mut buffer, quad); self.spog.remove(buffer.as_slice())?; @@ -1427,8 +1421,8 @@ impl<'a> WritableEncodedStore for &'a SledTransaction<'a> { write_gosp_quad(&mut buffer, quad); self.gosp.remove(buffer.as_slice())?; - buffer.clear(); } + buffer.clear(); Ok(()) } From c33fe7fab2c2bb75c83f2216772e209e4779f515 Mon Sep 17 00:00:00 2001 From: Tpt Date: Sun, 11 Jul 2021 12:45:24 +0200 Subject: [PATCH 07/30] Commit Cargo.lock Allows release build to avoid failing because of dependency problems --- Cargo.lock | 2943 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2943 insertions(+) create mode 100644 Cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 index 00000000..9ccd80d4 --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,2943 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "aead" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" +dependencies = [ + "generic-array", +] + +[[package]] +name = "aes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +dependencies = [ + "aes-soft", + "aesni", + "cipher", +] + +[[package]] +name = "aes-gcm" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "aes-soft" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" +dependencies = [ + "cipher", + "opaque-debug", +] + +[[package]] +name = "aesni" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" +dependencies = [ + "cipher", + "opaque-debug", +] + +[[package]] +name = "ahash" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" +dependencies = [ + "getrandom 0.2.3", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "anyhow" +version = "1.0.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" + +[[package]] +name = "argh" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e7317a549bc17c5278d9e72bb6e62c6aa801ac2567048e39ebc1c194249323e" +dependencies = [ + "argh_derive", + "argh_shared", +] + +[[package]] +name = "argh_derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60949c42375351e9442e354434b0cba2ac402c1237edf673cac3a4bf983b8d3c" +dependencies = [ + "argh_shared", + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "argh_shared" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a61eb019cb8f415d162cb9f12130ee6bbe9168b7d953c17f4ad049e4051ca00" + +[[package]] +name = "arrayvec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" + +[[package]] +name = "async-attributes" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "async-channel" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-dup" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7427a12b8dc09291528cfb1da2447059adb4a257388c2acd6497a79d55cf6f7c" +dependencies = [ + "futures-io", + "simple-mutex", +] + +[[package]] +name = "async-executor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "once_cell", + "slab", +] + +[[package]] +name = "async-global-executor" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6" +dependencies = [ + "async-channel", + "async-executor", + "async-io", + "async-mutex", + "blocking", + "futures-lite", + "num_cpus", + "once_cell", +] + +[[package]] +name = "async-h1" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc5142de15b549749cce62923a50714b0d7b77f5090ced141599e78899865451" +dependencies = [ + "async-channel", + "async-dup", + "async-std", + "byte-pool", + "futures-core", + "http-types", + "httparse", + "lazy_static", + "log", + "pin-project", +] + +[[package]] +name = "async-io" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" +dependencies = [ + "concurrent-queue", + "futures-lite", + "libc", + "log", + "once_cell", + "parking", + "polling", + "slab", + "socket2", + "waker-fn", + "winapi 0.3.9", +] + +[[package]] +name = "async-lock" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-mutex" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-native-tls" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9e7a929bd34c68a82d58a4de7f86fffdaf97fb2af850162a7bb19dd7269b33" +dependencies = [ + "async-std", + "native-tls", + "thiserror", + "url", +] + +[[package]] +name = "async-std" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341" +dependencies = [ + "async-attributes", + "async-channel", + "async-global-executor", + "async-io", + "async-lock", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "num_cpus", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-task" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" + +[[package]] +name = "async-trait" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atomic-waker" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "base-x" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" + +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + +[[package]] +name = "bindgen" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d" +dependencies = [ + "bitflags", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", +] + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" + +[[package]] +name = "bitvec" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9" +dependencies = [ + "async-channel", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "once_cell", +] + +[[package]] +name = "bstr" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +dependencies = [ + "lazy_static", + "memchr", + "regex-automata", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" + +[[package]] +name = "byte-pool" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c7230ddbb427b1094d477d821a99f3f54d36333178eeb806e279bcdcecf0ca" +dependencies = [ + "crossbeam-queue", + "stable_deref_trait", +] + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" + +[[package]] +name = "cache-padded" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" + +[[package]] +name = "cast" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" +dependencies = [ + "rustc_version 0.4.0", +] + +[[package]] +name = "cc" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cexpr" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +dependencies = [ + "nom 5.1.2", +] + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "time 0.1.43", + "winapi 0.3.9", +] + +[[package]] +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array", +] + +[[package]] +name = "clang-sys" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "2.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "concurrent-queue" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" +dependencies = [ + "cache-padded", +] + +[[package]] +name = "config" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" +dependencies = [ + "lazy_static", + "nom 5.1.2", + "serde", +] + +[[package]] +name = "console_error_panic_hook" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211" +dependencies = [ + "cfg-if 0.1.10", + "wasm-bindgen", +] + +[[package]] +name = "const_fn" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" + +[[package]] +name = "cookie" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" +dependencies = [ + "aes-gcm", + "base64", + "hkdf", + "hmac", + "percent-encoding", + "rand 0.8.4", + "sha2", + "time 0.2.27", + "version_check", +] + +[[package]] +name = "core-foundation" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" + +[[package]] +name = "cpufeatures" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +dependencies = [ + "libc", +] + +[[package]] +name = "cpuid-bool" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" + +[[package]] +name = "crc32fast" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "criterion" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" +dependencies = [ + "atty", + "cast", + "clap", + "criterion-plot", + "csv", + "itertools 0.10.1", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_cbor", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" +dependencies = [ + "cast", + "itertools 0.9.0", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", + "lazy_static", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +dependencies = [ + "cfg-if 1.0.0", + "lazy_static", +] + +[[package]] +name = "crypto-mac" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "csv" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +dependencies = [ + "bstr", + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +dependencies = [ + "memchr", +] + +[[package]] +name = "ctor" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "ctr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" +dependencies = [ + "cipher", +] + +[[package]] +name = "dashmap" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +dependencies = [ + "cfg-if 1.0.0", + "num_cpus", +] + +[[package]] +name = "data-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" + +[[package]] +name = "deadpool" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d126179d86aee4556e54f5f3c6bf6d9884e7cc52cef82f77ee6f90a7747616d" +dependencies = [ + "async-trait", + "config", + "crossbeam-queue", + "num_cpus", + "serde", + "tokio", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "event-listener" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" + +[[package]] +name = "fastrand" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77b705829d1e87f762c2df6da140b26af5839e1033aa84aa5f56bb688e4e1bdb" +dependencies = [ + "instant", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding", +] + +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + +[[package]] +name = "futures" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" + +[[package]] +name = "futures-executor" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" + +[[package]] +name = "futures-lite" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-macro" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" +dependencies = [ + "autocfg", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" + +[[package]] +name = "futures-task" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" + +[[package]] +name = "futures-util" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" +dependencies = [ + "autocfg", + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "proc-macro-hack", + "proc-macro-nested", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generic-array" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "libc", + "wasi 0.10.2+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "ghash" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "gloo-timers" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "half" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "hmac" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" +dependencies = [ + "crypto-mac", + "digest", +] + +[[package]] +name = "http" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-client" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce318d86a47d18d1db645c979214f809a6cd625202ad334ef75ca813b30dac80" +dependencies = [ + "async-h1", + "async-native-tls", + "async-std", + "async-trait", + "cfg-if 1.0.0", + "dashmap", + "deadpool", + "futures", + "http-types", + "log", +] + +[[package]] +name = "http-types" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad077d89137cd3debdce53c66714dc536525ef43fe075d41ddc0a8ac11f85957" +dependencies = [ + "anyhow", + "async-channel", + "async-std", + "base64", + "cookie", + "futures-lite", + "infer", + "pin-project-lite", + "rand 0.7.3", + "serde", + "serde_json", + "serde_qs", + "serde_urlencoded", + "url", +] + +[[package]] +name = "httparse" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indoc" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" +dependencies = [ + "indoc-impl", + "proc-macro-hack", +] + +[[package]] +name = "indoc-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", + "unindent", +] + +[[package]] +name = "infer" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" + +[[package]] +name = "instant" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "itertools" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" + +[[package]] +name = "jobserver" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-event-parser" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db6cac6ee713bbade4ee83bd25932231f148812bf1377016808e18fc4cc4c1fa" + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + +[[package]] +name = "lasso" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8647c8a01e5f7878eacb2c323c4c949fdb63773110f0686c7810769874b7e0a" +dependencies = [ + "dashmap", + "hashbrown", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lexical-core" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +dependencies = [ + "arrayvec", + "bitflags", + "cfg-if 1.0.0", + "ryu", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" + +[[package]] +name = "libloading" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" +dependencies = [ + "cfg-if 1.0.0", + "winapi 0.3.9", +] + +[[package]] +name = "librocksdb-sys" +version = "6.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5da125e1c0f22c7cae785982115523a0738728498547f415c9054cb17c7e89f9" +dependencies = [ + "bindgen", + "cc", + "glob", + "libc", +] + +[[package]] +name = "lock_api" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if 1.0.0", + "value-bag", +] + +[[package]] +name = "matches" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + +[[package]] +name = "md-5" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" +dependencies = [ + "block-buffer", + "digest", + "opaque-debug", +] + +[[package]] +name = "memchr" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" + +[[package]] +name = "memoffset" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mownstr" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "342a407881dbd200f13a08ff8a5413232e035ed7ba56dba8c81137e3afce4f84" + +[[package]] +name = "native-tls" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nom" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +dependencies = [ + "lexical-core", + "memchr", + "version_check", +] + +[[package]] +name = "nom" +version = "6.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +dependencies = [ + "bitvec", + "funty", + "lexical-core", + "memchr", + "version_check", +] + +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "openssl" +version = "0.10.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", + "openssl-sys", +] + +[[package]] +name = "openssl-probe" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" + +[[package]] +name = "openssl-src" +version = "111.15.0+1.1.1k" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" +dependencies = [ + "autocfg", + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "oxigraph" +version = "0.2.4" +dependencies = [ + "criterion", + "digest", + "getrandom 0.2.3", + "hex", + "http", + "httparse", + "js-sys", + "json-event-parser", + "lasso", + "md-5", + "native-tls", + "nom 6.1.2", + "oxilangtag", + "oxiri", + "peg", + "quick-xml", + "rand 0.8.4", + "rayon", + "regex", + "rio_api", + "rio_turtle", + "rio_xml", + "rocksdb", + "sha-1", + "sha2", + "siphasher", + "sled", + "sophia_api", + "wasm-bindgen-test", +] + +[[package]] +name = "oxigraph_js" +version = "0.2.4" +dependencies = [ + "console_error_panic_hook", + "js-sys", + "oxigraph", + "wasm-bindgen", + "wasm-bindgen-test", +] + +[[package]] +name = "oxigraph_server" +version = "0.2.4" +dependencies = [ + "argh", + "async-h1", + "async-std", + "clap", + "http-types", + "oxigraph", + "oxiri", + "rand 0.8.4", + "tempfile", + "url", +] + +[[package]] +name = "oxigraph_testsuite" +version = "0.2.4" +dependencies = [ + "anyhow", + "chrono", + "criterion", + "oxigraph", + "text-diff", +] + +[[package]] +name = "oxigraph_wikibase" +version = "0.2.4" +dependencies = [ + "async-h1", + "async-std", + "chrono", + "clap", + "http-client", + "http-types", + "oxigraph", + "serde_json", + "url", +] + +[[package]] +name = "oxilangtag" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59b4fef9c3c51e25835de30fe78e570d0ef42dceca0d514c66dca413d505316" + +[[package]] +name = "oxiri" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e54fb37480ffa01a9af93f991ba229b3091f2e6ac84c8f6df2c509356cc473" + +[[package]] +name = "parking" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" + +[[package]] +name = "parking_lot" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi 0.3.9", +] + +[[package]] +name = "paste" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" +dependencies = [ + "paste-impl", + "proc-macro-hack", +] + +[[package]] +name = "paste-impl" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" +dependencies = [ + "proc-macro-hack", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "peg" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07c0b841ea54f523f7aa556956fbd293bcbe06f2e67d2eb732b7278aaf1d166a" +dependencies = [ + "peg-macros", + "peg-runtime", +] + +[[package]] +name = "peg-macros" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5aa52829b8decbef693af90202711348ab001456803ba2a98eb4ec8fb70844c" +dependencies = [ + "peg-runtime", + "proc-macro2", + "quote", +] + +[[package]] +name = "peg-runtime" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c719dcf55f09a3a7e764c6649ab594c18a177e3599c467983cdf644bfc0a4088" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "pin-project" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" + +[[package]] +name = "plotters" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" + +[[package]] +name = "plotters-svg" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "polling" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92341d779fa34ea8437ef4d82d440d5e1ce3f3ff7f824aa64424cd481f9a1f25" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "log", + "wepoll-ffi", + "winapi 0.3.9", +] + +[[package]] +name = "polyval" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +dependencies = [ + "cpuid-bool", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro-nested" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" + +[[package]] +name = "proc-macro2" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "pyo3" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "338f7f3701e11fd7f76508c91fbcaabc982564bcaf4d1ca7e1574ff2b4778aec" +dependencies = [ + "cfg-if 1.0.0", + "indoc", + "libc", + "parking_lot", + "paste", + "pyo3-build-config", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb2e98cc9ccc83d4f7115c8f925e0057e88c8d324b1bc4c2db4a7270c06ac9d" +dependencies = [ + "once_cell", +] + +[[package]] +name = "pyo3-macros" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb8671a42d0ecc4bec8cc107ae96d49292ca20cd1968e09b98af4aafd516adf" +dependencies = [ + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9addf6dc422f05d4949cc0990195ee74fa43e3c3780cc9a1972fe9e7b68a9f48" +dependencies = [ + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "pyoxigraph" +version = "0.2.4" +dependencies = [ + "native-tls", + "oxigraph", + "pyo3", +] + +[[package]] +name = "quick-xml" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc 0.2.0", +] + +[[package]] +name = "rand" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.3", + "rand_hc 0.3.1", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.3", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom 0.2.3", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_hc" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +dependencies = [ + "rand_core 0.6.3", +] + +[[package]] +name = "rayon" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +dependencies = [ + "autocfg", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "lazy_static", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "resiter" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd69ab1e90258b7769f0b5c46bfd802b8206d0707ced4ca4b9d5681b744de1be" + +[[package]] +name = "rio_api" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fc78f8e9a7f81c2ac5670a0740086e8d61ab9377d07d01ebf65f7ff13bab7e0" + +[[package]] +name = "rio_turtle" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b86d09c32fdf8768cb5973be607eb88edabbd6cdfd6d09fd39431e426404b3dc" +dependencies = [ + "oxilangtag", + "oxiri", + "rio_api", +] + +[[package]] +name = "rio_xml" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "049a0a2e286745b9dd0de80765b1e671917f658429a5790e1c6e2097ccc18539" +dependencies = [ + "oxilangtag", + "oxiri", + "quick-xml", + "rio_api", +] + +[[package]] +name = "rocksdb" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c749134fda8bfc90d0de643d59bfc841dcb3ac8a1062e12b6754bd60235c48b3" +dependencies = [ + "libc", + "librocksdb-sys", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.3", +] + +[[package]] +name = "ryu" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +dependencies = [ + "lazy_static", + "winapi 0.3.9", +] + +[[package]] +name = "scoped-tls" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "security-framework" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe" + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "serde" +version = "1.0.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_cbor" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" +dependencies = [ + "half", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_qs" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5af82de3c6549b001bec34961ff2d6a54339a87bab37ce901b693401f27de6cb" +dependencies = [ + "data-encoding", + "percent-encoding", + "serde", + "thiserror", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha-1" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16" +dependencies = [ + "block-buffer", + "cfg-if 1.0.0", + "cpufeatures", + "digest", + "opaque-debug", +] + +[[package]] +name = "sha1" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" + +[[package]] +name = "sha2" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" +dependencies = [ + "block-buffer", + "cfg-if 1.0.0", + "cpufeatures", + "digest", + "opaque-debug", +] + +[[package]] +name = "shlex" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" + +[[package]] +name = "simple-mutex" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38aabbeafa6f6dead8cebf246fe9fae1f9215c8d29b3a69f93bd62a9e4a3dcd6" +dependencies = [ + "event-listener", +] + +[[package]] +name = "siphasher" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbce6d4507c7e4a3962091436e56e95290cb71fa302d0d270e32130b75fbff27" + +[[package]] +name = "slab" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" + +[[package]] +name = "sled" +version = "0.34.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d0132f3e393bcb7390c60bb45769498cf4550bcb7a21d7f95c02b69f6362cdc" +dependencies = [ + "crc32fast", + "crossbeam-epoch", + "crossbeam-utils", + "fs2", + "fxhash", + "libc", + "log", + "parking_lot", +] + +[[package]] +name = "smallvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" + +[[package]] +name = "socket2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "sophia_api" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6709ffef59ae501289e7c4b9cff5c42a9571687d0a0e5358ed3636351abc883b" +dependencies = [ + "lazy_static", + "mownstr", + "resiter", + "sophia_iri", + "thiserror", +] + +[[package]] +name = "sophia_iri" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf616688b714ead8dde2e0d39170a90135159c57f75b63bc5679ef1c8455c50" +dependencies = [ + "lazy_static", + "mownstr", + "regex", + "thiserror", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "standback" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ + "version_check", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +dependencies = [ + "discard", + "rustc_version 0.2.3", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_derive", + "syn", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", + "proc-macro2", + "quote", + "serde", + "serde_derive", + "serde_json", + "sha1", + "syn", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "subtle" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" + +[[package]] +name = "syn" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tempfile" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "rand 0.8.4", + "redox_syscall", + "remove_dir_all", + "winapi 0.3.9", +] + +[[package]] +name = "term" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2077e54d38055cf1ca0fd7933a2e00cd3ec8f6fed352b2a377f06dcdaaf3281" +dependencies = [ + "kernel32-sys", + "winapi 0.2.8", +] + +[[package]] +name = "text-diff" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "309238dd66f8bf11a20d015b727b926f294a13fcb8d56770bb984e7a22c43897" +dependencies = [ + "getopts", + "term", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "time" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "time" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +dependencies = [ + "const_fn", + "libc", + "standback", + "stdweb", + "time-macros", + "version_check", + "winapi 0.3.9", +] + +[[package]] +name = "time-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" +dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + +[[package]] +name = "time-macros-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98c8b05dc14c75ea83d63dd391100353789f5f24b8b3866542a5e85c8be8e985" +dependencies = [ + "autocfg", + "pin-project-lite", +] + +[[package]] +name = "typenum" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" + +[[package]] +name = "unicode-bidi" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" +dependencies = [ + "matches", +] + +[[package]] +name = "unicode-normalization" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" + +[[package]] +name = "unicode-width" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "unindent" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" + +[[package]] +name = "universal-hash" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "url" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +dependencies = [ + "form_urlencoded", + "idna", + "matches", + "percent-encoding", + "serde", +] + +[[package]] +name = "value-bag" +version = "1.0.0-alpha.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd320e1520f94261153e96f7534476ad869c14022aee1e59af7c778075d840ae" +dependencies = [ + "ctor", + "version_check", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi 0.3.9", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] +name = "wasm-bindgen" +version = "0.2.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" + +[[package]] +name = "wasm-bindgen-test" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cab416a9b970464c2882ed92d55b0c33046b08e0bdc9d59b3b718acd4e1bae8" +dependencies = [ + "console_error_panic_hook", + "js-sys", + "scoped-tls", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test-macro", +] + +[[package]] +name = "wasm-bindgen-test-macro" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4543fc6cf3541ef0d98bf720104cc6bd856d7eba449fd2aa365ef4fed0e782" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "web-sys" +version = "0.3.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "wepoll-ffi" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" +dependencies = [ + "cc", +] + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" From 5f986f585804ea8cd42b24c0c91479a14afd59b8 Mon Sep 17 00:00:00 2001 From: Tpt Date: Fri, 9 Apr 2021 14:42:23 +0200 Subject: [PATCH 08/30] Upgrades Maturin to 0.11 --- .github/workflows/build.yml | 42 ++++++++++++++++++++++++++--------- .github/workflows/doc.yml | 2 +- .github/workflows/release.yml | 24 +++++++++++++------- python/Cargo.toml | 18 --------------- python/pyproject.toml | 31 ++++++++++++++++++++++++-- 5 files changed, 77 insertions(+), 40 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32ba3478..5d441512 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,16 +15,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - run: rustup update - - run: rustup component add rustfmt + - run: rustup update && rustup component add rustfmt - run: cargo fmt -- --check clippy: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - run: rustup update - - run: rustup component add clippy + - run: rustup update && rustup component add clippy - run: cargo clippy --all --all-targets --all-features test: @@ -59,7 +57,7 @@ jobs: with: python-version: 3.8 - run: python -m venv python/venv - - run: source python/venv/bin/activate && pip install --upgrade pip 'maturin>=0.9.2,<0.10' sphinx + - run: source python/venv/bin/activate && pip install --upgrade 'maturin>=0.11,<0.12' sphinx - run: source venv/bin/activate && maturin develop working-directory: ./python - run: source ../venv/bin/activate && python -m unittest @@ -69,17 +67,39 @@ jobs: - run: source ../venv/bin/activate && sphinx-build -M html . build working-directory: ./python/docs - python_wheel: - runs-on: ${{ matrix.os }} + python_wheel_linux: + runs-on: ubuntu-latest + needs: python + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: 3.6 + - run: pip install 'maturin>=0.11,<0.12' + - run: maturin build + working-directory: ./python + + python_wheel_mac: + runs-on: macos-latest + needs: python + steps: + - uses: actions/checkout@v2 + - run: rustup update && rustup target add aarch64-apple-darwin + - uses: actions/setup-python@v2 + with: + python-version: 3.6 + - run: pip install 'maturin>=0.11,<0.12' + - run: maturin build --universal2 + working-directory: ./python + + python_wheel_windows: + runs-on: windows-latest needs: python - strategy: - matrix: - os: [ ubuntu-latest, macos-latest, windows-latest ] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: python-version: 3.6 - - run: pip install 'maturin>=0.9.2,<0.10' + - run: pip install 'maturin>=0.11,<0.12' - run: maturin build working-directory: ./python diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index ac4d9ff5..6339db60 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -15,7 +15,7 @@ jobs: with: python-version: 3.8 - run: python -m venv python/venv - - run: source python/venv/bin/activate && pip install --upgrade pip 'maturin>=0.9.2,<0.10' sphinx + - run: source python/venv/bin/activate && pip install --upgrade 'maturin>=0.11,<0.12' sphinx - run: source venv/bin/activate && maturin develop working-directory: ./python - run: source ../venv/bin/activate && sphinx-build -M doctest . build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fabfdb58..03efb03a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -85,20 +85,28 @@ jobs: steps: - uses: actions/checkout@v2 - run: sed -i 's/path="..\/lib", //g' python/Cargo.toml - - run: docker run --rm -v $(pwd):/io konstin2/maturin:v0.9.4 publish -u __token__ -p ${{ secrets.PYPI_PASSWORD }} + - run: docker run --rm -v $(pwd):/io konstin2/maturin:v0.11.1 publish -u __token__ -p ${{ secrets.PYPI_PASSWORD }} working-directory: ./python - publish_pypi_mac_windows: - runs-on: ${{ matrix.os }} + publish_pypi_mac: + runs-on: macos-latest needs: publish_lib_crate - strategy: - matrix: - os: [ macos-latest, windows-latest ] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: python-version: 3.6 - - run: pip install 'maturin>=0.9.2,<0.10' + - run: pip install 'maturin>=0.11,<0.12' + - run: maturin publish --universal2 --no-sdist -u __token__ -p ${{ secrets.PYPI_PASSWORD }} + working-directory: ./python + publish_pypi_windows: + runs-on: windows-latest + needs: publish_lib_crate + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: 3.6 + - run: pip install 'maturin>=0.11,<0.12' - run: maturin publish --no-sdist -u __token__ -p ${{ secrets.PYPI_PASSWORD }} working-directory: ./python publish_npm: @@ -128,7 +136,7 @@ jobs: with: python-version: 3.8 - run: python -m venv python/venv - - run: source python/venv/bin/activate && pip install --upgrade pip 'maturin>=0.9.2,<0.10' sphinx + - run: source python/venv/bin/activate && pip install --upgrade 'maturin>=0.11,<0.12' sphinx - run: source venv/bin/activate && maturin develop working-directory: ./python - run: source ../venv/bin/activate && sphinx-build -M doctest . build diff --git a/python/Cargo.toml b/python/Cargo.toml index 46bad11d..c2377d87 100644 --- a/python/Cargo.toml +++ b/python/Cargo.toml @@ -19,21 +19,3 @@ doctest = false oxigraph = {version = "0.2", path="../lib", features = ["sled", "http_client"]} pyo3 = {version = "0.14", features = ["extension-module", "abi3-py36"]} native-tls = {version = "0.2", features = ["vendored"]} - -[package.metadata.maturin] -classifier = [ - "Development Status :: 3 - Alpha", - "Intended Audience :: Developers", - "License :: OSI Approved :: Apache Software License", - "License :: OSI Approved :: MIT License", - "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Rust", - "Topic :: Database :: Database Engines/Servers", - "Topic :: Software Development :: Libraries :: Python Modules", -] -project-url = { Documentation = "https://oxigraph.org/pyoxigraph/", Source = "https://github.com/oxigraph/oxigraph/tree/master/python", Tracker = "https://github.com/oxigraph/oxigraph/issues" } -requires-python = ">=3.6" diff --git a/python/pyproject.toml b/python/pyproject.toml index 912a19e9..6b785213 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -1,3 +1,30 @@ [build-system] -requires = ["maturin>=0.9.2,<0.10"] -build-backend = "maturin" \ No newline at end of file +requires = ["maturin>=0.11,<0.12"] +build-backend = "maturin" + +[project] +# Most of the metadata are in Cargo.toml and injected by maturin +name = "pyoxigraph" +classifier = [ + "Development Status :: 3 - Alpha", + "Intended Audience :: Developers", + "License :: OSI Approved :: Apache Software License", + "License :: OSI Approved :: MIT License", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Rust", + "Topic :: Database :: Database Engines/Servers", + "Topic :: Software Development :: Libraries :: Python Modules", +] +requires-python = ">=3.6" + +[project.urls] +changelog = "https://github.com/oxigraph/oxigraph/blob/master/CHANGELOG.md" +documentation = "https://oxigraph.org/pyoxigraph/" +homepage = "https://oxigraph.org/pyoxigraph/" +repository = "https://github.com/oxigraph/oxigraph/tree/master/python" +source = "https://github.com/oxigraph/oxigraph/tree/master/python" +tracker = "https://github.com/oxigraph/oxigraph/issues" From 54eadcf7ad86539c0d3e9b56939dd19447e8f175 Mon Sep 17 00:00:00 2001 From: Tpt Date: Sun, 11 Jul 2021 16:53:20 +0200 Subject: [PATCH 09/30] Runs SPARQL JSON result format testsuite --- testsuite/tests/sparql.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/testsuite/tests/sparql.rs b/testsuite/tests/sparql.rs index f73b4f94..1dd53d57 100644 --- a/testsuite/tests/sparql.rs +++ b/testsuite/tests/sparql.rs @@ -114,6 +114,14 @@ fn sparql11_update_w3c_evaluation_testsuite() -> Result<()> { ) } +#[test] +fn sparql11_json_w3c_evaluation_testsuite() -> Result<()> { + run_testsuite( + "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/json-res/manifest.ttl", + vec![], + ) +} + #[test] fn sparql11_tsv_w3c_evaluation_testsuite() -> Result<()> { run_testsuite( From a21dcbb4f7355d7a00a86fbc5ad2c350a53629c4 Mon Sep 17 00:00:00 2001 From: Tpt Date: Sun, 11 Jul 2021 16:55:41 +0200 Subject: [PATCH 10/30] Releases v0.2.5 --- CHANGELOG.md | 12 ++++++++++++ Cargo.lock | 14 ++++++++------ js/Cargo.toml | 2 +- lib/Cargo.toml | 2 +- python/Cargo.toml | 2 +- server/Cargo.toml | 2 +- testsuite/Cargo.toml | 2 +- wikibase/Cargo.toml | 2 +- 8 files changed, 26 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3fc551e..1f60c434 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## [0.2.5] - 2021-07-11 + +## Added +- [SPARQL 1.1 Query Results JSON Format](http://www.w3.org/TR/sparql11-results-json/) parser. +- Python wheels for macOS are now universal2 binaries. + +### Changed +- The `Cargo.lock` file is now provided with releases to avoid compilation failures because of changes in dependencies. +- Uses clap instead of argh for the server arguments parsing. +- Upgrades PyO3 to v0.14. + + ## [0.2.4] - 2021-04-28 ### Changed diff --git a/Cargo.lock b/Cargo.lock index 9ccd80d4..3d3a0872 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "aead" version = "0.3.2" @@ -1548,7 +1550,7 @@ dependencies = [ [[package]] name = "oxigraph" -version = "0.2.4" +version = "0.2.5" dependencies = [ "criterion", "digest", @@ -1583,7 +1585,7 @@ dependencies = [ [[package]] name = "oxigraph_js" -version = "0.2.4" +version = "0.2.5" dependencies = [ "console_error_panic_hook", "js-sys", @@ -1594,7 +1596,7 @@ dependencies = [ [[package]] name = "oxigraph_server" -version = "0.2.4" +version = "0.2.5" dependencies = [ "argh", "async-h1", @@ -1610,7 +1612,7 @@ dependencies = [ [[package]] name = "oxigraph_testsuite" -version = "0.2.4" +version = "0.2.5" dependencies = [ "anyhow", "chrono", @@ -1621,7 +1623,7 @@ dependencies = [ [[package]] name = "oxigraph_wikibase" -version = "0.2.4" +version = "0.2.5" dependencies = [ "async-h1", "async-std", @@ -1902,7 +1904,7 @@ dependencies = [ [[package]] name = "pyoxigraph" -version = "0.2.4" +version = "0.2.5" dependencies = [ "native-tls", "oxigraph", diff --git a/js/Cargo.toml b/js/Cargo.toml index 1d964191..de192274 100644 --- a/js/Cargo.toml +++ b/js/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oxigraph_js" -version = "0.2.4" +version = "0.2.5" authors = ["Tpt "] license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 48809c72..e174425f 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oxigraph" -version = "0.2.4" +version = "0.2.5" authors = ["Tpt "] license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/python/Cargo.toml b/python/Cargo.toml index c2377d87..aea12cfc 100644 --- a/python/Cargo.toml +++ b/python/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pyoxigraph" -version = "0.2.4" +version = "0.2.5" authors = ["Tpt"] license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/server/Cargo.toml b/server/Cargo.toml index 6b6d0130..9dcd8b04 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oxigraph_server" -version = "0.2.4" +version = "0.2.5" authors = ["Tpt "] license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/testsuite/Cargo.toml b/testsuite/Cargo.toml index 706f95ea..43b500f2 100644 --- a/testsuite/Cargo.toml +++ b/testsuite/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oxigraph_testsuite" -version = "0.2.4" +version = "0.2.5" authors = ["Tpt "] license = "MIT OR Apache-2.0" readme = "../README.md" diff --git a/wikibase/Cargo.toml b/wikibase/Cargo.toml index 8d2d447f..7e034955 100644 --- a/wikibase/Cargo.toml +++ b/wikibase/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oxigraph_wikibase" -version = "0.2.4" +version = "0.2.5" authors = ["Tpt "] license = "MIT OR Apache-2.0" readme = "README.md" From 5df48bf2bca394965cd3e50be19e9ac9a44a4429 Mon Sep 17 00:00:00 2001 From: Tpt Date: Sun, 11 Jul 2021 17:38:27 +0200 Subject: [PATCH 11/30] Fixes macOS wheel release --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 03efb03a..47449e8c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -92,6 +92,7 @@ jobs: needs: publish_lib_crate steps: - uses: actions/checkout@v2 + - run: rustup update && rustup target add aarch64-apple-darwin - uses: actions/setup-python@v2 with: python-version: 3.6 From e05e58704ecc93636467cf1f871ed07b485279bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 24 Jul 2021 10:07:49 +0200 Subject: [PATCH 12/30] Bump rocksdb from 0.16.0 to 0.17.0 (#115) * Bump rocksdb from 0.16.0 to 0.16.0 or 0.17.0 Bumps [rocksdb](https://github.com/rust-rocksdb/rust-rocksdb) from 0.16.0 to 0.17.0. - [Release notes](https://github.com/rust-rocksdb/rust-rocksdb/releases) - [Changelog](https://github.com/rust-rocksdb/rust-rocksdb/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-rocksdb/rust-rocksdb/compare/v0.16.0...v0.17.0) --- Cargo.lock | 22 +++++++++++----------- lib/Cargo.toml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d3a0872..b0aff4f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -336,9 +336,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bindgen" -version = "0.57.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d" +checksum = "0b2ce639ee22f41a6ea0a3061e9bea9f690cf0c6ffc1ada0a3a599778f99ccba" dependencies = [ "bitflags", "cexpr", @@ -460,11 +460,11 @@ dependencies = [ [[package]] name = "cexpr" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +checksum = "db507a7679252d2276ed0dd8113c6875ec56d3089f9225b2b42c30cc1f8e5c89" dependencies = [ - "nom 5.1.2", + "nom 6.1.2", ] [[package]] @@ -1349,9 +1349,9 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "6.17.3" +version = "6.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da125e1c0f22c7cae785982115523a0738728498547f415c9054cb17c7e89f9" +checksum = "c309a9d2470844aceb9a4a098cf5286154d20596868b75a6b36357d2bb9ca25d" dependencies = [ "bindgen", "cc", @@ -2119,9 +2119,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c749134fda8bfc90d0de643d59bfc841dcb3ac8a1062e12b6754bd60235c48b3" +checksum = "7a62eca5cacf2c8261128631bed9f045598d40bfbe4b29f5163f0f802f8f44a7" dependencies = [ "libc", "librocksdb-sys", @@ -2331,9 +2331,9 @@ dependencies = [ [[package]] name = "shlex" -version = "0.1.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" +checksum = "42a568c8f2cd051a4d283bd6eb0343ac214c1b0f1ac19f93e1175b2dee38c73d" [[package]] name = "simple-mutex" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index e174425f..51793582 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -22,7 +22,7 @@ sophia = ["sophia_api"] http_client = ["httparse", "native-tls"] [dependencies] -rocksdb = { version = "0.16", optional = true } +rocksdb = { version = ">=0.15,<0.18", optional = true } sled = { version = "0.34", optional = true } quick-xml = "0.22" rand = "0.8" From 0df73b3e53ba07cc48c898d27424b7780ff1e66f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Jul 2021 10:02:11 +0000 Subject: [PATCH 13/30] Bump sha-1 from 0.9.6 to 0.9.7 Bumps [sha-1](https://github.com/RustCrypto/hashes) from 0.9.6 to 0.9.7. - [Release notes](https://github.com/RustCrypto/hashes/releases) - [Commits](https://github.com/RustCrypto/hashes/compare/sha-1-v0.9.6...sha-1-v0.9.7) --- updated-dependencies: - dependency-name: sha-1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b0aff4f3..0fdfbf12 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2299,9 +2299,9 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16" +checksum = "1a0c8611594e2ab4ebbf06ec7cbbf0a99450b8570e96cbf5188b5d5f6ef18d81" dependencies = [ "block-buffer", "cfg-if 1.0.0", From fdd7753d972bbef6f9cf72b3f7e6a624f1717c2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 24 Jul 2021 10:41:41 +0200 Subject: [PATCH 14/30] Bump sophia_api from 0.6.2 to 0.7.0 (#116) * Bump sophia_api from 0.6.2 to 0.6 or 0.7 Bumps [sophia_api](https://github.com/pchampin/sophia_rs) from 0.6.2 to 0.7.0. - [Release notes](https://github.com/pchampin/sophia_rs/releases) - [Changelog](https://github.com/pchampin/sophia_rs/blob/main/CHANGELOG.txt) - [Commits](https://github.com/pchampin/sophia_rs/compare/v0.6.2...v0.7.0) --- Cargo.lock | 9 +++++---- lib/Cargo.toml | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0fdfbf12..35ffdc51 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2390,12 +2390,13 @@ dependencies = [ [[package]] name = "sophia_api" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6709ffef59ae501289e7c4b9cff5c42a9571687d0a0e5358ed3636351abc883b" +checksum = "acd999315a30142ca47a790fbad5dc646900a281b5607704bd8832f3711a1d18" dependencies = [ "lazy_static", "mownstr", + "regex", "resiter", "sophia_iri", "thiserror", @@ -2403,9 +2404,9 @@ dependencies = [ [[package]] name = "sophia_iri" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf616688b714ead8dde2e0d39170a90135159c57f75b63bc5679ef1c8455c50" +checksum = "6211a37cce10cac8d690a8bf2e8c1eef14963acd6f872df1cd527e7852278fa8" dependencies = [ "lazy_static", "mownstr", diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 51793582..309acf79 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -41,7 +41,7 @@ nom = "6" peg = "0.7" siphasher = "0.3" lasso = {version="0.5", features=["multi-threaded", "inline-more"]} -sophia_api = { version = "0.6.2", optional = true } +sophia_api = { version = ">=0.6,<0.8", optional = true } http = "0.2" httparse = { version = "1", optional = true } native-tls = { version = "0.2", optional = true } @@ -54,7 +54,7 @@ getrandom = {version="0.2", features=["js"]} [dev-dependencies] rayon = "1" criterion = "0.3" -sophia_api = { version = "0.6.2", features = ["test_macro"] } +sophia_api = { version = ">=0.6,<0.8", features = ["test_macro"] } [target.'cfg(target_arch = "wasm32")'.dev-dependencies] wasm-bindgen-test = "0.3" From f7ba1370fe1f7c10aeabf082c259ef816dc8e05a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Jul 2021 10:02:22 +0000 Subject: [PATCH 15/30] Bump siphasher from 0.3.5 to 0.3.6 Bumps [siphasher](https://github.com/jedisct1/rust-siphash) from 0.3.5 to 0.3.6. - [Release notes](https://github.com/jedisct1/rust-siphash/releases) - [Commits](https://github.com/jedisct1/rust-siphash/commits/0.3.6) --- updated-dependencies: - dependency-name: siphasher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 35ffdc51..46924525 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2346,9 +2346,9 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbce6d4507c7e4a3962091436e56e95290cb71fa302d0d270e32130b75fbff27" +checksum = "729a25c17d72b06c68cb47955d44fda88ad2d3e7d77e025663fdd69b93dd71a1" [[package]] name = "slab" From 502ef381181d28514ec2170c3eb356960416fd40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Jul 2021 10:02:17 +0000 Subject: [PATCH 16/30] Bump criterion from 0.3.4 to 0.3.5 Bumps [criterion](https://github.com/bheisler/criterion.rs) from 0.3.4 to 0.3.5. - [Release notes](https://github.com/bheisler/criterion.rs/releases) - [Changelog](https://github.com/bheisler/criterion.rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/bheisler/criterion.rs/compare/0.3.4...0.3.5) --- updated-dependencies: - dependency-name: criterion dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 46924525..3c1c28f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -622,16 +622,16 @@ dependencies = [ [[package]] name = "criterion" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" +checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10" dependencies = [ "atty", "cast", "clap", "criterion-plot", "csv", - "itertools 0.10.1", + "itertools", "lazy_static", "num-traits", "oorandom", @@ -648,12 +648,12 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" +checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57" dependencies = [ "cast", - "itertools 0.9.0", + "itertools", ] [[package]] @@ -1229,15 +1229,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.10.1" From 8d987143e4ca65cef0a22aac746b0853d9ccb016 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Jul 2021 10:02:37 +0000 Subject: [PATCH 17/30] Bump json-event-parser from 0.1.0 to 0.1.1 Bumps [json-event-parser](https://github.com/oxigraph/json-event-parser) from 0.1.0 to 0.1.1. - [Release notes](https://github.com/oxigraph/json-event-parser/releases) - [Changelog](https://github.com/oxigraph/json-event-parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/oxigraph/json-event-parser/compare/v0.1.0...v0.1.1) --- updated-dependencies: - dependency-name: json-event-parser dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c1c28f0..30f63fc6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1264,9 +1264,9 @@ dependencies = [ [[package]] name = "json-event-parser" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6cac6ee713bbade4ee83bd25932231f148812bf1377016808e18fc4cc4c1fa" +checksum = "32f12e624eaeb74accb9bb48f01cb071427f68115aaafa5689acb372d7e22977" [[package]] name = "kernel32-sys" From 4c464f170136610707a71045544e4efd2b5110b9 Mon Sep 17 00:00:00 2001 From: Tpt Date: Thu, 29 Jul 2021 09:45:21 +0200 Subject: [PATCH 18/30] pyo3 now supports cargo test --- .github/workflows/build.yml | 2 +- Cargo.lock | 100 ++++++++++++++++++------------------ 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d441512..0cf429c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: submodules: true - run: rustup update - run: cargo build - - run: cargo test --verbose --all --all-features --exclude pyoxigraph + - run: cargo test --verbose --all --all-features env: RUST_BACKTRACE: 1 diff --git a/Cargo.lock b/Cargo.lock index 30f63fc6..028de166 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -290,9 +290,9 @@ checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-trait" -version = "0.1.50" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" +checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" dependencies = [ "proc-macro2", "quote", @@ -336,9 +336,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bindgen" -version = "0.59.0" +version = "0.59.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2ce639ee22f41a6ea0a3061e9bea9f690cf0c6ffc1ada0a3a599778f99ccba" +checksum = "453c49e5950bb0eb63bb3df640e31618846c89d5b7faa54040d76e98e0134375" dependencies = [ "bitflags", "cexpr", @@ -451,9 +451,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" +checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" dependencies = [ "jobserver", ] @@ -712,9 +712,9 @@ dependencies = [ [[package]] name = "crypto-mac" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" +checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" dependencies = [ "generic-array", "subtle", @@ -820,9 +820,9 @@ checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" [[package]] name = "fastrand" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b705829d1e87f762c2df6da140b26af5839e1033aa84aa5f56bb688e4e1bdb" +checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e" dependencies = [ "instant", ] @@ -876,9 +876,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" +checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b" dependencies = [ "futures-channel", "futures-core", @@ -891,9 +891,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" +checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9" dependencies = [ "futures-core", "futures-sink", @@ -901,15 +901,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" +checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99" [[package]] name = "futures-executor" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" +checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c" dependencies = [ "futures-core", "futures-task", @@ -918,9 +918,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" +checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582" [[package]] name = "futures-lite" @@ -939,9 +939,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" +checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57" dependencies = [ "autocfg", "proc-macro-hack", @@ -952,21 +952,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" +checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53" [[package]] name = "futures-task" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" +checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2" [[package]] name = "futures-util" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" +checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78" dependencies = [ "autocfg", "futures-channel", @@ -1222,9 +1222,9 @@ checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" [[package]] name = "instant" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" dependencies = [ "cfg-if 1.0.0", ] @@ -1730,18 +1730,18 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pin-project" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4" +checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f" +checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" dependencies = [ "proc-macro2", "quote", @@ -1838,9 +1838,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" +checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" dependencies = [ "unicode-xid", ] @@ -2255,9 +2255,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +checksum = "28c5e91e4240b46c4c19219d6cc84784444326131a4210f496f948d5cc827a29" dependencies = [ "itoa", "ryu", @@ -2371,9 +2371,9 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "socket2" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad" dependencies = [ "libc", "winapi 0.3.9", @@ -2483,15 +2483,15 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "subtle" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" +checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" dependencies = [ "proc-macro2", "quote", @@ -2627,9 +2627,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338" dependencies = [ "tinyvec_macros", ] @@ -2642,9 +2642,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c8b05dc14c75ea83d63dd391100353789f5f24b8b3866542a5e85c8be8e985" +checksum = "4b7b349f11a7047e6d1276853e612d152f5e8a352c61917887cc2169e2366b4c" dependencies = [ "autocfg", "pin-project-lite", @@ -2700,9 +2700,9 @@ checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" [[package]] name = "universal-hash" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402" +checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ "generic-array", "subtle", From ec2b3072555a2449d0bc9951580344f3693be005 Mon Sep 17 00:00:00 2001 From: Tpt Date: Thu, 29 Jul 2021 21:20:11 +0200 Subject: [PATCH 19/30] Fixes Clippy warnings --- js/src/model.rs | 33 +++++++++++++++---------------- js/src/store.rs | 2 +- lib/src/lib.rs | 4 ++-- lib/src/sparql/eval.rs | 4 ++-- server/src/main.rs | 2 +- testsuite/benches/sparql_query.rs | 2 +- testsuite/src/manifest.rs | 4 ++-- testsuite/src/sparql_evaluator.rs | 10 +++++----- wikibase/src/main.rs | 6 +++--- 9 files changed, 33 insertions(+), 34 deletions(-) diff --git a/js/src/model.rs b/js/src/model.rs index 7c690550..ebefe7cc 100644 --- a/js/src/model.rs +++ b/js/src/model.rs @@ -87,7 +87,7 @@ impl JsDataFactory { graph_name: if graph.is_undefined() || graph.is_null() { JsTerm::DefaultGraph(JsDefaultGraph {}) } else { - self.from_js.to_term(&graph)? + self.from_js.to_term(graph)? }, }) } @@ -123,7 +123,7 @@ impl JsNamedNode { pub fn equals(&self, other: &JsValue) -> bool { if let Ok(Some(JsTerm::NamedNode(other))) = - FromJsConverter::default().to_optional_term(&other) + FromJsConverter::default().to_optional_term(other) { self == &other } else { @@ -182,7 +182,7 @@ impl JsBlankNode { pub fn equals(&self, other: &JsValue) -> bool { if let Ok(Some(JsTerm::BlankNode(other))) = - FromJsConverter::default().to_optional_term(&other) + FromJsConverter::default().to_optional_term(other) { self == &other } else { @@ -250,8 +250,7 @@ impl JsLiteral { } pub fn equals(&self, other: &JsValue) -> bool { - if let Ok(Some(JsTerm::Literal(other))) = - FromJsConverter::default().to_optional_term(&other) + if let Ok(Some(JsTerm::Literal(other))) = FromJsConverter::default().to_optional_term(other) { self == &other } else { @@ -296,7 +295,7 @@ impl JsDefaultGraph { pub fn equals(&self, other: &JsValue) -> bool { if let Ok(Some(JsTerm::DefaultGraph(other))) = - FromJsConverter::default().to_optional_term(&other) + FromJsConverter::default().to_optional_term(other) { self == &other } else { @@ -472,7 +471,7 @@ impl JsQuad { pub fn equals(&self, other: &JsValue) -> bool { FromJsConverter::default() - .to_quad(&other) + .to_quad(other) .map_or(false, |other| self == &other) } } @@ -529,18 +528,18 @@ impl Default for FromJsConverter { impl FromJsConverter { pub fn to_term(&self, value: &JsValue) -> Result { - let term_type = Reflect::get(&value, &self.term_type)?; + let term_type = Reflect::get(value, &self.term_type)?; if let Some(term_type) = term_type.as_string() { match term_type.as_str() { "NamedNode" => Ok(NamedNode::new( - Reflect::get(&value, &self.value)? + Reflect::get(value, &self.value)? .as_string() .ok_or_else(|| format_err!("NamedNode should have a string value"))?, ) .map_err(|v| UriError::new(&v.to_string()))? .into()), "BlankNode" => Ok(BlankNode::new( - &Reflect::get(&value, &self.value)? + &Reflect::get(value, &self.value)? .as_string() .ok_or_else(|| format_err!("BlankNode should have a string value"))?, ) @@ -548,15 +547,15 @@ impl FromJsConverter { .into()), "Literal" => { if let JsTerm::NamedNode(datatype) = - self.to_term(&Reflect::get(&value, &self.datatype)?)? + self.to_term(&Reflect::get(value, &self.datatype)?)? { let datatype = NamedNode::from(datatype); - let literal_value = Reflect::get(&value, &self.value)? + let literal_value = Reflect::get(value, &self.value)? .as_string() .ok_or_else(|| format_err!("Literal should have a string value"))?; Ok(match datatype.as_str() { "http://www.w3.org/2001/XMLSchema#string" => Literal::new_simple_literal(literal_value), - "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString" => Literal::new_language_tagged_literal(literal_value, Reflect::get(&value, &self.language)?.as_string().ok_or_else( + "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString" => Literal::new_language_tagged_literal(literal_value, Reflect::get(value, &self.language)?.as_string().ok_or_else( || format_err!("Literal with rdf:langString datatype should have a language"), )?).map_err(to_err)?, _ => Literal::new_typed_literal(literal_value, datatype) @@ -588,10 +587,10 @@ impl FromJsConverter { pub fn to_quad(&self, value: &JsValue) -> Result { Ok(JsQuad { - subject: self.to_term(&Reflect::get(&value, &self.subject)?)?, - predicate: self.to_term(&Reflect::get(&value, &self.predicate)?)?, - object: self.to_term(&Reflect::get(&value, &self.object)?)?, - graph_name: self.to_term(&Reflect::get(&value, &self.graph)?)?, + subject: self.to_term(&Reflect::get(value, &self.subject)?)?, + predicate: self.to_term(&Reflect::get(value, &self.predicate)?)?, + object: self.to_term(&Reflect::get(value, &self.object)?)?, + graph_name: self.to_term(&Reflect::get(value, &self.graph)?)?, }) } } diff --git a/js/src/store.rs b/js/src/store.rs index 952aa423..dca00776 100644 --- a/js/src/store.rs +++ b/js/src/store.rs @@ -149,7 +149,7 @@ impl JsMemoryStore { None } else if base_iri.is_string() { base_iri.as_string() - } else if let JsTerm::NamedNode(base_iri) = self.from_js.to_term(&base_iri)? { + } else if let JsTerm::NamedNode(base_iri) = self.from_js.to_term(base_iri)? { Some(base_iri.value()) } else { return Err(format_err!( diff --git a/lib/src/lib.rs b/lib/src/lib.rs index 2c5af743..f7eecebb 100644 --- a/lib/src/lib.rs +++ b/lib/src/lib.rs @@ -101,7 +101,7 @@ // clippy::panic, does not work well with tests clippy::path_buf_push_overwrite, clippy::print_stdout, - clippy::pub_enum_variant_names, + clippy::enum_variant_names, //TODO clippy::redundant_closure_for_method_calls, // clippy::shadow_reuse, // clippy::shadow_same, @@ -116,7 +116,7 @@ clippy::unseparated_literal_suffix, clippy::used_underscore_binding, clippy::wildcard_dependencies, - clippy::wrong_pub_self_convention, + clippy::wrong_self_convention, )] #![doc(test(attr(deny(warnings))))] diff --git a/lib/src/sparql/eval.rs b/lib/src/sparql/eval.rs index 139bef72..3283a9b5 100644 --- a/lib/src/sparql/eval.rs +++ b/lib/src/sparql/eval.rs @@ -2562,7 +2562,7 @@ where type Item = Result, EvaluationError>; fn next(&mut self) -> Option, EvaluationError>> { - while let Some(right_tuple) = self.current_right.next() { + for right_tuple in &mut self.current_right { match right_tuple { Ok(right_tuple) => { if let Some(combined) = combine_tuples( @@ -2581,7 +2581,7 @@ where let mut filtered_left = left_tuple.clone(); unbind_variables(&mut filtered_left, &self.problem_vars); self.current_right = self.eval.eval_plan(&self.right_plan, filtered_left); - while let Some(right_tuple) = self.current_right.next() { + for right_tuple in &mut self.current_right { match right_tuple { Ok(right_tuple) => { if let Some(combined) = diff --git a/server/src/main.rs b/server/src/main.rs index fa5ea18a..0a8d654a 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -63,7 +63,7 @@ pub async fn main() -> Result<()> { let store = Store::open(file)?; println!("Listening for requests at http://{}", &bind); - http_server(&bind, move |request| handle_request(request, store.clone())).await + http_server(bind, move |request| handle_request(request, store.clone())).await } async fn handle_request(request: Request, store: Store) -> Result { diff --git a/testsuite/benches/sparql_query.rs b/testsuite/benches/sparql_query.rs index f0961308..a19c4392 100644 --- a/testsuite/benches/sparql_query.rs +++ b/testsuite/benches/sparql_query.rs @@ -28,7 +28,7 @@ fn sparql_w3c_syntax_bench(c: &mut Criterion) { c.bench_function("query parser", |b| { b.iter(|| { for (query, base) in &queries { - Query::parse(query, Some(&base)).unwrap(); + Query::parse(query, Some(base)).unwrap(); } }) }); diff --git a/testsuite/src/manifest.rs b/testsuite/src/manifest.rs index 9dbcb222..1f431de4 100644 --- a/testsuite/src/manifest.rs +++ b/testsuite/src/manifest.rs @@ -309,9 +309,9 @@ impl<'a> Iterator for RdfListIterator<'a> { fn next(&mut self) -> Option { match self.current_node.clone() { Some(current) => { - let result = object_for_subject_predicate(&self.graph, ¤t, rdf::FIRST); + let result = object_for_subject_predicate(self.graph, ¤t, rdf::FIRST); self.current_node = - match object_for_subject_predicate(&self.graph, ¤t, rdf::REST) { + match object_for_subject_predicate(self.graph, ¤t, rdf::REST) { Some(Term::NamedNode(n)) if n == rdf::NIL => None, Some(Term::NamedNode(n)) => Some(n.into()), Some(Term::BlankNode(n)) => Some(n.into()), diff --git a/testsuite/src/sparql_evaluator.rs b/testsuite/src/sparql_evaluator.rs index 767617ae..7003720b 100644 --- a/testsuite/src/sparql_evaluator.rs +++ b/testsuite/src/sparql_evaluator.rs @@ -38,7 +38,7 @@ fn evaluate_sparql_test(test: &Test) -> Result<()> { .action .as_deref() .ok_or_else(|| anyhow!("No action found for test {}", test))?; - match Query::parse(&read_file_to_string(&query_file)?, Some(&query_file)) { + match Query::parse(&read_file_to_string(query_file)?, Some(query_file)) { Err(error) => Err(anyhow!("Not able to parse {} with error: {}", test, error)), Ok(query) => match Query::parse(&query.to_string(), None) { Ok(_) => Ok(()), @@ -160,7 +160,7 @@ fn evaluate_sparql_test(test: &Test) -> Result<()> { .action .as_deref() .ok_or_else(|| anyhow!("No action found for test {}", test))?; - match Update::parse(&read_file_to_string(&update_file)?, Some(&update_file)) { + match Update::parse(&read_file_to_string(update_file)?, Some(update_file)) { Err(error) => Err(anyhow!("Not able to parse {} with error: {}", test, error)), Ok(update) => match Update::parse(&update.to_string(), None) { Ok(_) => Ok(()), @@ -277,7 +277,7 @@ impl StaticServiceHandler { .map(|(name, data)| { let name = NamedNode::new(name)?; let store = MemoryStore::new(); - load_to_store(&data, &store, &GraphName::DefaultGraph)?; + load_to_store(data, &store, &GraphName::DefaultGraph)?; Ok((name, store)) }) .collect::>()?, @@ -423,7 +423,7 @@ fn are_query_results_isomorphic( expected == actual } (StaticQueryResults::Graph(expected), StaticQueryResults::Graph(actual)) => { - expected.is_isomorphic(&actual) + expected.is_isomorphic(actual) } _ => false, } @@ -544,7 +544,7 @@ impl StaticQueryResults { } }) .collect::>(); - bindings.sort_by(|(a, _), (b, _)| a.cmp(&b)); + bindings.sort_by(|(a, _), (b, _)| a.cmp(b)); let index = object_for_subject_predicate(&dataset, &solution, rs::INDEX) .and_then(|object| { diff --git a/wikibase/src/main.rs b/wikibase/src/main.rs index e688f14a..0ce52097 100644 --- a/wikibase/src/main.rs +++ b/wikibase/src/main.rs @@ -102,8 +102,8 @@ pub async fn main() -> Result<()> { let repo = store.clone(); let mut loader = WikibaseLoader::new( repo, - &mediawiki_api, - &mediawiki_base_url, + mediawiki_api, + mediawiki_base_url, &namespaces, slot.as_deref(), Duration::new(10, 0), @@ -116,7 +116,7 @@ pub async fn main() -> Result<()> { println!("Listening for requests at http://{}", &bind); - http_server(&bind, move |request| handle_request(request, store.clone())).await + http_server(bind, move |request| handle_request(request, store.clone())).await } async fn handle_request(request: Request, store: RocksDbStore) -> Result { From ceb385fed98f401eb178ee6319b2398139e08ca1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Aug 2021 10:03:21 +0000 Subject: [PATCH 20/30] Bump http-types from 2.11.1 to 2.12.0 Bumps [http-types](https://github.com/http-rs/http-types) from 2.11.1 to 2.12.0. - [Release notes](https://github.com/http-rs/http-types/releases) - [Commits](https://github.com/http-rs/http-types/compare/v2.11.1...v2.12.0) --- updated-dependencies: - dependency-name: http-types dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 028de166..7e4efb53 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -771,12 +771,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "data-encoding" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" - [[package]] name = "deadpool" version = "0.7.0" @@ -1154,9 +1148,9 @@ dependencies = [ [[package]] name = "http-types" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad077d89137cd3debdce53c66714dc536525ef43fe075d41ddc0a8ac11f85957" +checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" dependencies = [ "anyhow", "async-channel", @@ -2266,11 +2260,10 @@ dependencies = [ [[package]] name = "serde_qs" -version = "0.7.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5af82de3c6549b001bec34961ff2d6a54339a87bab37ce901b693401f27de6cb" +checksum = "d8a72808528a89fa9eca23bbb6a1eb92cb639b881357269b6510f11e50c0f8a9" dependencies = [ - "data-encoding", "percent-encoding", "serde", "thiserror", From 82710cb9c34e1026702dd30c0b2c74cee4f3277c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Aug 2021 10:03:10 +0000 Subject: [PATCH 21/30] Bump native-tls from 0.2.7 to 0.2.8 Bumps [native-tls](https://github.com/sfackler/rust-native-tls) from 0.2.7 to 0.2.8. - [Release notes](https://github.com/sfackler/rust-native-tls/releases) - [Changelog](https://github.com/sfackler/rust-native-tls/blob/master/CHANGELOG.md) - [Commits](https://github.com/sfackler/rust-native-tls/compare/v0.2.7...v0.2.8) --- updated-dependencies: - dependency-name: native-tls dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7e4efb53..0c94cad7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1403,9 +1403,9 @@ checksum = "342a407881dbd200f13a08ff8a5413232e035ed7ba56dba8c81137e3afce4f84" [[package]] name = "native-tls" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" +checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" dependencies = [ "lazy_static", "libc", From 04312b6b6c6ab134d8c38f68d6968968000e3a8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Aug 2021 10:02:36 +0000 Subject: [PATCH 22/30] Bump pyo3 from 0.14.1 to 0.14.2 Bumps [pyo3](https://github.com/pyo3/pyo3) from 0.14.1 to 0.14.2. - [Release notes](https://github.com/pyo3/pyo3/releases) - [Changelog](https://github.com/PyO3/pyo3/blob/main/CHANGELOG.md) - [Commits](https://github.com/pyo3/pyo3/compare/v0.14.1...v0.14.2) --- updated-dependencies: - dependency-name: pyo3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0c94cad7..83f5e215 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1841,9 +1841,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338f7f3701e11fd7f76508c91fbcaabc982564bcaf4d1ca7e1574ff2b4778aec" +checksum = "af205762ba65eec9f27a2fa1a57a40644e8e3368784b8c8b2f2de48f6e8ddd96" dependencies = [ "cfg-if 1.0.0", "indoc", @@ -1857,18 +1857,18 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb2e98cc9ccc83d4f7115c8f925e0057e88c8d324b1bc4c2db4a7270c06ac9d" +checksum = "755944027ce803c7238e59c5a18e59c1d0a4553db50b23e9ba209a568353028d" dependencies = [ "once_cell", ] [[package]] name = "pyo3-macros" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb8671a42d0ecc4bec8cc107ae96d49292ca20cd1968e09b98af4aafd516adf" +checksum = "cd31b36bccfd902c78804bd96c28ea93eac6fa0ca311f9d21ef2230b6665b29a" dependencies = [ "pyo3-macros-backend", "quote", @@ -1877,9 +1877,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9addf6dc422f05d4949cc0990195ee74fa43e3c3780cc9a1972fe9e7b68a9f48" +checksum = "c21c59ba36db9c823e931c662766b0dd01a030b1d96585b67d8857a96a56b972" dependencies = [ "proc-macro2", "pyo3-build-config", From 0edb95aa805eb69e52e2146b3958b9db8ee75915 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Aug 2021 10:02:58 +0000 Subject: [PATCH 23/30] Bump wasm-bindgen from 0.2.74 to 0.2.75 Bumps [wasm-bindgen](https://github.com/rustwasm/wasm-bindgen) from 0.2.74 to 0.2.75. - [Release notes](https://github.com/rustwasm/wasm-bindgen/releases) - [Changelog](https://github.com/rustwasm/wasm-bindgen/blob/master/CHANGELOG.md) - [Commits](https://github.com/rustwasm/wasm-bindgen/compare/0.2.74...0.2.75) --- updated-dependencies: - dependency-name: wasm-bindgen dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 83f5e215..26f84d35 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2773,9 +2773,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.74" +version = "0.2.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" +checksum = "b608ecc8f4198fe8680e2ed18eccab5f0cd4caaf3d83516fa5fb2e927fda2586" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2783,9 +2783,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.74" +version = "0.2.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" +checksum = "580aa3a91a63d23aac5b6b267e2d13cb4f363e31dce6c352fca4752ae12e479f" dependencies = [ "bumpalo", "lazy_static", @@ -2810,9 +2810,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.74" +version = "0.2.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" +checksum = "171ebf0ed9e1458810dfcb31f2e766ad6b3a89dbda42d8901f2b268277e5f09c" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2820,9 +2820,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.74" +version = "0.2.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" +checksum = "6c2657dd393f03aa2a659c25c6ae18a13a4048cebd220e147933ea837efc589f" dependencies = [ "proc-macro2", "quote", @@ -2833,9 +2833,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.74" +version = "0.2.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" +checksum = "2e0c4a743a309662d45f4ede961d7afa4ba4131a59a639f29b0069c3798bbcc2" [[package]] name = "wasm-bindgen-test" From 7dc1b675463f599b1c3cee7758eda55ea659d659 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Aug 2021 10:02:51 +0000 Subject: [PATCH 24/30] Bump wasm-bindgen-test from 0.3.24 to 0.3.25 Bumps [wasm-bindgen-test](https://github.com/rustwasm/wasm-bindgen) from 0.3.24 to 0.3.25. - [Release notes](https://github.com/rustwasm/wasm-bindgen/releases) - [Changelog](https://github.com/rustwasm/wasm-bindgen/blob/master/CHANGELOG.md) - [Commits](https://github.com/rustwasm/wasm-bindgen/commits) --- updated-dependencies: - dependency-name: wasm-bindgen-test dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 26f84d35..fadbe0e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1249,9 +1249,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.51" +version = "0.3.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" +checksum = "ce791b7ca6638aae45be056e068fc756d871eb3b3b10b8efa62d1c9cec616752" dependencies = [ "wasm-bindgen", ] @@ -2798,9 +2798,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.24" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1" +checksum = "16646b21c3add8e13fdb8f20172f8a28c3dbf62f45406bcff0233188226cfe0c" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2839,9 +2839,9 @@ checksum = "2e0c4a743a309662d45f4ede961d7afa4ba4131a59a639f29b0069c3798bbcc2" [[package]] name = "wasm-bindgen-test" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cab416a9b970464c2882ed92d55b0c33046b08e0bdc9d59b3b718acd4e1bae8" +checksum = "ce783b6c3854292723f498b7bfcf65a782a320b6f1cb3012d08dfbc603fa62f5" dependencies = [ "console_error_panic_hook", "js-sys", @@ -2853,9 +2853,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4543fc6cf3541ef0d98bf720104cc6bd856d7eba449fd2aa365ef4fed0e782" +checksum = "3859815cf8435b92f3a34381bef950daffc1403bbb77ef99e35422a7b0abb194" dependencies = [ "proc-macro2", "quote", From fc5e448a73d68d4f7a75303e255ea1e643555f2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Jul 2021 10:02:19 +0000 Subject: [PATCH 25/30] Bump serde_json from 1.0.65 to 1.0.66 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.65 to 1.0.66. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.65...v1.0.66) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fadbe0e5..c89a1172 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2249,9 +2249,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.65" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c5e91e4240b46c4c19219d6cc84784444326131a4210f496f948d5cc827a29" +checksum = "336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127" dependencies = [ "itoa", "ryu", From 2be0f1a3ac447a4df9b028344ea077193764a671 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Aug 2021 10:03:43 +0000 Subject: [PATCH 26/30] Bump anyhow from 1.0.42 to 1.0.43 Bumps [anyhow](https://github.com/dtolnay/anyhow) from 1.0.42 to 1.0.43. - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.42...1.0.43) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c89a1172..c0e87ec9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -87,9 +87,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.42" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" +checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" [[package]] name = "argh" From 605c94e848745520929cad2d0452a69e56814c7f Mon Sep 17 00:00:00 2001 From: Tpt Date: Tue, 17 Aug 2021 20:19:28 +0200 Subject: [PATCH 27/30] Improves executable parameter documentation --- Cargo.lock | 69 +++++++++++++++++++++----------------------- server/Cargo.toml | 2 +- server/src/main.rs | 10 ++++--- wikibase/Cargo.toml | 2 +- wikibase/src/main.rs | 13 +++++---- 5 files changed, 49 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c0e87ec9..b254fcb7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -355,9 +355,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" @@ -668,9 +668,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -1240,9 +1240,9 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "jobserver" -version = "0.1.22" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd" +checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" dependencies = [ "libc", ] @@ -1318,9 +1318,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.98" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" +checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" [[package]] name = "libloading" @@ -1365,9 +1365,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "md-5" @@ -1492,9 +1492,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.35" +version = "0.10.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" +checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -1521,9 +1521,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.65" +version = "0.9.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" +checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82" dependencies = [ "autocfg", "cc", @@ -2028,9 +2028,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ "bitflags", ] @@ -2133,7 +2133,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.3", + "semver 1.0.4", ] [[package]] @@ -2207,9 +2207,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe" +checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" [[package]] name = "semver-parser" @@ -2219,18 +2219,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.126" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" +checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" dependencies = [ "serde_derive", ] [[package]] name = "serde_cbor" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ "half", "serde", @@ -2238,9 +2238,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.126" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" +checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" dependencies = [ "proc-macro2", "quote", @@ -2336,9 +2336,9 @@ checksum = "729a25c17d72b06c68cb47955d44fda88ad2d3e7d77e025663fdd69b93dd71a1" [[package]] name = "slab" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" +checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590" [[package]] name = "sled" @@ -2635,9 +2635,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7b349f11a7047e6d1276853e612d152f5e8a352c61917887cc2169e2366b4c" +checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b" dependencies = [ "autocfg", "pin-project-lite", @@ -2651,12 +2651,9 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[package]] name = "unicode-bidi" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] +checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085" [[package]] name = "unicode-normalization" @@ -2863,9 +2860,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.51" +version = "0.3.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" +checksum = "01c70a82d842c9979078c772d4a1344685045f1a5628f677c2b2eab4dd7d2696" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/server/Cargo.toml b/server/Cargo.toml index 9dcd8b04..734de4e2 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -7,7 +7,7 @@ readme = "README.md" repository = "https://github.com/oxigraph/oxigraph/tree/master/server" homepage = "https://oxigraph.org/server/" description = """ -SPARQL server based on Oxigraph +Oxigraph SPARQL HTTP server """ edition = "2018" diff --git a/server/src/main.rs b/server/src/main.rs index 0a8d654a..ee2a42e9 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -14,7 +14,7 @@ use async_std::io::Read; use async_std::net::{TcpListener, TcpStream}; use async_std::prelude::*; use async_std::task::{block_on, spawn}; -use clap::{App, Arg}; +use clap::{crate_version, App, Arg}; use http_types::content::ContentType; use http_types::{ bail_status, format_err_status, headers, Error, Method, Mime, Request, Response, Result, @@ -42,11 +42,13 @@ const SERVER: &str = concat!("Oxigraph/", env!("CARGO_PKG_VERSION")); #[async_std::main] pub async fn main() -> Result<()> { let matches = App::new("Oxigraph SPARQL server") + .version(crate_version!()) .arg( Arg::with_name("bind") .short("b") .long("bind") - .help("Sets a custom config file") + .help("Host and port to listen to") + .default_value("localhost:7878") .takes_value(true), ) .arg( @@ -58,8 +60,8 @@ pub async fn main() -> Result<()> { .required(true), ) .get_matches(); - let bind = matches.value_of("bind").unwrap_or("localhost:7878"); - let file = matches.value_of("file").unwrap(); + let bind = matches.value_of("bind").unwrap(); + let file = matches.value_of_os("file").unwrap(); let store = Store::open(file)?; println!("Listening for requests at http://{}", &bind); diff --git a/wikibase/Cargo.toml b/wikibase/Cargo.toml index 7e034955..f1499c39 100644 --- a/wikibase/Cargo.toml +++ b/wikibase/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/oxigraph/oxigraph/tree/master/wikibase" description = """ -SPARQL server based on Oxigraph for Wikibase instances +Oxigraph SPARQL server for Wikibase """ edition = "2018" diff --git a/wikibase/src/main.rs b/wikibase/src/main.rs index 0ce52097..fa29624f 100644 --- a/wikibase/src/main.rs +++ b/wikibase/src/main.rs @@ -14,7 +14,7 @@ use async_std::future::Future; use async_std::net::{TcpListener, TcpStream}; use async_std::prelude::*; use async_std::task::spawn; -use clap::{App, Arg}; +use clap::{crate_version, App, Arg}; use http_types::content::ContentType; use http_types::{ bail_status, format_err_status, headers, Error, Method, Mime, Request, Response, Result, @@ -36,11 +36,13 @@ const SERVER: &str = concat!("Oxigraph/", env!("CARGO_PKG_VERSION")); #[async_std::main] pub async fn main() -> Result<()> { let matches = App::new("Oxigraph SPARQL server for Wikibase") + .version(crate_version!()) .arg( Arg::with_name("bind") .short("b") .long("bind") - .help("Sets a custom config file") + .help("Host and port to listen to") + .default_value("localhost:7878") .takes_value(true), ) .arg( @@ -75,11 +77,12 @@ pub async fn main() -> Result<()> { Arg::with_name("slot") .long("slot") .help("slot to load like 'mediainfo'. Could not be use with namespaces") - .takes_value(true), + .takes_value(true) + .conflicts_with("namespaces"), ) .get_matches(); - let bind = matches.value_of("bind").unwrap_or("localhost:7878"); - let file = matches.value_of("file").unwrap(); + let bind = matches.value_of("bind").unwrap(); + let file = matches.value_of_os("file").unwrap(); let mediawiki_api = matches.value_of("mediawiki_api").unwrap(); let mediawiki_base_url = matches.value_of("mediawiki_base_url").unwrap(); let namespaces = matches From 294376c7252a802dbe830a66935c4a2e27e36662 Mon Sep 17 00:00:00 2001 From: Tpt Date: Tue, 17 Aug 2021 22:09:38 +0200 Subject: [PATCH 28/30] Fixes python wheel metadata --- python/pyproject.toml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/python/pyproject.toml b/python/pyproject.toml index 6b785213..de8fa52a 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "maturin" [project] # Most of the metadata are in Cargo.toml and injected by maturin name = "pyoxigraph" -classifier = [ +classifiers = [ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", "License :: OSI Approved :: Apache Software License", @@ -22,9 +22,8 @@ classifier = [ requires-python = ">=3.6" [project.urls] -changelog = "https://github.com/oxigraph/oxigraph/blob/master/CHANGELOG.md" -documentation = "https://oxigraph.org/pyoxigraph/" -homepage = "https://oxigraph.org/pyoxigraph/" -repository = "https://github.com/oxigraph/oxigraph/tree/master/python" -source = "https://github.com/oxigraph/oxigraph/tree/master/python" -tracker = "https://github.com/oxigraph/oxigraph/issues" +Changelog = "https://github.com/oxigraph/oxigraph/blob/master/CHANGELOG.md" +Documentation = "https://oxigraph.org/pyoxigraph/" +Homepage = "https://oxigraph.org/pyoxigraph/" +Source = "https://github.com/oxigraph/oxigraph/tree/master/python" +Tracker = "https://github.com/oxigraph/oxigraph/issues" From 596f196f1aad9567d43acc7a77278181d20bdda1 Mon Sep 17 00:00:00 2001 From: Tpt Date: Sat, 21 Aug 2021 14:03:51 +0200 Subject: [PATCH 29/30] Upgrades to nom 7 --- Cargo.lock | 80 ++++++++++++++++++++++++++++++-------------------- lib/Cargo.toml | 2 +- 2 files changed, 49 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b254fcb7..b1167f2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1130,9 +1130,9 @@ dependencies = [ [[package]] name = "http-client" -version = "6.4.1" +version = "6.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce318d86a47d18d1db645c979214f809a6cd625202ad334ef75ca813b30dac80" +checksum = "ea880b03c18a7e981d7fb3608b8904a98425d53c440758fcebf7d934aa56547c" dependencies = [ "async-h1", "async-native-tls", @@ -1170,9 +1170,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" +checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" [[package]] name = "idna" @@ -1249,9 +1249,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.52" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce791b7ca6638aae45be056e068fc756d871eb3b3b10b8efa62d1c9cec616752" +checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d" dependencies = [ "wasm-bindgen", ] @@ -1318,9 +1318,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f823d141fe0a24df1e23b4af4e3c7ba9e5966ec514ea068c93024aa7deb765" +checksum = "a1fa8cddc8fbbee11227ef194b5317ed014b8acbf15139bd716a18ad3fe99ec5" [[package]] name = "libloading" @@ -1382,9 +1382,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memoffset" @@ -1395,6 +1395,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "minimal-lexical" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6595bb28ed34f43c3fe088e48f6cfb2e033cab45f25a5384d5fdf564fbc8c4b2" + [[package]] name = "mownstr" version = "0.1.1" @@ -1438,11 +1444,21 @@ checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" dependencies = [ "bitvec", "funty", - "lexical-core", "memchr", "version_check", ] +[[package]] +name = "nom" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffd9d26838a953b4af82cbeb9f1592c6798916983959be223a7124e992742c1" +dependencies = [ + "memchr", + "minimal-lexical", + "version_check", +] + [[package]] name = "num-integer" version = "0.1.44" @@ -1548,7 +1564,7 @@ dependencies = [ "lasso", "md-5", "native-tls", - "nom 6.1.2", + "nom 7.0.0", "oxilangtag", "oxiri", "peg", @@ -2482,9 +2498,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.74" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c" +checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7" dependencies = [ "proc-macro2", "quote", @@ -2770,9 +2786,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.75" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b608ecc8f4198fe8680e2ed18eccab5f0cd4caaf3d83516fa5fb2e927fda2586" +checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2780,9 +2796,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.75" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "580aa3a91a63d23aac5b6b267e2d13cb4f363e31dce6c352fca4752ae12e479f" +checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041" dependencies = [ "bumpalo", "lazy_static", @@ -2795,9 +2811,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.25" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16646b21c3add8e13fdb8f20172f8a28c3dbf62f45406bcff0233188226cfe0c" +checksum = "95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2807,9 +2823,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.75" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171ebf0ed9e1458810dfcb31f2e766ad6b3a89dbda42d8901f2b268277e5f09c" +checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2817,9 +2833,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.75" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2657dd393f03aa2a659c25c6ae18a13a4048cebd220e147933ea837efc589f" +checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad" dependencies = [ "proc-macro2", "quote", @@ -2830,15 +2846,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.75" +version = "0.2.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e0c4a743a309662d45f4ede961d7afa4ba4131a59a639f29b0069c3798bbcc2" +checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29" [[package]] name = "wasm-bindgen-test" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce783b6c3854292723f498b7bfcf65a782a320b6f1cb3012d08dfbc603fa62f5" +checksum = "046f563713e2e7a602f0b45d49a564355f9a8a404cac3fa27b9855718f6ba97a" dependencies = [ "console_error_panic_hook", "js-sys", @@ -2850,9 +2866,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3859815cf8435b92f3a34381bef950daffc1403bbb77ef99e35422a7b0abb194" +checksum = "3b561e538d0e87b844dd2ce4608581373854f19c4fa2c473570d9fa3797eeb56" dependencies = [ "proc-macro2", "quote", @@ -2860,9 +2876,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.52" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c70a82d842c9979078c772d4a1344685045f1a5628f677c2b2eab4dd7d2696" +checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 309acf79..71c31ba2 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -37,7 +37,7 @@ rio_api = "0.5" rio_turtle = "0.5" rio_xml = "0.5" hex = "0.4" -nom = "6" +nom = "7" peg = "0.7" siphasher = "0.3" lasso = {version="0.5", features=["multi-threaded", "inline-more"]} From b1d204ed9b47803575a114b81ac795e832a69bc9 Mon Sep 17 00:00:00 2001 From: Thomas Tanon Date: Mon, 30 Aug 2021 22:20:48 +0200 Subject: [PATCH 30/30] README: Adds a link to milestones --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d411cd93..d44fe35d 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Its goal is to provide a compliant, safe, and fast graph database based on the [ It is written in Rust. It also provides a set of utility functions for reading, writing, and processing RDF files. -Oxigraph is in heavy development and SPARQL query evaluation has not been optimized yet. +Oxigraph is in heavy development and SPARQL query evaluation has not been optimized yet. The development roadmap is using [GitHub milestones](https://github.com/oxigraph/oxigraph/milestones?direction=desc&sort=completeness&state=open). It is split into multiple parts: * [The database written as a Rust library](https://crates.io/crates/oxigraph). Its source code is in the `lib` directory.