Moves xsd module to root

Makes "model" module more stand-alone
pull/190/head
Tpt 3 years ago
parent 837d5d4ff7
commit 4337349aad
  1. 1
      lib/src/lib.rs
  2. 2
      lib/src/model/literal.rs
  3. 1
      lib/src/model/mod.rs
  4. 2
      lib/src/sparql/eval.rs
  5. 2
      lib/src/storage/binary_encoder.rs
  6. 2
      lib/src/storage/numeric_encoder.rs
  7. 2
      lib/src/xsd/date_time.rs
  8. 3
      lib/src/xsd/decimal.rs
  9. 2
      lib/src/xsd/double.rs
  10. 0
      lib/src/xsd/duration.rs
  11. 0
      lib/src/xsd/float.rs
  12. 0
      lib/src/xsd/mod.rs
  13. 10
      lib/src/xsd/parser.rs

@ -178,3 +178,4 @@ mod sophia;
pub mod sparql;
mod storage;
pub mod store;
mod xsd;

@ -1,8 +1,8 @@
use crate::model::named_node::NamedNode;
use crate::model::vocab::rdf;
use crate::model::vocab::xsd;
use crate::model::xsd::*;
use crate::model::NamedNodeRef;
use crate::xsd::*;
use oxilangtag::{LanguageTag, LanguageTagParseError};
use rio_api::model as rio;
use std::borrow::Cow;

@ -13,7 +13,6 @@ mod parser;
mod sophia;
mod triple;
pub mod vocab;
pub(crate) mod xsd;
pub use self::blank_node::{BlankNode, BlankNodeIdParseError, BlankNodeRef};
pub use self::dataset::Dataset;

@ -1,5 +1,4 @@
use crate::model::vocab::{rdf, xsd};
use crate::model::xsd::*;
use crate::model::{BlankNode, LiteralRef, NamedNodeRef};
use crate::model::{NamedNode, Term, Triple};
use crate::sparql::algebra::{Query, QueryDataset};
@ -10,6 +9,7 @@ use crate::sparql::plan::*;
use crate::sparql::service::ServiceHandler;
use crate::storage::numeric_encoder::*;
use crate::storage::small_string::SmallString;
use crate::xsd::*;
use digest::Digest;
use md5::Md5;
use oxilangtag::LanguageTag;

@ -1,8 +1,8 @@
use crate::model::xsd::*;
use crate::storage::numeric_encoder::{EncodedQuad, EncodedTerm, EncodedTriple, StrHash};
use crate::storage::small_string::SmallString;
use crate::storage::StorageError;
use crate::store::CorruptionError;
use crate::xsd::*;
use std::io::{Cursor, Read};
use std::mem::size_of;
use std::rc::Rc;

@ -1,9 +1,9 @@
#![allow(clippy::unreadable_literal)]
use crate::model::xsd::*;
use crate::model::*;
use crate::storage::small_string::SmallString;
use crate::store::{CorruptionError, StorageError};
use crate::xsd::*;
use siphasher::sip128::{Hasher128, SipHasher24};
use std::fmt::Debug;
use std::hash::Hash;

@ -1,6 +1,6 @@
use super::parser::{date_lexical_rep, date_time_lexical_rep, parse_value, time_lexical_rep};
use super::{DayTimeDuration, Decimal, Duration, XsdParseError, YearMonthDuration};
use crate::model::xsd::parser::{
use crate::xsd::parser::{
g_day_lexical_rep, g_month_day_lexical_rep, g_month_lexical_rep, g_year_lexical_rep,
g_year_month_lexical_rep,
};

@ -1,5 +1,4 @@
use crate::model::xsd::double::Double;
use crate::model::xsd::Float;
use crate::xsd::{Double, Float};
use std::error::Error;
use std::fmt;
use std::fmt::Write;

@ -1,4 +1,4 @@
use crate::model::xsd::Float;
use crate::xsd::Float;
use std::cmp::Ordering;
use std::fmt;
use std::hash::{Hash, Hasher};

@ -1,3 +1,6 @@
use super::date_time::{DateTimeError, GDay, GMonth, GMonthDay, GYear, GYearMonth, TimezoneOffset};
use super::decimal::ParseDecimalError;
use super::duration::{DayTimeDuration, YearMonthDuration};
use super::*;
use nom::branch::alt;
use nom::bytes::complete::{tag, take_while, take_while_m_n};
@ -8,15 +11,10 @@ use nom::multi::many1;
use nom::sequence::{preceded, terminated, tuple};
use nom::Err;
use nom::{IResult, Needed};
use std::str::FromStr;
use super::date_time::DateTimeError;
use super::decimal::ParseDecimalError;
use crate::model::xsd::date_time::{GDay, GMonth, GMonthDay, GYear, GYearMonth, TimezoneOffset};
use crate::model::xsd::duration::{DayTimeDuration, YearMonthDuration};
use std::error::Error;
use std::fmt;
use std::num::ParseIntError;
use std::str::FromStr;
#[derive(Debug, Clone)]
pub struct XsdParseError {
Loading…
Cancel
Save