From 2b85a064878a5674027839e776f5cbca070a621f Mon Sep 17 00:00:00 2001
From: Tpt <thomaspt@hotmail.fr>
Date: Fri, 1 May 2020 19:59:00 +0200
Subject: [PATCH] Migrates to oxiri and oxilangtag

---
 lib/Cargo.toml              | 2 ++
 lib/src/error.rs            | 4 ++--
 lib/src/model/literal.rs    | 2 +-
 lib/src/model/named_node.rs | 2 +-
 lib/src/sparql/algebra.rs   | 2 +-
 lib/src/sparql/eval.rs      | 4 ++--
 lib/src/sparql/mod.rs       | 2 +-
 lib/src/sparql/parser.rs    | 2 +-
 8 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/Cargo.toml b/lib/Cargo.toml
index 0ba0bfd6..ff62d487 100644
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -21,6 +21,8 @@ sha-1 = "0.8"
 sha2 = "0.8"
 digest = "0.8"
 regex = "1"
+oxilangtag = "0.1"
+oxiri = "0.1"
 rio_api = "0.4"
 rio_turtle = "0.4"
 rio_xml = "0.4"
diff --git a/lib/src/error.rs b/lib/src/error.rs
index d7d4c24f..997ed1c9 100644
--- a/lib/src/error.rs
+++ b/lib/src/error.rs
@@ -1,7 +1,7 @@
+use oxilangtag::LanguageTagParseError;
+use oxiri::IriParseError;
 use peg::error::ParseError;
 use peg::str::LineCol;
-use rio_api::iri::IriParseError;
-use rio_api::language_tag::LanguageTagParseError;
 use rio_turtle::TurtleError;
 use rio_xml::RdfXmlError;
 use std::error;
diff --git a/lib/src/model/literal.rs b/lib/src/model/literal.rs
index 7ac6143d..d1aea2f3 100644
--- a/lib/src/model/literal.rs
+++ b/lib/src/model/literal.rs
@@ -3,7 +3,7 @@ use crate::model::vocab::rdf;
 use crate::model::vocab::xsd;
 use crate::model::xsd::*;
 use crate::Result;
-use rio_api::language_tag::LanguageTag;
+use oxilangtag::LanguageTag;
 use rio_api::model as rio;
 use std::borrow::Cow;
 use std::fmt;
diff --git a/lib/src/model/named_node.rs b/lib/src/model/named_node.rs
index 3e8df04a..dcd55420 100644
--- a/lib/src/model/named_node.rs
+++ b/lib/src/model/named_node.rs
@@ -1,5 +1,5 @@
 use crate::Result;
-use rio_api::iri::Iri;
+use oxiri::Iri;
 use rio_api::model as rio;
 use std::fmt;
 
diff --git a/lib/src/sparql/algebra.rs b/lib/src/sparql/algebra.rs
index ddbea4e4..e5c4773e 100644
--- a/lib/src/sparql/algebra.rs
+++ b/lib/src/sparql/algebra.rs
@@ -2,7 +2,7 @@
 
 use crate::model::*;
 use crate::sparql::model::*;
-use rio_api::iri::Iri;
+use oxiri::Iri;
 use rio_api::model as rio;
 use std::collections::BTreeMap;
 use std::collections::BTreeSet;
diff --git a/lib/src/sparql/eval.rs b/lib/src/sparql/eval.rs
index 2c4f6f6c..e3306685 100644
--- a/lib/src/sparql/eval.rs
+++ b/lib/src/sparql/eval.rs
@@ -11,10 +11,10 @@ use crate::Error;
 use crate::Result;
 use digest::Digest;
 use md5::Md5;
+use oxilangtag::LanguageTag;
+use oxiri::Iri;
 use rand::random;
 use regex::{Regex, RegexBuilder};
-use rio_api::iri::Iri;
-use rio_api::language_tag::LanguageTag;
 use rio_api::model as rio;
 use sha1::Sha1;
 use sha2::{Sha256, Sha384, Sha512};
diff --git a/lib/src/sparql/mod.rs b/lib/src/sparql/mod.rs
index 059af70a..44c6dc14 100644
--- a/lib/src/sparql/mod.rs
+++ b/lib/src/sparql/mod.rs
@@ -19,7 +19,7 @@ use crate::sparql::plan_builder::PlanBuilder;
 use crate::store::StoreConnection;
 use crate::Error;
 use crate::Result;
-use rio_api::iri::Iri;
+use oxiri::Iri;
 use std::fmt;
 
 pub use crate::sparql::algebra::GraphPattern;
diff --git a/lib/src/sparql/parser.rs b/lib/src/sparql/parser.rs
index 719abdef..3f59d5db 100644
--- a/lib/src/sparql/parser.rs
+++ b/lib/src/sparql/parser.rs
@@ -3,8 +3,8 @@ use crate::model::vocab::xsd;
 use crate::model::*;
 use crate::sparql::algebra::*;
 use crate::sparql::model::*;
+use oxiri::{Iri, IriParseError};
 use peg::parser;
-use rio_api::iri::{Iri, IriParseError};
 use std::borrow::Cow;
 use std::char;
 use std::collections::HashMap;