diff --git a/Cargo.lock b/Cargo.lock
index 2dc5b584..3bd96659 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -151,12 +151,6 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-[[package]]
-name = "boxfnonce"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426"
-
[[package]]
name = "build-parallel"
version = "0.1.2"
@@ -2510,7 +2504,6 @@ dependencies = [
name = "servo-media-audio"
version = "0.2.0"
dependencies = [
- "boxfnonce",
"byte-slice-cast",
"euclid",
"log 0.4.17",
@@ -2519,10 +2512,10 @@ dependencies = [
"petgraph",
"serde",
"serde_derive",
+ "servo-media-derive",
"servo-media-player",
"servo-media-streams",
"servo-media-traits",
- "servo_media_derive",
"smallvec 1.10.0",
"speexdsp-resampler",
]
@@ -2535,11 +2528,19 @@ dependencies = [
"servo-media-gstreamer",
]
+[[package]]
+name = "servo-media-derive"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2 1.0.64",
+ "quote 1.0.29",
+ "syn 1.0.107",
+]
+
[[package]]
name = "servo-media-dummy"
version = "0.1.0"
dependencies = [
- "boxfnonce",
"ipc-channel",
"servo-media",
"servo-media-audio",
@@ -2553,7 +2554,6 @@ dependencies = [
name = "servo-media-gstreamer"
version = "0.1.0"
dependencies = [
- "boxfnonce",
"byte-slice-cast",
"glib",
"glib-sys",
@@ -2647,7 +2647,6 @@ version = "0.1.0"
name = "servo-media-webrtc"
version = "0.1.0"
dependencies = [
- "boxfnonce",
"lazy_static",
"log 0.4.17",
"servo-media-streams",
@@ -2663,15 +2662,6 @@ dependencies = [
"servo-media-auto",
]
-[[package]]
-name = "servo_media_derive"
-version = "0.1.0"
-dependencies = [
- "proc-macro2 1.0.64",
- "quote 1.0.29",
- "syn 1.0.107",
-]
-
[[package]]
name = "sha1"
version = "0.6.1"
diff --git a/audio/Cargo.toml b/audio/Cargo.toml
index a465f3a6..65b5c6e8 100644
--- a/audio/Cargo.toml
+++ b/audio/Cargo.toml
@@ -9,7 +9,6 @@ name = "servo_media_audio"
path = "lib.rs"
[dependencies]
-boxfnonce = "0.1"
euclid = "0.22"
log = "0.4"
serde_derive = "1.0.66"
diff --git a/audio/decoder.rs b/audio/decoder.rs
index 99235b1e..73c9b712 100644
--- a/audio/decoder.rs
+++ b/audio/decoder.rs
@@ -1,4 +1,3 @@
-use boxfnonce::SendBoxFnOnce;
use std::sync::Mutex;
#[derive(Debug, PartialEq)]
@@ -16,10 +15,10 @@ pub enum AudioDecoderError {
}
pub struct AudioDecoderCallbacks {
- pub eos: Mutex