mark traits as dyn

7 files changed, 16 insertions, 16 deletions

diff --git a/nihav-core/src/codecs/mod.rs b/nihav-core/src/codecs/mod.rs
index 490c7c7..4ea379d 100644
--- a/nihav-core/src/codecs/mod.rs
+++ b/nihav-core/src/codecs/mod.rs
@@ -254,7 +254,7 @@ pub trait NADecoder {
 #[derive(Clone,Copy)]
 pub struct DecoderInfo {
     pub name: &'static str,
-    pub get_decoder: fn () -> Box<NADecoder>,
+    pub get_decoder: fn () -> Box<dyn NADecoder>,
 }
 
 #[cfg(any(feature="h263"))]
@@ -274,7 +274,7 @@ impl RegisteredDecoders {
     pub fn add_decoder(&mut self, dec: DecoderInfo) {
         self.decs.push(dec);
     }
-    pub fn find_decoder(&self, name: &str) -> Option<fn () -> Box<NADecoder>> {
+    pub fn find_decoder(&self, name: &str) -> Option<fn () -> Box<dyn NADecoder>> {
         for &dec in self.decs.iter() {
             if dec.name == name {
                 return Some(dec.get_decoder);
diff --git a/nihav-core/src/demuxers/mod.rs b/nihav-core/src/demuxers/mod.rs
index b3546fe..8470edd 100644
--- a/nihav-core/src/demuxers/mod.rs
+++ b/nihav-core/src/demuxers/mod.rs
@@ -138,12 +138,12 @@ impl<'a> Iterator for StreamIter<'a> {
 }
 
 pub struct Demuxer<'a> {
-    dmx:        Box<DemuxCore<'a> + 'a>,
+    dmx:        Box<dyn DemuxCore<'a> + 'a>,
     streams:    StreamManager,
 }
 
 impl<'a> Demuxer<'a> {
-    fn new(dmx: Box<DemuxCore<'a> + 'a>, str: StreamManager) -> Self {
+    fn new(dmx: Box<dyn DemuxCore<'a> + 'a>, str: StreamManager) -> Self {
         Demuxer {
             dmx:        dmx,
             streams:    str,
@@ -194,7 +194,7 @@ impl From<ByteIOError> for DemuxerError {
 ///The structure used to create demuxers.
 pub trait DemuxerCreator {
     /// Create new demuxer instance that will use `ByteReader` source as an input.
-    fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<DemuxCore<'a> + 'a>;
+    fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<dyn DemuxCore<'a> + 'a>;
     /// Get the name of current demuxer creator.
     fn get_name(&self) -> &'static str;
 }
diff --git a/nihav-core/src/scale/colorcvt.rs b/nihav-core/src/scale/colorcvt.rs
index 2e2f299..efe3ebc 100644
--- a/nihav-core/src/scale/colorcvt.rs
+++ b/nihav-core/src/scale/colorcvt.rs
@@ -230,7 +230,7 @@ println!(" [intermediate format {}]", df);
     }
 }
 
-pub fn create_rgb2yuv() -> Box<Kernel> {
+pub fn create_rgb2yuv() -> Box<dyn Kernel> {
     Box::new(RgbToYuv::new())
 }
 
@@ -318,6 +318,6 @@ println!(" [intermediate format {}]", df);
     }
 }
 
-pub fn create_yuv2rgb() -> Box<Kernel> {
+pub fn create_yuv2rgb() -> Box<dyn Kernel> {
     Box::new(YuvToRgb::new())
 }
diff --git a/nihav-core/src/scale/mod.rs b/nihav-core/src/scale/mod.rs
index c569b2f..e49fecb 100644
--- a/nihav-core/src/scale/mod.rs
+++ b/nihav-core/src/scale/mod.rs
@@ -38,11 +38,11 @@ pub type ScaleResult<T> = Result<T, ScaleError>;
 
 struct KernelDesc {
     name:       &'static str,
-    create:     fn () -> Box<kernel::Kernel>,
+    create:     fn () -> Box<dyn kernel::Kernel>,
 }
 
 impl KernelDesc {
-    fn find(name: &str) -> ScaleResult<Box<kernel::Kernel>> {
+    fn find(name: &str) -> ScaleResult<Box<dyn kernel::Kernel>> {
         for kern in KERNELS.iter() {
             if kern.name == name {
                 return Ok((kern.create)());
@@ -65,7 +65,7 @@ struct Stage {
     fmt_out:    ScaleInfo,
     tmp_pic:    NABufferType,
     next:       Option<Box<Stage>>,
-    worker:     Box<kernel::Kernel>,
+    worker:     Box<dyn kernel::Kernel>,
 }
 
 pub fn get_scale_fmt_from_pic(pic: &NABufferType) -> ScaleInfo {
diff --git a/nihav-core/src/scale/repack.rs b/nihav-core/src/scale/repack.rs
index 4f2ce99..350ddf4 100644
--- a/nihav-core/src/scale/repack.rs
+++ b/nihav-core/src/scale/repack.rs
@@ -102,7 +102,7 @@ unimplemented!();
     }
 }
 
-pub fn create_pack() -> Box<Kernel> {
+pub fn create_pack() -> Box<dyn Kernel> {
     Box::new(PackKernel::new())
 }
 
@@ -216,7 +216,7 @@ unimplemented!();
     }
 }
 
-pub fn create_unpack() -> Box<Kernel> {
+pub fn create_unpack() -> Box<dyn Kernel> {
     Box::new(UnpackKernel::new())
 }
 
@@ -293,6 +293,6 @@ println!(" [intermediate format {}]", df);
     }
 }
 
-pub fn create_depal() -> Box<Kernel> {
+pub fn create_depal() -> Box<dyn Kernel> {
     Box::new(DepalKernel::new())
 }
diff --git a/nihav-core/src/scale/scale.rs b/nihav-core/src/scale/scale.rs
index 197b7c4..934d380 100644
--- a/nihav-core/src/scale/scale.rs
+++ b/nihav-core/src/scale/scale.rs
@@ -52,7 +52,7 @@ impl Kernel for NNResampler {
     }
 }
 
-pub fn create_scale() -> Box<Kernel> {
+pub fn create_scale() -> Box<dyn Kernel> {
     Box::new(NNResampler::new())
 }
 
diff --git a/nihav-core/src/test/dec_video.rs b/nihav-core/src/test/dec_video.rs
index d000e52..62672b3 100644
--- a/nihav-core/src/test/dec_video.rs
+++ b/nihav-core/src/test/dec_video.rs
@@ -161,7 +161,7 @@ pub fn test_file_decoding(demuxer: &str, name: &str, limit: Option<u64>,
     let mut br = ByteReader::new(&mut fr);
     let mut dmx = create_demuxer(dmx_f, &mut br).unwrap();
 
-    let mut decs: Vec<Option<(Box<NADecoderSupport>, Box<NADecoder>)>> = Vec::new();
+    let mut decs: Vec<Option<(Box<NADecoderSupport>, Box<dyn NADecoder>)>> = Vec::new();
     for i in 0..dmx.get_num_streams() {
         let s = dmx.get_stream(i).unwrap();
         let info = s.get_info();
@@ -219,7 +219,7 @@ pub fn test_decode_audio(demuxer: &str, name: &str, limit: Option<u64>, audio_pf
     let mut br = ByteReader::new(&mut fr);
     let mut dmx = create_demuxer(dmx_f, &mut br).unwrap();
 
-    let mut decs: Vec<Option<(Box<NADecoderSupport>, Box<NADecoder>)>> = Vec::new();
+    let mut decs: Vec<Option<(Box<NADecoderSupport>, Box<dyn NADecoder>)>> = Vec::new();
     for i in 0..dmx.get_num_streams() {
         let s = dmx.get_stream(i).unwrap();
         let info = s.get_info();