aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustav Sörnäs <gustav@sornas.net>2021-06-25 08:54:26 +0200
committerGustav Sörnäs <gustav@sornas.net>2021-06-26 07:55:51 +0200
commite652e2b0671308827265b42279180acefa6063f0 (patch)
tree95fc0c3268eaa5942ae701e9e4c1b2f49afd0270
parenta2bfad84e4ef7bf7de90c50b6b0df39588182f82 (diff)
downloadmum-e652e2b0671308827265b42279180acefa6063f0.tar.gz
fix warnings
-rw-r--r--Cargo.lock20
-rw-r--r--mumd/Cargo.toml2
-rw-r--r--mumd/src/audio/sound_effects.rs10
3 files changed, 2 insertions, 30 deletions
diff --git a/Cargo.lock b/Cargo.lock
index a2d5db6..e45116d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -844,8 +844,6 @@ dependencies = [
"native-tls",
"opus",
"serde",
- "strum",
- "strum_macros",
"tokio",
"tokio-native-tls",
"tokio-util",
@@ -1472,24 +1470,6 @@ dependencies = [
]
[[package]]
-name = "strum"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c"
-
-[[package]]
-name = "strum_macros"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
name = "syn"
version = "1.0.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/mumd/Cargo.toml b/mumd/Cargo.toml
index 02a069c..91d20d8 100644
--- a/mumd/Cargo.toml
+++ b/mumd/Cargo.toml
@@ -33,8 +33,6 @@ mumble-protocol = "0.4.1"
native-tls = "0.2"
opus = "0.2"
serde = { version = "1.0", features = ["derive"] }
-strum = "0.20"
-strum_macros = "0.20"
tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync", "net", "time", "fs"] }
tokio-native-tls = "0.3"
tokio-util = { version = "0.6", features = ["codec", "net"] }
diff --git a/mumd/src/audio/sound_effects.rs b/mumd/src/audio/sound_effects.rs
index 42a9bcd..df8dbba 100644
--- a/mumd/src/audio/sound_effects.rs
+++ b/mumd/src/audio/sound_effects.rs
@@ -1,10 +1,6 @@
use dasp_interpolate::linear::Linear;
use dasp_signal::{self as signal, Signal};
-use log::warn;
-use mumlib::config::SoundEffect;
use std::borrow::Cow;
-use std::collections::HashMap;
-use std::collections::hash_map::Entry;
use std::convert::TryFrom;
use std::fmt;
use std::fs::File;
@@ -12,9 +8,7 @@ use std::fs::File;
use std::io::Cursor;
use std::io::Read;
use std::ops::Index;
-use std::path::{Path, PathBuf};
-use strum::IntoEnumIterator;
-use strum_macros::EnumIter;
+use std::path::Path;
use crate::audio::SAMPLE_RATE;
@@ -90,7 +84,7 @@ struct AudioSpec {
}
/// An event where a notification is shown and a sound effect is played.
-#[derive(Debug, Eq, PartialEq, Clone, Copy, Hash, EnumIter)]
+#[derive(Debug, Eq, PartialEq, Clone, Copy, Hash)]
pub enum NotificationEvent {
ServerConnect,
ServerDisconnect,