From cec25050b5eec0ebdcbf5ebf68a4e8c2760aefdf Mon Sep 17 00:00:00 2001 From: Takeru Ohta Date: Thu, 15 Feb 2018 04:51:44 +0900 Subject: [PATCH] Rename module: s/tag/tags/ --- src/lib.rs | 2 +- src/line.rs | 92 +++++++++---------- src/master_playlist.rs | 4 +- src/media_playlist.rs | 6 +- src/media_segment.rs | 4 +- src/{tag => tags}/basic.rs | 0 src/{tag => tags}/master_playlist.rs | 0 src/{tag => tags}/media_or_master_playlist.rs | 0 src/{tag => tags}/media_playlist.rs | 0 src/{tag => tags}/media_segment.rs | 0 src/{tag => tags}/mod.rs | 0 11 files changed, 54 insertions(+), 54 deletions(-) rename src/{tag => tags}/basic.rs (100%) rename src/{tag => tags}/master_playlist.rs (100%) rename src/{tag => tags}/media_or_master_playlist.rs (100%) rename src/{tag => tags}/media_playlist.rs (100%) rename src/{tag => tags}/media_segment.rs (100%) rename src/{tag => tags}/mod.rs (100%) diff --git a/src/lib.rs b/src/lib.rs index eabedae..0768f16 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -15,7 +15,7 @@ pub use master_playlist::{MasterPlaylist, MasterPlaylistBuilder}; pub use media_playlist::{MediaPlaylist, MediaPlaylistBuilder}; pub use media_segment::{MediaSegment, MediaSegmentBuilder}; -pub mod tag; // TODO: s/tag/tags/ +pub mod tags; pub mod types; mod attribute; diff --git a/src/line.rs b/src/line.rs index 600c390..276cb62 100644 --- a/src/line.rs +++ b/src/line.rs @@ -2,7 +2,7 @@ use std::fmt; use std::str::FromStr; use {Error, ErrorKind, Result}; -use tag; +use tags; use types::SingleLineString; #[derive(Debug)] @@ -23,7 +23,7 @@ impl<'a> Lines<'a> { match c { '\n' => { if !next_line_of_ext_x_stream_inf - && self.input.starts_with(tag::ExtXStreamInf::PREFIX) + && self.input.starts_with(tags::ExtXStreamInf::PREFIX) { next_line_of_ext_x_stream_inf = true; adjust = 0; @@ -80,28 +80,28 @@ pub enum Line<'a> { #[derive(Debug, Clone, PartialEq, Eq)] pub enum Tag { - ExtM3u(tag::ExtM3u), - ExtXVersion(tag::ExtXVersion), - ExtInf(tag::ExtInf), - ExtXByteRange(tag::ExtXByteRange), - ExtXDiscontinuity(tag::ExtXDiscontinuity), - ExtXKey(tag::ExtXKey), - ExtXMap(tag::ExtXMap), - ExtXProgramDateTime(tag::ExtXProgramDateTime), - ExtXDateRange(tag::ExtXDateRange), - ExtXTargetDuration(tag::ExtXTargetDuration), - ExtXMediaSequence(tag::ExtXMediaSequence), - ExtXDiscontinuitySequence(tag::ExtXDiscontinuitySequence), - ExtXEndList(tag::ExtXEndList), - ExtXPlaylistType(tag::ExtXPlaylistType), - ExtXIFramesOnly(tag::ExtXIFramesOnly), - ExtXMedia(tag::ExtXMedia), - ExtXStreamInf(tag::ExtXStreamInf), - ExtXIFrameStreamInf(tag::ExtXIFrameStreamInf), - ExtXSessionData(tag::ExtXSessionData), - ExtXSessionKey(tag::ExtXSessionKey), - ExtXIndependentSegments(tag::ExtXIndependentSegments), - ExtXStart(tag::ExtXStart), + ExtM3u(tags::ExtM3u), + ExtXVersion(tags::ExtXVersion), + ExtInf(tags::ExtInf), + ExtXByteRange(tags::ExtXByteRange), + ExtXDiscontinuity(tags::ExtXDiscontinuity), + ExtXKey(tags::ExtXKey), + ExtXMap(tags::ExtXMap), + ExtXProgramDateTime(tags::ExtXProgramDateTime), + ExtXDateRange(tags::ExtXDateRange), + ExtXTargetDuration(tags::ExtXTargetDuration), + ExtXMediaSequence(tags::ExtXMediaSequence), + ExtXDiscontinuitySequence(tags::ExtXDiscontinuitySequence), + ExtXEndList(tags::ExtXEndList), + ExtXPlaylistType(tags::ExtXPlaylistType), + ExtXIFramesOnly(tags::ExtXIFramesOnly), + ExtXMedia(tags::ExtXMedia), + ExtXStreamInf(tags::ExtXStreamInf), + ExtXIFrameStreamInf(tags::ExtXIFrameStreamInf), + ExtXSessionData(tags::ExtXSessionData), + ExtXSessionKey(tags::ExtXSessionKey), + ExtXIndependentSegments(tags::ExtXIndependentSegments), + ExtXStart(tags::ExtXStart), Unknown(SingleLineString), } impl fmt::Display for Tag { @@ -136,49 +136,49 @@ impl fmt::Display for Tag { impl FromStr for Tag { type Err = Error; fn from_str(s: &str) -> Result { - if s.starts_with(tag::ExtM3u::PREFIX) { + if s.starts_with(tags::ExtM3u::PREFIX) { track!(s.parse().map(Tag::ExtM3u)) - } else if s.starts_with(tag::ExtXVersion::PREFIX) { + } else if s.starts_with(tags::ExtXVersion::PREFIX) { track!(s.parse().map(Tag::ExtXVersion)) - } else if s.starts_with(tag::ExtInf::PREFIX) { + } else if s.starts_with(tags::ExtInf::PREFIX) { track!(s.parse().map(Tag::ExtInf)) - } else if s.starts_with(tag::ExtXByteRange::PREFIX) { + } else if s.starts_with(tags::ExtXByteRange::PREFIX) { track!(s.parse().map(Tag::ExtXByteRange)) - } else if s.starts_with(tag::ExtXDiscontinuity::PREFIX) { + } else if s.starts_with(tags::ExtXDiscontinuity::PREFIX) { track!(s.parse().map(Tag::ExtXDiscontinuity)) - } else if s.starts_with(tag::ExtXKey::PREFIX) { + } else if s.starts_with(tags::ExtXKey::PREFIX) { track!(s.parse().map(Tag::ExtXKey)) - } else if s.starts_with(tag::ExtXMap::PREFIX) { + } else if s.starts_with(tags::ExtXMap::PREFIX) { track!(s.parse().map(Tag::ExtXMap)) - } else if s.starts_with(tag::ExtXProgramDateTime::PREFIX) { + } else if s.starts_with(tags::ExtXProgramDateTime::PREFIX) { track!(s.parse().map(Tag::ExtXProgramDateTime)) - } else if s.starts_with(tag::ExtXTargetDuration::PREFIX) { + } else if s.starts_with(tags::ExtXTargetDuration::PREFIX) { track!(s.parse().map(Tag::ExtXTargetDuration)) - } else if s.starts_with(tag::ExtXDateRange::PREFIX) { + } else if s.starts_with(tags::ExtXDateRange::PREFIX) { track!(s.parse().map(Tag::ExtXDateRange)) - } else if s.starts_with(tag::ExtXMediaSequence::PREFIX) { + } else if s.starts_with(tags::ExtXMediaSequence::PREFIX) { track!(s.parse().map(Tag::ExtXMediaSequence)) - } else if s.starts_with(tag::ExtXDiscontinuitySequence::PREFIX) { + } else if s.starts_with(tags::ExtXDiscontinuitySequence::PREFIX) { track!(s.parse().map(Tag::ExtXDiscontinuitySequence)) - } else if s.starts_with(tag::ExtXEndList::PREFIX) { + } else if s.starts_with(tags::ExtXEndList::PREFIX) { track!(s.parse().map(Tag::ExtXEndList)) - } else if s.starts_with(tag::ExtXPlaylistType::PREFIX) { + } else if s.starts_with(tags::ExtXPlaylistType::PREFIX) { track!(s.parse().map(Tag::ExtXPlaylistType)) - } else if s.starts_with(tag::ExtXIFramesOnly::PREFIX) { + } else if s.starts_with(tags::ExtXIFramesOnly::PREFIX) { track!(s.parse().map(Tag::ExtXIFramesOnly)) - } else if s.starts_with(tag::ExtXMedia::PREFIX) { + } else if s.starts_with(tags::ExtXMedia::PREFIX) { track!(s.parse().map(Tag::ExtXMedia)) - } else if s.starts_with(tag::ExtXStreamInf::PREFIX) { + } else if s.starts_with(tags::ExtXStreamInf::PREFIX) { track!(s.parse().map(Tag::ExtXStreamInf)) - } else if s.starts_with(tag::ExtXIFrameStreamInf::PREFIX) { + } else if s.starts_with(tags::ExtXIFrameStreamInf::PREFIX) { track!(s.parse().map(Tag::ExtXIFrameStreamInf)) - } else if s.starts_with(tag::ExtXSessionData::PREFIX) { + } else if s.starts_with(tags::ExtXSessionData::PREFIX) { track!(s.parse().map(Tag::ExtXSessionData)) - } else if s.starts_with(tag::ExtXSessionKey::PREFIX) { + } else if s.starts_with(tags::ExtXSessionKey::PREFIX) { track!(s.parse().map(Tag::ExtXSessionKey)) - } else if s.starts_with(tag::ExtXIndependentSegments::PREFIX) { + } else if s.starts_with(tags::ExtXIndependentSegments::PREFIX) { track!(s.parse().map(Tag::ExtXIndependentSegments)) - } else if s.starts_with(tag::ExtXStart::PREFIX) { + } else if s.starts_with(tags::ExtXStart::PREFIX) { track!(s.parse().map(Tag::ExtXStart)) } else { track!(SingleLineString::new(s)).map(Tag::Unknown) diff --git a/src/master_playlist.rs b/src/master_playlist.rs index 1db4133..88a8240 100644 --- a/src/master_playlist.rs +++ b/src/master_playlist.rs @@ -5,8 +5,8 @@ use std::str::FromStr; use {Error, ErrorKind, Result}; use line::{Line, Lines, Tag}; -use tag::{ExtM3u, ExtXIFrameStreamInf, ExtXIndependentSegments, ExtXMedia, ExtXSessionData, - ExtXSessionKey, ExtXStart, ExtXStreamInf, ExtXVersion, MasterPlaylistTag}; +use tags::{ExtM3u, ExtXIFrameStreamInf, ExtXIndependentSegments, ExtXMedia, ExtXSessionData, + ExtXSessionKey, ExtXStart, ExtXStreamInf, ExtXVersion, MasterPlaylistTag}; use types::{ClosedCaptions, MediaType, ProtocolVersion, QuotedString}; /// Master playlist builder. diff --git a/src/media_playlist.rs b/src/media_playlist.rs index 4877b4d..b26e3d0 100644 --- a/src/media_playlist.rs +++ b/src/media_playlist.rs @@ -6,9 +6,9 @@ use std::time::Duration; use {Error, ErrorKind, Result}; use line::{Line, Lines, Tag}; use media_segment::{MediaSegment, MediaSegmentBuilder}; -use tag::{ExtM3u, ExtXDiscontinuitySequence, ExtXEndList, ExtXIFramesOnly, - ExtXIndependentSegments, ExtXMediaSequence, ExtXPlaylistType, ExtXStart, - ExtXTargetDuration, ExtXVersion, MediaPlaylistTag}; +use tags::{ExtM3u, ExtXDiscontinuitySequence, ExtXEndList, ExtXIFramesOnly, + ExtXIndependentSegments, ExtXMediaSequence, ExtXPlaylistType, ExtXStart, + ExtXTargetDuration, ExtXVersion, MediaPlaylistTag}; use types::ProtocolVersion; /// Media playlist builder. diff --git a/src/media_segment.rs b/src/media_segment.rs index 5556403..43063e0 100644 --- a/src/media_segment.rs +++ b/src/media_segment.rs @@ -2,8 +2,8 @@ use std::fmt; use std::iter; use {ErrorKind, Result}; -use tag::{ExtInf, ExtXByteRange, ExtXDateRange, ExtXDiscontinuity, ExtXKey, ExtXMap, - ExtXProgramDateTime, MediaSegmentTag}; +use tags::{ExtInf, ExtXByteRange, ExtXDateRange, ExtXDiscontinuity, ExtXKey, ExtXMap, + ExtXProgramDateTime, MediaSegmentTag}; use types::{ProtocolVersion, SingleLineString}; /// Media segment builder. diff --git a/src/tag/basic.rs b/src/tags/basic.rs similarity index 100% rename from src/tag/basic.rs rename to src/tags/basic.rs diff --git a/src/tag/master_playlist.rs b/src/tags/master_playlist.rs similarity index 100% rename from src/tag/master_playlist.rs rename to src/tags/master_playlist.rs diff --git a/src/tag/media_or_master_playlist.rs b/src/tags/media_or_master_playlist.rs similarity index 100% rename from src/tag/media_or_master_playlist.rs rename to src/tags/media_or_master_playlist.rs diff --git a/src/tag/media_playlist.rs b/src/tags/media_playlist.rs similarity index 100% rename from src/tag/media_playlist.rs rename to src/tags/media_playlist.rs diff --git a/src/tag/media_segment.rs b/src/tags/media_segment.rs similarity index 100% rename from src/tag/media_segment.rs rename to src/tags/media_segment.rs diff --git a/src/tag/mod.rs b/src/tags/mod.rs similarity index 100% rename from src/tag/mod.rs rename to src/tags/mod.rs