diff --git a/src/io/owx/reader.rs b/src/io/owx/reader.rs index 9c1ee13..1295033 100644 --- a/src/io/owx/reader.rs +++ b/src/io/owx/reader.rs @@ -28,7 +28,6 @@ where build: &'a Build, mapping: PrefixMapping, reader: NsReader, - // buf: Vec, } pub fn read( @@ -39,12 +38,12 @@ pub fn read( read_with_build(bufread, &b) } -pub fn read_with_build( +pub fn read_with_build + Default, R: BufRead>( bufread: R, build: &Build, -) -> Result<(SetOntology, PrefixMapping), HornedError> { +) -> Result<(O, PrefixMapping), HornedError> { let reader: NsReader = NsReader::from_reader(bufread); - let mut ont = SetOntology::new(); + let mut ont: O = Default::default(); let mapping = PrefixMapping::default(); let mut buf = Vec::new(); @@ -52,7 +51,6 @@ pub fn read_with_build( reader, build, mapping, - // buf: Vec::new(), }; loop { @@ -1363,10 +1361,11 @@ pub mod test { ComponentMappedOntology, PrefixMapping, ) { - let r = read(bufread, ParserConfiguration::default()); + let b = Build::new(); + let r = read_with_build(bufread, &b); assert!(r.is_ok(), "Expected ontology, got failure:{:?}", r.err()); let (o, m) = r.ok().unwrap(); - (o.into(), m) + (o, m) } #[test]