Skip to content

Commit fdc8996

Browse files
simonwuelkersimonwuelker
authored
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]>
1 parent 5f4c406 commit fdc8996

40 files changed

+139
-129
lines changed

‎.cargo/config

-2
This file was deleted.

‎.cargo/config.toml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[alias]
2+
ex = "run -p examples --bin"

‎audio/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ authors = ["Fernando Jiménez Moreno <[email protected]>"]
33
license = "MPL-2.0"
44
name = "servo-media-audio"
55
version = "0.2.0"
6+
edition = "2021"
67

78
[lib]
89
name = "servo_media_audio"

‎audio/analyser_node.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use block::{Block, Chunk, FRAMES_PER_BLOCK_USIZE};
2-
use node::AudioNodeEngine;
3-
use node::BlockInfo;
4-
use node::{AudioNodeType, ChannelInfo, ChannelInterpretation};
1+
use crate::block::{Block, Chunk, FRAMES_PER_BLOCK_USIZE};
2+
use crate::node::AudioNodeEngine;
3+
use crate::node::BlockInfo;
4+
use crate::node::{AudioNodeType, ChannelInfo, ChannelInterpretation};
55
use std::cmp;
66
use std::f32::consts::PI;
77

‎audio/biquad_filter_node.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use block::Chunk;
2-
use block::Tick;
3-
use node::AudioNodeEngine;
4-
use node::BlockInfo;
5-
use node::{AudioNodeMessage, AudioNodeType, ChannelInfo};
6-
use param::{Param, ParamType};
1+
use crate::block::Chunk;
2+
use crate::block::Tick;
3+
use crate::node::AudioNodeEngine;
4+
use crate::node::BlockInfo;
5+
use crate::node::{AudioNodeMessage, AudioNodeType, ChannelInfo};
6+
use crate::param::{Param, ParamType};
77
use smallvec::SmallVec;
88
use std::f64::consts::{PI, SQRT_2};
99

‎audio/block.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use byte_slice_cast::*;
22
use euclid::default::Vector3D;
3-
use graph::{PortIndex, PortKind};
4-
use node::ChannelInterpretation;
3+
use crate::graph::{PortIndex, PortKind};
4+
use crate::node::ChannelInterpretation;
55
use smallvec::SmallVec;
66
use std::f32::consts::SQRT_2;
77
use std::mem;

‎audio/buffer_source_node.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use block::{Block, Chunk, Tick, FRAMES_PER_BLOCK};
2-
use node::{AudioNodeEngine, AudioScheduledSourceNodeMessage, BlockInfo, OnEndedCallback};
3-
use node::{AudioNodeType, ChannelInfo, ShouldPlay};
4-
use param::{Param, ParamType};
1+
use crate::block::{Block, Chunk, Tick, FRAMES_PER_BLOCK};
2+
use crate::node::{AudioNodeEngine, AudioScheduledSourceNodeMessage, BlockInfo, OnEndedCallback};
3+
use crate::node::{AudioNodeType, ChannelInfo, ShouldPlay};
4+
use crate::param::{Param, ParamType};
55

66
/// Control messages directed to AudioBufferSourceNodes.
77
#[derive(Debug, Clone)]

‎audio/channel_node.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use block::FRAMES_PER_BLOCK_USIZE;
2-
use block::{Block, Chunk};
3-
use node::AudioNodeType;
4-
use node::BlockInfo;
5-
use node::{AudioNodeEngine, ChannelCountMode, ChannelInfo, ChannelInterpretation};
1+
use crate::block::FRAMES_PER_BLOCK_USIZE;
2+
use crate::block::{Block, Chunk};
3+
use crate::node::AudioNodeType;
4+
use crate::node::BlockInfo;
5+
use crate::node::{AudioNodeEngine, ChannelCountMode, ChannelInfo, ChannelInterpretation};
66

77
#[derive(Copy, Clone, Debug)]
88
pub struct ChannelNodeOptions {

‎audio/constant_source_node.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use block::Chunk;
2-
use block::Tick;
3-
use node::BlockInfo;
4-
use node::{AudioNodeEngine, AudioScheduledSourceNodeMessage, OnEndedCallback};
5-
use node::{AudioNodeType, ChannelInfo, ShouldPlay};
6-
use param::{Param, ParamType};
1+
use crate::block::Chunk;
2+
use crate::block::Tick;
3+
use crate::node::BlockInfo;
4+
use crate::node::{AudioNodeEngine, AudioScheduledSourceNodeMessage, OnEndedCallback};
5+
use crate::node::{AudioNodeType, ChannelInfo, ShouldPlay};
6+
use crate::param::{Param, ParamType};
77

88
#[derive(Copy, Clone, Debug)]
99
pub struct ConstantSourceNodeOptions {

‎audio/context.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
use decoder::{AudioDecoder, AudioDecoderCallbacks, AudioDecoderOptions};
2-
use graph::{AudioGraph, InputPort, NodeId, OutputPort, PortId};
3-
use node::{AudioNodeInit, AudioNodeMessage, ChannelInfo};
4-
use render_thread::AudioRenderThread;
5-
use render_thread::AudioRenderThreadMsg;
1+
use crate::decoder::{AudioDecoder, AudioDecoderCallbacks, AudioDecoderOptions};
2+
use crate::graph::{AudioGraph, InputPort, NodeId, OutputPort, PortId};
3+
use crate::node::{AudioNodeInit, AudioNodeMessage, ChannelInfo};
4+
use crate::render_thread::AudioRenderThread;
5+
use crate::render_thread::AudioRenderThreadMsg;
66
use servo_media_traits::{BackendMsg, ClientContextId, MediaInstance};
77
use std::cell::Cell;
88
use std::sync::mpsc::{self, Sender};
99
use std::sync::{Arc, Mutex};
1010
use std::thread::Builder;
11-
use AudioBackend;
11+
use crate::AudioBackend;
1212

1313
use crate::sink::AudioSinkError;
1414

‎audio/destination_node.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
use block::Chunk;
2-
use node::{AudioNodeEngine, BlockInfo};
3-
use node::{AudioNodeType, ChannelCountMode, ChannelInfo};
1+
use crate::block::Chunk;
2+
use crate::node::{AudioNodeEngine, AudioNodeType, BlockInfo, ChannelCountMode, ChannelInfo};
43

54
#[derive(AudioNodeCommon)]
65
pub(crate) struct DestinationNode {

‎audio/gain_node.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use block::Chunk;
2-
use block::Tick;
3-
use node::AudioNodeEngine;
4-
use node::BlockInfo;
5-
use node::{AudioNodeType, ChannelInfo};
6-
use param::{Param, ParamType};
1+
use crate::block::Chunk;
2+
use crate::block::Tick;
3+
use crate::node::AudioNodeEngine;
4+
use crate::node::BlockInfo;
5+
use crate::node::{AudioNodeType, ChannelInfo};
6+
use crate::param::{Param, ParamType};
77

88
#[derive(Copy, Clone, Debug)]
99
pub struct GainNodeOptions {

‎audio/graph.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use block::{Block, Chunk};
2-
use destination_node::DestinationNode;
3-
use listener::AudioListenerNode;
4-
use node::{AudioNodeEngine, BlockInfo, ChannelCountMode, ChannelInterpretation};
5-
use param::ParamType;
1+
use crate::block::{Block, Chunk};
2+
use crate::destination_node::DestinationNode;
3+
use crate::listener::AudioListenerNode;
4+
use crate::node::{AudioNodeEngine, BlockInfo, ChannelCountMode, ChannelInterpretation};
5+
use crate::param::ParamType;
66
use petgraph::graph::DefaultIx;
77
use petgraph::stable_graph::NodeIndex;
88
use petgraph::stable_graph::StableGraph;

‎audio/iir_filter_node.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
use block::Chunk;
1+
use crate::block::Chunk;
22
use log::warn;
3-
use node::{AudioNodeEngine, AudioNodeType, BlockInfo, ChannelInfo};
3+
use crate::node::{AudioNodeEngine, AudioNodeType, BlockInfo, ChannelInfo};
44
use num_complex::Complex64;
55
use std::collections::VecDeque;
66
use std::sync::Arc;

‎audio/listener.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use block::{Block, Chunk};
2-
use node::{AudioNodeEngine, BlockInfo};
3-
use node::{AudioNodeType, ChannelInfo};
4-
use param::{Param, ParamDir, ParamType};
1+
use crate::block::{Block, Chunk};
2+
use crate::node::{AudioNodeEngine, BlockInfo};
3+
use crate::node::{AudioNodeType, ChannelInfo};
4+
use crate::param::{Param, ParamDir, ParamType};
55

66
/// AudioListeners are fake nodes; from the user's point of view they're
77
/// a non-node entity with zero inputs and outputs, but with AudioParams

‎audio/macros.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ macro_rules! make_message_handler(
55
$node:ident: $handler:ident
66
),+
77
) => (
8-
fn message_specific(&mut self, msg: ::node::AudioNodeMessage, sample_rate: f32) {
8+
fn message_specific(&mut self, msg: $crate::node::AudioNodeMessage, sample_rate: f32) {
99
match msg {
10-
$(::node::AudioNodeMessage::$node(m) => self.$handler(m, sample_rate)),+,
10+
$($crate::node::AudioNodeMessage::$node(m) => self.$handler(m, sample_rate)),+,
1111
_ => (),
1212
}
1313
}

‎audio/media_element_source_node.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use block::{Block, Chunk, FRAMES_PER_BLOCK};
2-
use node::{AudioNodeEngine, AudioNodeType, BlockInfo, ChannelInfo};
1+
use crate::block::{Block, Chunk, FRAMES_PER_BLOCK};
2+
use crate::node::{AudioNodeEngine, AudioNodeType, BlockInfo, ChannelInfo};
33
use player::audio::AudioRenderer;
44
use std::collections::hash_map::Entry;
55
use std::collections::HashMap;

‎audio/media_stream_destination_node.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use block::Chunk;
2-
use node::{AudioNodeEngine, BlockInfo};
3-
use node::{AudioNodeType, ChannelInfo};
1+
use crate::block::Chunk;
2+
use crate::node::{AudioNodeEngine, BlockInfo};
3+
use crate::node::{AudioNodeType, ChannelInfo};
44
use servo_media_streams::MediaSocket;
5-
use sink::AudioSink;
5+
use crate::sink::AudioSink;
66

77
#[derive(AudioNodeCommon)]
88
pub(crate) struct MediaStreamDestinationNode {

‎audio/media_stream_source_node.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::AudioStreamReader;
2-
use block::Chunk;
3-
use node::{AudioNodeEngine, BlockInfo};
4-
use node::{AudioNodeType, ChannelInfo};
5-
use param::{Param, ParamType};
2+
use crate::block::Chunk;
3+
use crate::node::{AudioNodeEngine, BlockInfo};
4+
use crate::node::{AudioNodeType, ChannelInfo};
5+
use crate::param::{Param, ParamType};
66

77
#[derive(AudioNodeCommon)]
88
pub(crate) struct MediaStreamSourceNode {

‎audio/node.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
use biquad_filter_node::{BiquadFilterNodeMessage, BiquadFilterNodeOptions};
2-
use block::{Block, Chunk, Tick};
3-
use buffer_source_node::{AudioBufferSourceNodeMessage, AudioBufferSourceNodeOptions};
4-
use channel_node::ChannelNodeOptions;
5-
use constant_source_node::ConstantSourceNodeOptions;
6-
use gain_node::GainNodeOptions;
7-
use iir_filter_node::IIRFilterNodeOptions;
8-
use media_element_source_node::MediaElementSourceNodeMessage;
9-
use oscillator_node::{OscillatorNodeMessage, OscillatorNodeOptions};
10-
use panner_node::{PannerNodeMessage, PannerNodeOptions};
11-
use param::{Param, ParamRate, ParamType, UserAutomationEvent};
1+
use crate::biquad_filter_node::{BiquadFilterNodeMessage, BiquadFilterNodeOptions};
2+
use crate::block::{Block, Chunk, Tick};
3+
use crate::buffer_source_node::{AudioBufferSourceNodeMessage, AudioBufferSourceNodeOptions};
4+
use crate::channel_node::ChannelNodeOptions;
5+
use crate::constant_source_node::ConstantSourceNodeOptions;
6+
use crate::gain_node::GainNodeOptions;
7+
use crate::iir_filter_node::IIRFilterNodeOptions;
8+
use crate::media_element_source_node::MediaElementSourceNodeMessage;
9+
use crate::oscillator_node::{OscillatorNodeMessage, OscillatorNodeOptions};
10+
use crate::panner_node::{PannerNodeMessage, PannerNodeOptions};
11+
use crate::param::{Param, ParamRate, ParamType, UserAutomationEvent};
1212
use servo_media_streams::{MediaSocket, MediaStreamId};
1313
use std::cmp::min;
1414
use std::sync::mpsc::Sender;
15-
use stereo_panner::StereoPannerOptions;
16-
use wave_shaper_node::{WaveShaperNodeMessage, WaveShaperNodeOptions};
15+
use crate::stereo_panner::StereoPannerOptions;
16+
use crate::wave_shaper_node::{WaveShaperNodeMessage, WaveShaperNodeOptions};
1717

1818
/// Information required to construct an audio node
1919
pub enum AudioNodeInit {

‎audio/offline_sink.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use block::{Chunk, FRAMES_PER_BLOCK_USIZE};
2-
use render_thread::AudioRenderThreadMsg;
1+
use crate::block::{Chunk, FRAMES_PER_BLOCK_USIZE};
2+
use crate::render_thread::AudioRenderThreadMsg;
33
use servo_media_streams::MediaSocket;
4-
use sink::{AudioSink, AudioSinkError};
4+
use crate::sink::{AudioSink, AudioSinkError};
55
use std::cell::{Cell, RefCell};
66
use std::sync::mpsc::Sender;
77

‎audio/oscillator_node.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use block::{Chunk, Tick};
2-
use node::{AudioNodeEngine, AudioScheduledSourceNodeMessage, BlockInfo, OnEndedCallback};
3-
use node::{AudioNodeType, ChannelInfo, ShouldPlay};
1+
use crate::block::{Chunk, Tick};
2+
use crate::node::{AudioNodeEngine, AudioScheduledSourceNodeMessage, BlockInfo, OnEndedCallback};
3+
use crate::node::{AudioNodeType, ChannelInfo, ShouldPlay};
44
use num_traits::cast::NumCast;
5-
use param::{Param, ParamType};
5+
use crate::param::{Param, ParamType};
66

77
#[derive(Clone, Debug)]
88
pub struct PeriodicWaveOptions {

‎audio/panner_node.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
use block::{Block, Chunk, Tick, FRAMES_PER_BLOCK};
1+
use crate::block::{Block, Chunk, Tick, FRAMES_PER_BLOCK};
22
use euclid::default::Vector3D;
3-
use node::{AudioNodeEngine, AudioNodeMessage, BlockInfo};
4-
use node::{AudioNodeType, ChannelInfo};
5-
use param::{Param, ParamDir, ParamType};
3+
use crate::node::{AudioNodeEngine, AudioNodeMessage, BlockInfo};
4+
use crate::node::{AudioNodeType, ChannelInfo};
5+
use crate::param::{Param, ParamDir, ParamType};
66
use std::f32::consts::PI;
77

88
// .normalize(), but it takes into account zero vectors

‎audio/param.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use block::Block;
2-
use block::Tick;
3-
use block::FRAMES_PER_BLOCK_USIZE;
4-
use node::BlockInfo;
1+
use crate::block::Block;
2+
use crate::block::Tick;
3+
use crate::block::FRAMES_PER_BLOCK_USIZE;
4+
use crate::node::BlockInfo;
55

66
#[derive(Clone, Copy, Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]
77
pub enum ParamType {

‎audio/render_thread.rs

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
use analyser_node::AnalyserNode;
2-
use biquad_filter_node::BiquadFilterNode;
3-
use block::{Chunk, Tick, FRAMES_PER_BLOCK};
4-
use buffer_source_node::AudioBufferSourceNode;
5-
use channel_node::{ChannelMergerNode, ChannelSplitterNode};
6-
use constant_source_node::ConstantSourceNode;
7-
use context::{AudioContextOptions, ProcessingState, StateChangeResult};
8-
use gain_node::GainNode;
9-
use graph::{AudioGraph, InputPort, NodeId, OutputPort, PortId};
10-
use iir_filter_node::IIRFilterNode;
11-
use media_element_source_node::MediaElementSourceNode;
12-
use media_stream_destination_node::MediaStreamDestinationNode;
13-
use media_stream_source_node::MediaStreamSourceNode;
14-
use node::{AudioNodeEngine, AudioNodeInit, AudioNodeMessage};
15-
use node::{BlockInfo, ChannelInfo};
16-
use offline_sink::OfflineAudioSink;
17-
use oscillator_node::OscillatorNode;
18-
use panner_node::PannerNode;
1+
use crate::analyser_node::AnalyserNode;
2+
use crate::biquad_filter_node::BiquadFilterNode;
3+
use crate::block::{Chunk, Tick, FRAMES_PER_BLOCK};
4+
use crate::buffer_source_node::AudioBufferSourceNode;
5+
use crate::channel_node::{ChannelMergerNode, ChannelSplitterNode};
6+
use crate::constant_source_node::ConstantSourceNode;
7+
use crate::context::{AudioContextOptions, ProcessingState, StateChangeResult};
8+
use crate::gain_node::GainNode;
9+
use crate::graph::{AudioGraph, InputPort, NodeId, OutputPort, PortId};
10+
use crate::iir_filter_node::IIRFilterNode;
11+
use crate::media_element_source_node::MediaElementSourceNode;
12+
use crate::media_stream_destination_node::MediaStreamDestinationNode;
13+
use crate::media_stream_source_node::MediaStreamSourceNode;
14+
use crate::node::{AudioNodeEngine, AudioNodeInit, AudioNodeMessage};
15+
use crate::node::{BlockInfo, ChannelInfo};
16+
use crate::offline_sink::OfflineAudioSink;
17+
use crate::oscillator_node::OscillatorNode;
18+
use crate::panner_node::PannerNode;
1919
use servo_media_streams::{MediaSocket, MediaStreamId};
20-
use sink::{AudioSink, AudioSinkError};
20+
use crate::sink::{AudioSink, AudioSinkError};
2121
use std::sync::mpsc::{Receiver, Sender};
22-
use stereo_panner::StereoPannerNode;
23-
use wave_shaper_node::WaveShaperNode;
24-
use {AudioBackend, AudioStreamReader};
22+
use crate::stereo_panner::StereoPannerNode;
23+
use crate::wave_shaper_node::WaveShaperNode;
24+
use crate::{AudioBackend, AudioStreamReader};
2525

2626
pub enum AudioRenderThreadMsg {
2727
CreateNode(AudioNodeInit, Sender<NodeId>, ChannelInfo),

‎audio/sink.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use block::Chunk;
2-
use render_thread::AudioRenderThreadMsg;
1+
use crate::block::Chunk;
2+
use crate::render_thread::AudioRenderThreadMsg;
33
use servo_media_streams::MediaSocket;
44
use std::sync::mpsc::Sender;
55

‎audio/stereo_panner.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use block::{Chunk, Tick, FRAMES_PER_BLOCK};
2-
use node::{AudioNodeEngine, BlockInfo};
3-
use node::{AudioNodeType, ChannelInfo};
4-
use param::{Param, ParamType};
1+
use crate::block::{Chunk, Tick, FRAMES_PER_BLOCK};
2+
use crate::node::{AudioNodeEngine, BlockInfo};
3+
use crate::node::{AudioNodeType, ChannelInfo};
4+
use crate::param::{Param, ParamType};
55
use std::f32::consts::PI;
66

77
#[derive(Copy, Clone, Debug)]

‎audio/wave_shaper_node.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use block::{Chunk, FRAMES_PER_BLOCK_USIZE};
2-
use node::{AudioNodeEngine, AudioNodeType, BlockInfo, ChannelInfo};
1+
use crate::block::{Chunk, FRAMES_PER_BLOCK_USIZE};
2+
use crate::node::{AudioNodeEngine, AudioNodeType, BlockInfo, ChannelInfo};
33
use speexdsp_resampler::State as SpeexResamplerState;
44

55
#[derive(Clone, Debug, PartialEq)]

‎backends/dummy/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name = "servo-media-dummy"
33
version = "0.1.0"
44
authors = ["The Servo Project Developers"]
55
license = "MPL-2.0"
6+
edition = "2021"
67

78
[lib]
89
name = "servo_media_dummy"

‎backends/gstreamer/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ impl GStreamerBackend {
7373
// See https://github.com/servo/media/pull/393.
7474
let needs_background_glib_main_loop = {
7575
let (major, minor, micro, _) = gst::version();
76+
println!("glib version {major} {minor} {micro}");
7677
(major, minor, micro) >= (1, 19, 1) && (major, minor, micro) <= (1, 22, 7)
7778
};
7879

0 commit comments

Comments
 (0)