Skip to content

Commit fbba66f

Browse files
authored
Merge pull request #345 from uklotzde/redundant-static-lifetime-bounds
Remove redundant 'static lifetime bounds
2 parents 69e3c33 + 7cc0b54 commit fbba66f

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/events.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub struct ErrorEvent {
3030
/// The error message
3131
pub message: String,
3232
/// The object with which panic was originally invoked.
33-
pub error: Box<dyn Any + Send + 'static>,
33+
pub error: Box<dyn Any + Send>,
3434
/// Inherits from this base Event
3535
pub event: Event,
3636
}

src/message.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ pub(crate) enum ControlMessage {
4949
/// Generic message to be handled by AudioProcessor
5050
NodeMessage {
5151
id: AudioNodeId,
52-
msg: llq::Node<Box<dyn Any + Send + 'static>>,
52+
msg: llq::Node<Box<dyn Any + Send>>,
5353
},
5454
}

src/render/processor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl RenderScope {
3535
}
3636
}
3737

38-
pub(crate) fn report_error(&self, error: Box<dyn Any + Send + 'static>) {
38+
pub(crate) fn report_error(&self, error: Box<dyn Any + Send>) {
3939
pub fn type_name_of_val<T: ?Sized>(_val: &T) -> &'static str {
4040
std::any::type_name::<T>()
4141
}

src/render/thread.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub(crate) struct RenderThread {
3232
buffer_offset: Option<(usize, AudioRenderQuantum)>,
3333
load_value_sender: Option<Sender<AudioRenderCapacityLoad>>,
3434
event_sender: Option<Sender<EventDispatch>>,
35-
garbage_collector: llq::Producer<Box<dyn Any + Send + 'static>>,
35+
garbage_collector: llq::Producer<Box<dyn Any + Send>>,
3636
}
3737

3838
// SAFETY:
@@ -315,11 +315,11 @@ const GARBAGE_COLLECTOR_THREAD_TIMEOUT: Duration = Duration::from_millis(100);
315315
struct TerminateGarbageCollectorThread;
316316

317317
// Spawns a sidecar thread of the `RenderThread` for dropping resources.
318-
fn spawn_garbage_collector_thread(consumer: llq::Consumer<Box<dyn Any + Send + 'static>>) {
318+
fn spawn_garbage_collector_thread(consumer: llq::Consumer<Box<dyn Any + Send>>) {
319319
let _join_handle = std::thread::spawn(move || run_garbage_collector_thread(consumer));
320320
}
321321

322-
fn run_garbage_collector_thread(mut consumer: llq::Consumer<Box<dyn Any + Send + 'static>>) {
322+
fn run_garbage_collector_thread(mut consumer: llq::Consumer<Box<dyn Any + Send>>) {
323323
log::info!("Entering garbage collector thread");
324324
loop {
325325
if let Some(node) = consumer.pop() {

0 commit comments

Comments
 (0)