mirrors/hls_m3u8
1
0
Fork 0
mirror of https://github.com/sile/hls_m3u8.git synced 2024-06-18 12:50:31 +00:00
Code Issues Projects Releases Wiki Activity

Apply rustfmt-1.0.0

Browse source
This commit is contained in:
Takeru Ohta 2019-03-31 18:54:21 +09:00
parent ac57417cc7
commit 625d037b27
5 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
examples/parse.rs
View file

@ -16,13 +16,12 @@ fn main() {
.takes_value(true)
.default_value("media")
.possible_values(&["media", "master"]),
).get_matches();
)
.get_matches();
let mut m3u8 = String::new();
track_try_unwrap!(
io::stdin()
.read_to_string(&mut m3u8)
.map_err(Failure::from_error)
);
track_try_unwrap!(io::stdin()
.read_to_string(&mut m3u8)
.map_err(Failure::from_error));
match matches.value_of("M3U8_TYPE").unwrap() {
"media" => {

6
src/master_playlist.rs
View file

@ -102,14 +102,16 @@ impl MasterPlaylistBuilder {
self.independent_segments_tag
.iter()
.map(|t| t.requires_version()),
).chain(self.start_tag.iter().map(|t| t.requires_version()))
)
.chain(self.start_tag.iter().map(|t| t.requires_version()))
.chain(self.media_tags.iter().map(|t| t.requires_version()))
.chain(self.stream_inf_tags.iter().map(|t| t.requires_version()))
.chain(
self.i_frame_stream_inf_tags
.iter()
.map(|t| t.requires_version()),
).chain(self.session_data_tags.iter().map(|t| t.requires_version()))
)
.chain(self.session_data_tags.iter().map(|t| t.requires_version()))
.chain(self.session_key_tags.iter().map(|t| t.requires_version()))
.max()
.expect("Never fails")

29
src/media_playlist.rs
View file

@ -160,18 +160,21 @@ impl MediaPlaylistBuilder {
self.target_duration_tag
.iter()
.map(|t| t.requires_version()),
).chain(self.media_sequence_tag.iter().map(|t| t.requires_version()))
)
.chain(self.media_sequence_tag.iter().map(|t| t.requires_version()))
.chain(
self.discontinuity_sequence_tag
.iter()
.map(|t| t.requires_version()),
).chain(self.playlist_type_tag.iter().map(|t| t.requires_version()))
)
.chain(self.playlist_type_tag.iter().map(|t| t.requires_version()))
.chain(self.i_frames_only_tag.iter().map(|t| t.requires_version()))
.chain(
self.independent_segments_tag
.iter()
.map(|t| t.requires_version()),
).chain(self.start_tag.iter().map(|t| t.requires_version()))
)
.chain(self.start_tag.iter().map(|t| t.requires_version()))
.chain(self.end_list_tag.iter().map(|t| t.requires_version()))
.chain(self.segments.iter().map(|s| s.requires_version()))
.max()
@ -475,20 +478,16 @@ mod tests {
assert!(m3u8.parse::<MediaPlaylist>().is_err());
// Error (allowable segment duration = 9)
assert!(
MediaPlaylistOptions::new()
.allowable_excess_segment_duration(Duration::from_secs(1))
.parse(m3u8)
.is_err()
);
assert!(MediaPlaylistOptions::new()
.allowable_excess_segment_duration(Duration::from_secs(1))
.parse(m3u8)
.is_err());
// Ok (allowable segment duration = 10)
assert!(
MediaPlaylistOptions::new()
.allowable_excess_segment_duration(Duration::from_secs(2))
.parse(m3u8)
.is_ok()
);
assert!(MediaPlaylistOptions::new()
.allowable_excess_segment_duration(Duration::from_secs(2))
.parse(m3u8)
.is_ok());
}
#[test]

3
src/media_segment.rs
View file

@ -167,7 +167,8 @@ impl MediaSegment {
self.program_date_time_tag
.iter()
.map(|t| t.requires_version()),
).chain(iter::once(self.inf_tag.requires_version()))
)
.chain(iter::once(self.inf_tag.requires_version()))
.max()
.expect("Never fails")
}

6
src/types.rs
View file

@ -411,9 +411,9 @@ impl FromStr for ByteRange {
let mut tokens = s.splitn(2, '@');
let length = tokens.next().expect("Never fails");
let start = if let Some(start) = tokens.next() {
Some(track!(
start.parse().map_err(|e| ErrorKind::InvalidInput.cause(e))
)?)
Some(track!(start
.parse()
.map_err(|e| ErrorKind::InvalidInput.cause(e)))?)
} else {
None
};