From 0949807830f2899de79f6c0b21a3e124729392f4 Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Fri, 3 Apr 2020 20:52:28 +0200
Subject: [PATCH] Stop requiring nightly

---
 Cargo.lock  | 6 +++---
 Cargo.toml  | 2 +-
 src/main.rs | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e703488..9d76ca7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -525,7 +525,7 @@ dependencies = [
 
 [[package]]
 name = "mumble-protocol"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -545,7 +545,7 @@ dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "libnice 0.1.0 (git+https://github.com/johni0702/rust-libnice?rev=1053c81)",
- "mumble-protocol 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mumble-protocol 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "rtp 0.1.0 (git+https://github.com/johni0702/rtp?rev=ee8be93)",
@@ -1572,7 +1572,7 @@ dependencies = [
 "checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432"
 "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
-"checksum mumble-protocol 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "978073c4ba6935bd08bf79ffe1f9914a5b4de127fa25cd56749cc511c3ca5d72"
+"checksum mumble-protocol 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0fd0ae9b89562d3950ce4295df209f5937ae0870410ba5e49a9c80a9296176cf"
 "checksum native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff8e08de0070bbf4c31f452ea2a70db092f36f6f2e4d897adf5674477d488fb2"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
diff --git a/Cargo.toml b/Cargo.toml
index 04f2926..3923bca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ tokio-core = "0.1"
 tokio-codec = "0.1"
 tokio-tls = "0.2"
 native-tls = "0.2"
-mumble-protocol = { version = "0.1", features = ["webrtc-extensions"] }
+mumble-protocol = { version = "0.2", features = ["webrtc-extensions"] }
 tokio-tungstenite = "0.6"
 tungstenite = "0.6"
 rtp = { git = "https://github.com/johni0702/rtp", rev = "ee8be93", features = ["openssl", "tokio"] }
diff --git a/src/main.rs b/src/main.rs
index 4e0ab0e..4ee82bf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,3 @@
-#![feature(try_from)]
 // TODO For some reason, reconnecting without reloading the page and without disconnecting the
 //      previous connection (i.e. multiple simultaneous connections) causes FF to reject our DTLS
 //      cert. Works in Chrome, or in different tabs or when properly closing the old connection.