From e5a84adae1b7c91cdf04c82e4d5992ec70cc94e4 Mon Sep 17 00:00:00 2001 From: Garrett Ng <56460265+GarrettNg@users.noreply.github.com> Date: Thu, 16 Nov 2023 09:45:38 -0500 Subject: [PATCH] Simplify GFF/GTF reader types --- oxbow/src/gff.rs | 12 +++--------- oxbow/src/gtf.rs | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/oxbow/src/gff.rs b/oxbow/src/gff.rs index 2b17185..46c5a83 100644 --- a/oxbow/src/gff.rs +++ b/oxbow/src/gff.rs @@ -9,24 +9,18 @@ use noodles::gff; use crate::batch_builder::{write_ipc_err, BatchBuilder}; -/// A GFF reader. pub struct GffReader { - reader: gff::Reader>, + reader: gff::Reader, } impl GffReader> { - /// Creates a GFF reader from a given file path. pub fn new_from_path(path: &str) -> std::io::Result { - let reader = File::open(path) - .map(BufReader::new) - .map(BufReader::new) - .map(gff::Reader::new)?; + let reader = File::open(path).map(BufReader::new).map(gff::Reader::new)?; Ok(Self { reader }) } } -impl GffReader { - /// Creates a GFF Reader. +impl GffReader> { pub fn new(read: R) -> std::io::Result { let reader = gff::Reader::new(BufReader::new(read)); Ok(Self { reader }) diff --git a/oxbow/src/gtf.rs b/oxbow/src/gtf.rs index 8cbc9e0..a597ea7 100644 --- a/oxbow/src/gtf.rs +++ b/oxbow/src/gtf.rs @@ -9,24 +9,18 @@ use noodles::gtf; use crate::batch_builder::{write_ipc_err, BatchBuilder}; -/// A GTF reader. pub struct GtfReader { - reader: gtf::Reader>, + reader: gtf::Reader, } impl GtfReader> { - /// Creates a GTF reader from a given file path. pub fn new_from_path(path: &str) -> std::io::Result { - let reader = File::open(path) - .map(BufReader::new) - .map(BufReader::new) - .map(gtf::Reader::new)?; + let reader = File::open(path).map(BufReader::new).map(gtf::Reader::new)?; Ok(Self { reader }) } } -impl GtfReader { - /// Creates a GTF Reader. +impl GtfReader> { pub fn new(read: R) -> std::io::Result { let reader = gtf::Reader::new(BufReader::new(read)); Ok(Self { reader })