Explicitly specify edition=2021 for all crates (#429)

* Rename .cargo/config -> .cargo/config.toml Signed-off-by: Simon Wülker <[email protected]> * Port audio crate to edition 2021 Signed-off-by: Simon Wülker <[email protected]> * Port servo-media-derive to 20201 edition Signed-off-by: Simon Wülker <[email protected]> * Port remaining crates to 2021 edition This is done in one commit, as the only change required was in the relevant Cargo.tomls Signed-off-by: Simon Wülker <[email protected]> --------- Signed-off-by: Simon Wülker <[email protected]>
servo · Jan 16, 2025 · fdc8996 · fdc8996
1 parent 5f4c406
commit fdc8996
Show file tree

Hide file tree

Showing 40 changed files with 139 additions and 129 deletions.
diff --git a/.cargo/config b/.cargo/config
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -0,0 +1,2 @@
+[alias]
+ex = "run -p examples --bin"
diff --git a/audio/Cargo.toml b/audio/Cargo.toml
@@ -3,6 +3,7 @@ authors = ["Fernando Jiménez Moreno <[email protected]>"]
 license = "MPL-2.0"
 name = "servo-media-audio"
 version = "0.2.0"
+edition = "2021"
 
 [lib]
 name = "servo_media_audio"

diff --git a/audio/analyser_node.rs b/audio/analyser_node.rs
@@ -1,7 +1,7 @@
-use block::{Block, Chunk, FRAMES_PER_BLOCK_USIZE};
-use node::AudioNodeEngine;
-use node::BlockInfo;
-use node::{AudioNodeType, ChannelInfo, ChannelInterpretation};
+use crate::block::{Block, Chunk, FRAMES_PER_BLOCK_USIZE};
+use crate::node::AudioNodeEngine;
+use crate::node::BlockInfo;
+use crate::node::{AudioNodeType, ChannelInfo, ChannelInterpretation};
 use std::cmp;
 use std::f32::consts::PI;
 

diff --git a/audio/biquad_filter_node.rs b/audio/biquad_filter_node.rs
@@ -1,9 +1,9 @@
-use block::Chunk;
-use block::Tick;
-use node::AudioNodeEngine;
-use node::BlockInfo;
-use node::{AudioNodeMessage, AudioNodeType, ChannelInfo};
-use param::{Param, ParamType};
+use crate::block::Chunk;
+use crate::block::Tick;
+use crate::node::AudioNodeEngine;
+use crate::node::BlockInfo;
+use crate::node::{AudioNodeMessage, AudioNodeType, ChannelInfo};
+use crate::param::{Param, ParamType};
 use smallvec::SmallVec;
 use std::f64::consts::{PI, SQRT_2};
 

diff --git a/audio/block.rs b/audio/block.rs
@@ -1,7 +1,7 @@
 use byte_slice_cast::*;
 use euclid::default::Vector3D;
-use graph::{PortIndex, PortKind};
-use node::ChannelInterpretation;
+use crate::graph::{PortIndex, PortKind};
+use crate::node::ChannelInterpretation;
 use smallvec::SmallVec;
 use std::f32::consts::SQRT_2;
 use std::mem;

diff --git a/audio/buffer_source_node.rs b/audio/buffer_source_node.rs
@@ -1,7 +1,7 @@
-use block::{Block, Chunk, Tick, FRAMES_PER_BLOCK};
-use node::{AudioNodeEngine, AudioScheduledSourceNodeMessage, BlockInfo, OnEndedCallback};
-use node::{AudioNodeType, ChannelInfo, ShouldPlay};
-use param::{Param, ParamType};
+use crate::block::{Block, Chunk, Tick, FRAMES_PER_BLOCK};
+use crate::node::{AudioNodeEngine, AudioScheduledSourceNodeMessage, BlockInfo, OnEndedCallback};
+use crate::node::{AudioNodeType, ChannelInfo, ShouldPlay};
+use crate::param::{Param, ParamType};
 
 /// Control messages directed to AudioBufferSourceNodes.
 #[derive(Debug, Clone)]

diff --git a/audio/channel_node.rs b/audio/channel_node.rs
@@ -1,8 +1,8 @@
-use block::FRAMES_PER_BLOCK_USIZE;
-use block::{Block, Chunk};
-use node::AudioNodeType;
-use node::BlockInfo;
-use node::{AudioNodeEngine, ChannelCountMode, ChannelInfo, ChannelInterpretation};
+use crate::block::FRAMES_PER_BLOCK_USIZE;
+use crate::block::{Block, Chunk};
+use crate::node::AudioNodeType;
+use crate::node::BlockInfo;
+use crate::node::{AudioNodeEngine, ChannelCountMode, ChannelInfo, ChannelInterpretation};
 
 #[derive(Copy, Clone, Debug)]
 pub struct ChannelNodeOptions {

diff --git a/audio/constant_source_node.rs b/audio/constant_source_node.rs
@@ -1,9 +1,9 @@
-use block::Chunk;
-use block::Tick;
-use node::BlockInfo;
-use node::{AudioNodeEngine, AudioScheduledSourceNodeMessage, OnEndedCallback};
-use node::{AudioNodeType, ChannelInfo, ShouldPlay};
-use param::{Param, ParamType};
+use crate::block::Chunk;
+use crate::block::Tick;
+use crate::node::BlockInfo;
+use crate::node::{AudioNodeEngine, AudioScheduledSourceNodeMessage, OnEndedCallback};
+use crate::node::{AudioNodeType, ChannelInfo, ShouldPlay};
+use crate::param::{Param, ParamType};
 
 #[derive(Copy, Clone, Debug)]
 pub struct ConstantSourceNodeOptions {

diff --git a/audio/context.rs b/audio/context.rs
@@ -1,14 +1,14 @@
-use decoder::{AudioDecoder, AudioDecoderCallbacks, AudioDecoderOptions};
-use graph::{AudioGraph, InputPort, NodeId, OutputPort, PortId};
-use node::{AudioNodeInit, AudioNodeMessage, ChannelInfo};
-use render_thread::AudioRenderThread;
-use render_thread::AudioRenderThreadMsg;
+use crate::decoder::{AudioDecoder, AudioDecoderCallbacks, AudioDecoderOptions};
+use crate::graph::{AudioGraph, InputPort, NodeId, OutputPort, PortId};
+use crate::node::{AudioNodeInit, AudioNodeMessage, ChannelInfo};
+use crate::render_thread::AudioRenderThread;
+use crate::render_thread::AudioRenderThreadMsg;
 use servo_media_traits::{BackendMsg, ClientContextId, MediaInstance};
 use std::cell::Cell;
 use std::sync::mpsc::{self, Sender};
 use std::sync::{Arc, Mutex};
 use std::thread::Builder;
-use AudioBackend;
+use crate::AudioBackend;
 
 use crate::sink::AudioSinkError;
 

diff --git a/audio/destination_node.rs b/audio/destination_node.rs
@@ -1,6 +1,5 @@
-use block::Chunk;
-use node::{AudioNodeEngine, BlockInfo};
-use node::{AudioNodeType, ChannelCountMode, ChannelInfo};
+use crate::block::Chunk;
+use crate::node::{AudioNodeEngine, AudioNodeType, BlockInfo, ChannelCountMode, ChannelInfo};
 
 #[derive(AudioNodeCommon)]
 pub(crate) struct DestinationNode {

diff --git a/audio/gain_node.rs b/audio/gain_node.rs
@@ -1,9 +1,9 @@
-use block::Chunk;
-use block::Tick;
-use node::AudioNodeEngine;
-use node::BlockInfo;
-use node::{AudioNodeType, ChannelInfo};
-use param::{Param, ParamType};
+use crate::block::Chunk;
+use crate::block::Tick;
+use crate::node::AudioNodeEngine;
+use crate::node::BlockInfo;
+use crate::node::{AudioNodeType, ChannelInfo};
+use crate::param::{Param, ParamType};
 
 #[derive(Copy, Clone, Debug)]
 pub struct GainNodeOptions {

diff --git a/audio/graph.rs b/audio/graph.rs
@@ -1,8 +1,8 @@
-use block::{Block, Chunk};
-use destination_node::DestinationNode;
-use listener::AudioListenerNode;
-use node::{AudioNodeEngine, BlockInfo, ChannelCountMode, ChannelInterpretation};
-use param::ParamType;
+use crate::block::{Block, Chunk};
+use crate::destination_node::DestinationNode;
+use crate::listener::AudioListenerNode;
+use crate::node::{AudioNodeEngine, BlockInfo, ChannelCountMode, ChannelInterpretation};
+use crate::param::ParamType;
 use petgraph::graph::DefaultIx;
 use petgraph::stable_graph::NodeIndex;
 use petgraph::stable_graph::StableGraph;

diff --git a/audio/iir_filter_node.rs b/audio/iir_filter_node.rs
@@ -1,6 +1,6 @@
-use block::Chunk;
+use crate::block::Chunk;
 use log::warn;
-use node::{AudioNodeEngine, AudioNodeType, BlockInfo, ChannelInfo};
+use crate::node::{AudioNodeEngine, AudioNodeType, BlockInfo, ChannelInfo};
 use num_complex::Complex64;
 use std::collections::VecDeque;
 use std::sync::Arc;

diff --git a/audio/listener.rs b/audio/listener.rs
@@ -1,7 +1,7 @@
-use block::{Block, Chunk};
-use node::{AudioNodeEngine, BlockInfo};
-use node::{AudioNodeType, ChannelInfo};
-use param::{Param, ParamDir, ParamType};
+use crate::block::{Block, Chunk};
+use crate::node::{AudioNodeEngine, BlockInfo};
+use crate::node::{AudioNodeType, ChannelInfo};
+use crate::param::{Param, ParamDir, ParamType};
 
 /// AudioListeners are fake nodes; from the user's point of view they're
 /// a non-node entity with zero inputs and outputs, but with AudioParams

diff --git a/audio/macros.rs b/audio/macros.rs
@@ -5,9 +5,9 @@ macro_rules! make_message_handler(
             $node:ident: $handler:ident
          ),+
     ) => (
-        fn message_specific(&mut self, msg: ::node::AudioNodeMessage, sample_rate: f32) {
+        fn message_specific(&mut self, msg: $crate::node::AudioNodeMessage, sample_rate: f32) {
             match msg {
-                $(::node::AudioNodeMessage::$node(m) => self.$handler(m, sample_rate)),+,
+                $($crate::node::AudioNodeMessage::$node(m) => self.$handler(m, sample_rate)),+,
                 _ => (),
             }
         }

diff --git a/audio/media_element_source_node.rs b/audio/media_element_source_node.rs
@@ -1,5 +1,5 @@
-use block::{Block, Chunk, FRAMES_PER_BLOCK};
-use node::{AudioNodeEngine, AudioNodeType, BlockInfo, ChannelInfo};
+use crate::block::{Block, Chunk, FRAMES_PER_BLOCK};
+use crate::node::{AudioNodeEngine, AudioNodeType, BlockInfo, ChannelInfo};
 use player::audio::AudioRenderer;
 use std::collections::hash_map::Entry;
 use std::collections::HashMap;

diff --git a/audio/media_stream_destination_node.rs b/audio/media_stream_destination_node.rs
@@ -1,8 +1,8 @@
-use block::Chunk;
-use node::{AudioNodeEngine, BlockInfo};
-use node::{AudioNodeType, ChannelInfo};
+use crate::block::Chunk;
+use crate::node::{AudioNodeEngine, BlockInfo};
+use crate::node::{AudioNodeType, ChannelInfo};
 use servo_media_streams::MediaSocket;
-use sink::AudioSink;
+use crate::sink::AudioSink;
 
 #[derive(AudioNodeCommon)]
 pub(crate) struct MediaStreamDestinationNode {

diff --git a/audio/media_stream_source_node.rs b/audio/media_stream_source_node.rs
@@ -1,8 +1,8 @@
 use crate::AudioStreamReader;
-use block::Chunk;
-use node::{AudioNodeEngine, BlockInfo};
-use node::{AudioNodeType, ChannelInfo};
-use param::{Param, ParamType};
+use crate::block::Chunk;
+use crate::node::{AudioNodeEngine, BlockInfo};
+use crate::node::{AudioNodeType, ChannelInfo};
+use crate::param::{Param, ParamType};
 
 #[derive(AudioNodeCommon)]
 pub(crate) struct MediaStreamSourceNode {

diff --git a/audio/node.rs b/audio/node.rs
@@ -1,19 +1,19 @@
-use biquad_filter_node::{BiquadFilterNodeMessage, BiquadFilterNodeOptions};
-use block::{Block, Chunk, Tick};
-use buffer_source_node::{AudioBufferSourceNodeMessage, AudioBufferSourceNodeOptions};
-use channel_node::ChannelNodeOptions;
-use constant_source_node::ConstantSourceNodeOptions;
-use gain_node::GainNodeOptions;
-use iir_filter_node::IIRFilterNodeOptions;
-use media_element_source_node::MediaElementSourceNodeMessage;
-use oscillator_node::{OscillatorNodeMessage, OscillatorNodeOptions};
-use panner_node::{PannerNodeMessage, PannerNodeOptions};
-use param::{Param, ParamRate, ParamType, UserAutomationEvent};
+use crate::biquad_filter_node::{BiquadFilterNodeMessage, BiquadFilterNodeOptions};
+use crate::block::{Block, Chunk, Tick};
+use crate::buffer_source_node::{AudioBufferSourceNodeMessage, AudioBufferSourceNodeOptions};
+use crate::channel_node::ChannelNodeOptions;
+use crate::constant_source_node::ConstantSourceNodeOptions;
+use crate::gain_node::GainNodeOptions;
+use crate::iir_filter_node::IIRFilterNodeOptions;
+use crate::media_element_source_node::MediaElementSourceNodeMessage;
+use crate::oscillator_node::{OscillatorNodeMessage, OscillatorNodeOptions};
+use crate::panner_node::{PannerNodeMessage, PannerNodeOptions};
+use crate::param::{Param, ParamRate, ParamType, UserAutomationEvent};
 use servo_media_streams::{MediaSocket, MediaStreamId};
 use std::cmp::min;
 use std::sync::mpsc::Sender;
-use stereo_panner::StereoPannerOptions;
-use wave_shaper_node::{WaveShaperNodeMessage, WaveShaperNodeOptions};
+use crate::stereo_panner::StereoPannerOptions;
+use crate::wave_shaper_node::{WaveShaperNodeMessage, WaveShaperNodeOptions};
 
 /// Information required to construct an audio node
 pub enum AudioNodeInit {

diff --git a/audio/offline_sink.rs b/audio/offline_sink.rs
@@ -1,7 +1,7 @@
-use block::{Chunk, FRAMES_PER_BLOCK_USIZE};
-use render_thread::AudioRenderThreadMsg;
+use crate::block::{Chunk, FRAMES_PER_BLOCK_USIZE};
+use crate::render_thread::AudioRenderThreadMsg;
 use servo_media_streams::MediaSocket;
-use sink::{AudioSink, AudioSinkError};
+use crate::sink::{AudioSink, AudioSinkError};
 use std::cell::{Cell, RefCell};
 use std::sync::mpsc::Sender;
 

diff --git a/audio/oscillator_node.rs b/audio/oscillator_node.rs
@@ -1,8 +1,8 @@
-use block::{Chunk, Tick};
-use node::{AudioNodeEngine, AudioScheduledSourceNodeMessage, BlockInfo, OnEndedCallback};
-use node::{AudioNodeType, ChannelInfo, ShouldPlay};
+use crate::block::{Chunk, Tick};
+use crate::node::{AudioNodeEngine, AudioScheduledSourceNodeMessage, BlockInfo, OnEndedCallback};
+use crate::node::{AudioNodeType, ChannelInfo, ShouldPlay};
 use num_traits::cast::NumCast;
-use param::{Param, ParamType};
+use crate::param::{Param, ParamType};
 
 #[derive(Clone, Debug)]
 pub struct PeriodicWaveOptions {

diff --git a/audio/panner_node.rs b/audio/panner_node.rs
@@ -1,8 +1,8 @@
-use block::{Block, Chunk, Tick, FRAMES_PER_BLOCK};
+use crate::block::{Block, Chunk, Tick, FRAMES_PER_BLOCK};
 use euclid::default::Vector3D;
-use node::{AudioNodeEngine, AudioNodeMessage, BlockInfo};
-use node::{AudioNodeType, ChannelInfo};
-use param::{Param, ParamDir, ParamType};
+use crate::node::{AudioNodeEngine, AudioNodeMessage, BlockInfo};
+use crate::node::{AudioNodeType, ChannelInfo};
+use crate::param::{Param, ParamDir, ParamType};
 use std::f32::consts::PI;
 
 // .normalize(), but it takes into account zero vectors

diff --git a/audio/param.rs b/audio/param.rs
@@ -1,7 +1,7 @@
-use block::Block;
-use block::Tick;
-use block::FRAMES_PER_BLOCK_USIZE;
-use node::BlockInfo;
+use crate::block::Block;
+use crate::block::Tick;
+use crate::block::FRAMES_PER_BLOCK_USIZE;
+use crate::node::BlockInfo;
 
 #[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]
 pub enum ParamType {

diff --git a/audio/render_thread.rs b/audio/render_thread.rs
@@ -1,27 +1,27 @@
-use analyser_node::AnalyserNode;
-use biquad_filter_node::BiquadFilterNode;
-use block::{Chunk, Tick, FRAMES_PER_BLOCK};
-use buffer_source_node::AudioBufferSourceNode;
-use channel_node::{ChannelMergerNode, ChannelSplitterNode};
-use constant_source_node::ConstantSourceNode;
-use context::{AudioContextOptions, ProcessingState, StateChangeResult};
-use gain_node::GainNode;
-use graph::{AudioGraph, InputPort, NodeId, OutputPort, PortId};
-use iir_filter_node::IIRFilterNode;
-use media_element_source_node::MediaElementSourceNode;
-use media_stream_destination_node::MediaStreamDestinationNode;
-use media_stream_source_node::MediaStreamSourceNode;
-use node::{AudioNodeEngine, AudioNodeInit, AudioNodeMessage};
-use node::{BlockInfo, ChannelInfo};
-use offline_sink::OfflineAudioSink;
-use oscillator_node::OscillatorNode;
-use panner_node::PannerNode;
+use crate::analyser_node::AnalyserNode;
+use crate::biquad_filter_node::BiquadFilterNode;
+use crate::block::{Chunk, Tick, FRAMES_PER_BLOCK};
+use crate::buffer_source_node::AudioBufferSourceNode;
+use crate::channel_node::{ChannelMergerNode, ChannelSplitterNode};
+use crate::constant_source_node::ConstantSourceNode;
+use crate::context::{AudioContextOptions, ProcessingState, StateChangeResult};
+use crate::gain_node::GainNode;
+use crate::graph::{AudioGraph, InputPort, NodeId, OutputPort, PortId};
+use crate::iir_filter_node::IIRFilterNode;
+use crate::media_element_source_node::MediaElementSourceNode;
+use crate::media_stream_destination_node::MediaStreamDestinationNode;
+use crate::media_stream_source_node::MediaStreamSourceNode;
+use crate::node::{AudioNodeEngine, AudioNodeInit, AudioNodeMessage};
+use crate::node::{BlockInfo, ChannelInfo};
+use crate::offline_sink::OfflineAudioSink;
+use crate::oscillator_node::OscillatorNode;
+use crate::panner_node::PannerNode;
 use servo_media_streams::{MediaSocket, MediaStreamId};
-use sink::{AudioSink, AudioSinkError};
+use crate::sink::{AudioSink, AudioSinkError};
 use std::sync::mpsc::{Receiver, Sender};
-use stereo_panner::StereoPannerNode;
-use wave_shaper_node::WaveShaperNode;
-use {AudioBackend, AudioStreamReader};
+use crate::stereo_panner::StereoPannerNode;
+use crate::wave_shaper_node::WaveShaperNode;
+use crate::{AudioBackend, AudioStreamReader};
 
 pub enum AudioRenderThreadMsg {
     CreateNode(AudioNodeInit, Sender<NodeId>, ChannelInfo),

diff --git a/audio/sink.rs b/audio/sink.rs
@@ -1,5 +1,5 @@
-use block::Chunk;
-use render_thread::AudioRenderThreadMsg;
+use crate::block::Chunk;
+use crate::render_thread::AudioRenderThreadMsg;
 use servo_media_streams::MediaSocket;
 use std::sync::mpsc::Sender;
 

diff --git a/audio/stereo_panner.rs b/audio/stereo_panner.rs
@@ -1,7 +1,7 @@
-use block::{Chunk, Tick, FRAMES_PER_BLOCK};
-use node::{AudioNodeEngine, BlockInfo};
-use node::{AudioNodeType, ChannelInfo};
-use param::{Param, ParamType};
+use crate::block::{Chunk, Tick, FRAMES_PER_BLOCK};
+use crate::node::{AudioNodeEngine, BlockInfo};
+use crate::node::{AudioNodeType, ChannelInfo};
+use crate::param::{Param, ParamType};
 use std::f32::consts::PI;
 
 #[derive(Copy, Clone, Debug)]

diff --git a/audio/wave_shaper_node.rs b/audio/wave_shaper_node.rs
@@ -1,5 +1,5 @@
-use block::{Chunk, FRAMES_PER_BLOCK_USIZE};
-use node::{AudioNodeEngine, AudioNodeType, BlockInfo, ChannelInfo};
+use crate::block::{Chunk, FRAMES_PER_BLOCK_USIZE};
+use crate::node::{AudioNodeEngine, AudioNodeType, BlockInfo, ChannelInfo};
 use speexdsp_resampler::State as SpeexResamplerState;
 
 #[derive(Clone, Debug, PartialEq)]

diff --git a/backends/dummy/Cargo.toml b/backends/dummy/Cargo.toml
@@ -3,6 +3,7 @@ name = "servo-media-dummy"
 version = "0.1.0"
 authors = ["The Servo Project Developers"]
 license = "MPL-2.0"
+edition = "2021"
 
 [lib]
 name = "servo_media_dummy"

diff --git a/backends/gstreamer/lib.rs b/backends/gstreamer/lib.rs
@@ -73,6 +73,7 @@ impl GStreamerBackend {
         // See https://github.com/servo/media/pull/393.
         let needs_background_glib_main_loop = {
             let (major, minor, micro, _) = gst::version();
+            println!("glib version {major} {minor} {micro}");
             (major, minor, micro) >= (1, 19, 1) && (major, minor, micro) <= (1, 22, 7)
         };