From 8722206be899815e720b9e398636729a5a75632c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Thu, 18 Nov 2021 21:44:09 +0200
Subject: [PATCH] hlssink3: Update to m3u8-rs 3

This uses nom 7 now.
---
 deny.toml                    | 15 +++++++--------
 net/hlssink3/Cargo.toml      |  2 +-
 net/hlssink3/src/imp.rs      |  2 +-
 net/hlssink3/src/playlist.rs |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/deny.toml b/deny.toml
index 29a507f6..ec85a30c 100644
--- a/deny.toml
+++ b/deny.toml
@@ -86,18 +86,13 @@ version = "0.1"
 name = "pin-project-lite"
 version = "0.1"
 
-# ignore duplicated nom dependency because cexpr, m3u8-rs depends on an old version
+# ignore duplicated nom dependency because cexpr depends on an old version
 # https://github.com/jethrogb/rust-cexpr/issues/26
 [[bans.skip]]
 name = "nom"
 version = "5"
 
-# ignore duplicated arrayvec dependency because nom 5 depends on an old version
-[[bans.skip]]
-name = "arrayvec"
-version = "0.5"
-
-# ignore duplicated nom dependency because tokio v0.2 depends on an old version
+# ignore duplicated bytes/mio dependency because tokio v0.2 depends on an old version
 [[bans.skip]]
 name = "bytes"
 version = "0.5"
@@ -137,10 +132,14 @@ name = "ansi_term"
 version = "0.11"
 
 # ignore duplicated system-deps dependency because dav1d depends on an old version
-# https://github.com/rusoto/rusoto/pull/1915
 [[bans.skip]]
 name = "system-deps"
 version = "3"
+
+[[bans.skip]]
+name = "version-compare"
+version = "0.0"
+
 [[bans.skip]]
 name = "cfg-expr"
 version = "0.7"
diff --git a/net/hlssink3/Cargo.toml b/net/hlssink3/Cargo.toml
index cf696364..7e1bde32 100644
--- a/net/hlssink3/Cargo.toml
+++ b/net/hlssink3/Cargo.toml
@@ -15,7 +15,7 @@ gst-app = { package = "gstreamer-app", git = "https://gitlab.freedesktop.org/gst
 glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 gio = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 once_cell = "1.7.2"
-m3u8-rs = "2.0.0"
+m3u8-rs = "3"
 regex = "1"
 
 [dev-dependencies]
diff --git a/net/hlssink3/src/imp.rs b/net/hlssink3/src/imp.rs
index 22e8c0f4..cb4359d4 100644
--- a/net/hlssink3/src/imp.rs
+++ b/net/hlssink3/src/imp.rs
@@ -13,7 +13,7 @@ use glib::subclass::prelude::*;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_info, gst_trace, gst_warning};
-use m3u8_rs::playlist::MediaPlaylistType;
+use m3u8_rs::MediaPlaylistType;
 use once_cell::sync::Lazy;
 use std::fs;
 use std::io::Write;
diff --git a/net/hlssink3/src/playlist.rs b/net/hlssink3/src/playlist.rs
index a617b7df..a5d228f1 100644
--- a/net/hlssink3/src/playlist.rs
+++ b/net/hlssink3/src/playlist.rs
@@ -7,7 +7,7 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-use m3u8_rs::playlist::{MediaPlaylist, MediaPlaylistType, MediaSegment};
+use m3u8_rs::{MediaPlaylist, MediaPlaylistType, MediaSegment};
 use once_cell::sync::Lazy;
 use regex::Regex;
 use std::io::Write;