Update MSRV to 1.70 and remove lazy_static and once_cell

Author: uklotzde

Cargo.toml

@@ -10,6 +10,7 @@ keywords = ["web-audio-api", "audio", "sound", "dsp"]
 license = "MIT"
 categories = ["multimedia::audio"]
 exclude = ["/samples", "/showcase", "/.github"]
+rust-version = "1.70"
 
 [dependencies]
 arc-swap = "1.6"
@@ -22,10 +23,8 @@ dasp_sample = "0.11"
 float_eq = "1.0"
 hound = "3.5"
 hrtf = "0.8"
-lazy_static = "1.4"
 log = "0.4"
 num-complex = "0.4"
-once_cell = "1.10"
 realfft = "3.0"
 rubato = "0.14"
 rustc-hash = "1.1"

src/node/audio_buffer_source.rs

@@ -1,4 +1,4 @@
-use once_cell::sync::OnceCell;
+use std::cell::OnceCell;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 

src/node/mod.rs

@@ -1,16 +1,14 @@
 //! The AudioNode interface and concrete types
 use std::f32::consts::PI;
 use std::sync::atomic::{AtomicU32, AtomicUsize, Ordering};
-use std::sync::Arc;
+use std::sync::{Arc, OnceLock};
 
 use crate::context::{AudioContextRegistration, ConcreteBaseAudioContext};
 use crate::events::{ErrorEvent, EventHandler, EventPayload, EventType};
 use crate::render::{AudioParamValues, AudioProcessor, AudioRenderQuantum, RenderScope};
 use crate::AudioBufferIter;
 use crate::Event;
 
-use lazy_static::lazy_static;
-
 mod analyser;
 pub use analyser::*;
 mod audio_buffer_source;
@@ -58,14 +56,14 @@ pub(crate) const TABLE_LENGTH_BY_4_USIZE: usize = TABLE_LENGTH_USIZE / 4;
 pub(crate) const TABLE_LENGTH_F32: f32 = TABLE_LENGTH_USIZE as f32;
 pub(crate) const TABLE_LENGTH_BY_4_F32: f32 = TABLE_LENGTH_BY_4_USIZE as f32;
 
-// Compute one period sine wavetable of size TABLE_LENGTH
-lazy_static! {
-    pub(crate) static ref SINETABLE: Vec<f32> = {
-        let table: Vec<f32> = (0..TABLE_LENGTH_USIZE)
+pub(crate) fn sine_table() -> &'static [f32] {
+    static INSTANCE: OnceLock<Vec<f32>> = OnceLock::new();
+    INSTANCE.get_or_init(|| {
+        // Compute one period sine wavetable of size TABLE_LENGTH
+        (0..TABLE_LENGTH_USIZE)
             .map(|x| ((x as f32) * 2.0 * PI * (1. / (TABLE_LENGTH_F32))).sin())
-            .collect();
-        table
-    };
+            .collect()
+    })
 }
 
 /// How channels must be matched between the node's inputs and outputs.

src/node/oscillator.rs

@@ -9,7 +9,7 @@ use crate::render::{AudioParamValues, AudioProcessor, AudioRenderQuantum, Render
 use crate::RENDER_QUANTUM_SIZE;
 
 use super::{
-    AudioNode, AudioScheduledSourceNode, ChannelConfig, ChannelConfigOptions, SINETABLE,
+    sine_table, AudioNode, AudioScheduledSourceNode, ChannelConfig, ChannelConfigOptions,
     TABLE_LENGTH_USIZE,
 };
 
@@ -467,7 +467,8 @@ impl OscillatorRenderer {
 
         // linear interpolation into lookup table
         let k = (position - floored) as f32;
-        SINETABLE[prev_index].mul_add(1. - k, SINETABLE[next_index] * k)
+        let sine_table = sine_table();
+        sine_table[prev_index].mul_add(1. - k, sine_table[next_index] * k)
     }
 
     #[inline]

src/node/stereo_panner.rs

@@ -4,8 +4,8 @@ use crate::param::{AudioParam, AudioParamDescriptor};
 use crate::render::{AudioParamValues, AudioProcessor, AudioRenderQuantum, RenderScope};
 
 use super::{
-    AudioNode, ChannelConfig, ChannelConfigOptions, ChannelCountMode, ChannelInterpretation,
-    SINETABLE, TABLE_LENGTH_BY_4_F32, TABLE_LENGTH_BY_4_USIZE,
+    sine_table, AudioNode, ChannelConfig, ChannelConfigOptions, ChannelCountMode,
+    ChannelInterpretation, TABLE_LENGTH_BY_4_F32, TABLE_LENGTH_BY_4_USIZE,
 };
 
 /// Options for constructing a [`StereoPannerOptions`]
@@ -71,8 +71,10 @@ fn assert_valid_channel_count_mode(mode: ChannelCountMode) {
 #[inline(always)]
 fn get_stereo_gains(x: f32) -> [f32; 2] {
     let idx = (x * TABLE_LENGTH_BY_4_F32) as usize;
-    let gain_left = SINETABLE[idx + TABLE_LENGTH_BY_4_USIZE];
-    let gain_right = SINETABLE[idx];
+
+    let sine_table = sine_table();
+    let gain_left = sine_table[idx + TABLE_LENGTH_BY_4_USIZE];
+    let gain_right = sine_table[idx];
 
     [gain_left, gain_right]
 }

src/node/waveshaper.rs

@@ -1,10 +1,12 @@
-use std::sync::{
-    atomic::{AtomicU32, Ordering},
-    Arc,
+use std::{
+    cell::OnceCell,
+    sync::{
+        atomic::{AtomicU32, Ordering},
+        Arc,
+    },
 };
 
 use crossbeam_channel::{Receiver, Sender};
-use once_cell::sync::OnceCell;
 use rubato::{FftFixedInOut, Resampler as _};
 
 use crate::{

src/param.rs

@@ -10,7 +10,7 @@ use crate::node::{
 use crate::render::{AudioParamValues, AudioProcessor, AudioRenderQuantum, RenderScope};
 use crate::{AtomicF32, RENDER_QUANTUM_SIZE};
 
-use once_cell::sync::OnceCell;
+use std::sync::OnceLock;
 
 /// For SetTargetAtTime event, that theoretically cannot end, if the diff between
 /// the current value and the target is below this threshold, the value is set
@@ -221,8 +221,8 @@ impl AudioNode for AudioParam {
         &self.registration
     }
 
-    fn channel_config(&self) -> &ChannelConfig {
-        static INSTANCE: OnceCell<ChannelConfig> = OnceCell::new();
+    fn channel_config(&self) -> &'static ChannelConfig {
+        static INSTANCE: OnceLock<ChannelConfig> = OnceLock::new();
         INSTANCE.get_or_init(|| {
             ChannelConfigOptions {
                 count: 1,

src/spatial.rs

@@ -9,8 +9,8 @@ use crate::node::{
 use crate::param::{AudioParam, AudioParamDescriptor, AudioParamRaw, AutomationRate};
 use crate::render::{AudioParamValues, AudioProcessor, AudioRenderQuantum, RenderScope};
 
-use lazy_static::lazy_static;
 use std::f32::consts::PI;
+use std::sync::OnceLock;
 
 /// AudioParam settings for the cartesian coordinates
 pub(crate) const PARAM_OPTS: AudioParamDescriptor = AudioParamDescriptor {
@@ -81,22 +81,21 @@ pub(crate) struct AudioListenerNode {
     fields: AudioListener,
 }
 
-lazy_static! {
-    static ref AUDIO_LISTENER_CHANNEL_CONFIG: ChannelConfig = ChannelConfigOptions {
-        count: 1,
-        count_mode: ChannelCountMode::Explicit,
-        interpretation: ChannelInterpretation::Discrete,
-    }
-    .into();
-}
-
 impl AudioNode for AudioListenerNode {
     fn registration(&self) -> &AudioContextRegistration {
         &self.registration
     }
 
     fn channel_config(&self) -> &ChannelConfig {
-        &AUDIO_LISTENER_CHANNEL_CONFIG
+        static INSTANCE: OnceLock<ChannelConfig> = OnceLock::new();
+        INSTANCE.get_or_init(|| {
+            ChannelConfigOptions {
+                count: 1,
+                count_mode: ChannelCountMode::Explicit,
+                interpretation: ChannelInterpretation::Discrete,
+            }
+            .into()
+        })
     }
 
     fn number_of_inputs(&self) -> usize {