From 9ba448427ddeb4bde39e3c51f53cb702df36d918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 12 Nov 2022 17:40:16 +0200 Subject: [PATCH] Regenerate with latest gir Part-of: --- gstreamer-allocators/src/auto/flags.rs | 8 +- gstreamer-allocators/src/auto/versions.txt | 2 +- gstreamer-allocators/sys/build.rs | 2 +- .../sys/src/auto/versions.txt | 2 +- gstreamer-allocators/sys/src/lib.rs | 12 +- gstreamer-allocators/sys/tests/abi.rs | 20 +- gstreamer-app/src/auto/versions.txt | 2 +- gstreamer-app/sys/build.rs | 2 +- gstreamer-app/sys/src/auto/versions.txt | 2 +- gstreamer-app/sys/src/lib.rs | 12 +- gstreamer-app/sys/tests/abi.rs | 20 +- gstreamer-audio/src/auto/flags.rs | 14 +- gstreamer-audio/src/auto/versions.txt | 2 +- gstreamer-audio/sys/build.rs | 2 +- gstreamer-audio/sys/src/auto/versions.txt | 2 +- gstreamer-audio/sys/src/lib.rs | 80 ++--- gstreamer-audio/sys/tests/abi.rs | 20 +- gstreamer-base/src/auto/flags.rs | 10 +- gstreamer-base/src/auto/versions.txt | 2 +- gstreamer-base/sys/build.rs | 2 +- gstreamer-base/sys/src/auto/versions.txt | 2 +- gstreamer-base/sys/src/lib.rs | 60 ++-- gstreamer-base/sys/tests/abi.rs | 20 +- gstreamer-check/src/auto/versions.txt | 2 +- gstreamer-check/sys/build.rs | 2 +- gstreamer-check/sys/src/auto/versions.txt | 2 +- gstreamer-check/sys/src/lib.rs | 6 +- gstreamer-check/sys/tests/abi.rs | 20 +- gstreamer-controller/src/auto/versions.txt | 2 +- gstreamer-controller/sys/build.rs | 2 +- .../sys/src/auto/versions.txt | 2 +- gstreamer-controller/sys/src/lib.rs | 51 ++- gstreamer-controller/sys/tests/abi.rs | 20 +- .../src/auto/command_line_formatter.rs | 2 +- gstreamer-editing-services/src/auto/flags.rs | 30 +- .../src/auto/formatter.rs | 1 + .../src/auto/meta_container.rs | 2 +- .../src/auto/timeline_element.rs | 4 +- .../src/auto/track_element.rs | 2 +- .../src/auto/versions.txt | 2 +- gstreamer-editing-services/sys/build.rs | 2 +- .../sys/src/auto/versions.txt | 2 +- gstreamer-editing-services/sys/src/lib.rs | 238 +++++++------ gstreamer-editing-services/sys/tests/abi.rs | 20 +- gstreamer-gl/egl/src/auto/versions.txt | 2 +- gstreamer-gl/egl/sys/build.rs | 2 +- gstreamer-gl/egl/sys/src/auto/versions.txt | 2 +- gstreamer-gl/egl/sys/src/lib.rs | 4 +- gstreamer-gl/egl/sys/tests/abi.rs | 20 +- gstreamer-gl/src/auto/flags.rs | 56 +-- gstreamer-gl/src/auto/gl_memory_allocator.rs | 1 + gstreamer-gl/src/auto/gl_shader.rs | 16 +- gstreamer-gl/src/auto/glsl_stage.rs | 4 +- gstreamer-gl/src/auto/versions.txt | 2 +- gstreamer-gl/sys/build.rs | 2 +- gstreamer-gl/sys/src/auto/versions.txt | 2 +- gstreamer-gl/sys/src/lib.rs | 103 +++--- gstreamer-gl/sys/tests/abi.rs | 20 +- gstreamer-gl/wayland/src/auto/versions.txt | 2 +- gstreamer-gl/wayland/sys/build.rs | 2 +- .../wayland/sys/src/auto/versions.txt | 2 +- gstreamer-gl/wayland/sys/src/lib.rs | 4 +- gstreamer-gl/wayland/sys/tests/abi.rs | 20 +- gstreamer-gl/x11/src/auto/versions.txt | 2 +- gstreamer-gl/x11/sys/build.rs | 2 +- gstreamer-gl/x11/sys/src/auto/versions.txt | 2 +- gstreamer-gl/x11/sys/src/lib.rs | 4 +- gstreamer-gl/x11/sys/tests/abi.rs | 20 +- gstreamer-mpegts/src/auto/versions.txt | 2 +- gstreamer-mpegts/sys/build.rs | 2 +- gstreamer-mpegts/sys/src/auto/versions.txt | 2 +- gstreamer-mpegts/sys/src/lib.rs | 165 ++++----- gstreamer-mpegts/sys/tests/abi.rs | 20 +- gstreamer-net/src/auto/versions.txt | 2 +- gstreamer-net/sys/build.rs | 2 +- gstreamer-net/sys/src/auto/versions.txt | 2 +- gstreamer-net/sys/src/lib.rs | 22 +- gstreamer-net/sys/tests/abi.rs | 20 +- gstreamer-pbutils/src/auto/flags.rs | 22 +- gstreamer-pbutils/src/auto/functions.rs | 22 +- gstreamer-pbutils/src/auto/versions.txt | 2 +- gstreamer-pbutils/sys/build.rs | 2 +- gstreamer-pbutils/sys/src/auto/versions.txt | 2 +- gstreamer-pbutils/sys/src/lib.rs | 32 +- gstreamer-pbutils/sys/tests/abi.rs | 20 +- gstreamer-play/src/auto/versions.txt | 2 +- gstreamer-play/sys/build.rs | 2 +- gstreamer-play/sys/src/auto/versions.txt | 2 +- gstreamer-play/sys/src/lib.rs | 22 +- gstreamer-play/sys/tests/abi.rs | 20 +- gstreamer-player/src/auto/versions.txt | 2 +- gstreamer-player/sys/build.rs | 2 +- gstreamer-player/sys/src/auto/versions.txt | 2 +- gstreamer-player/sys/src/lib.rs | 31 +- gstreamer-player/sys/tests/abi.rs | 20 +- gstreamer-rtp/src/auto/flags.rs | 20 +- gstreamer-rtp/src/auto/versions.txt | 2 +- gstreamer-rtp/sys/build.rs | 2 +- gstreamer-rtp/sys/src/auto/versions.txt | 2 +- gstreamer-rtp/sys/src/lib.rs | 26 +- gstreamer-rtp/sys/tests/abi.rs | 20 +- gstreamer-rtsp-server/src/auto/flags.rs | 14 +- gstreamer-rtsp-server/src/auto/rtsp_media.rs | 2 +- gstreamer-rtsp-server/src/auto/versions.txt | 2 +- gstreamer-rtsp-server/sys/build.rs | 2 +- .../sys/src/auto/versions.txt | 2 +- gstreamer-rtsp-server/sys/src/lib.rs | 84 ++--- gstreamer-rtsp-server/sys/tests/abi.rs | 20 +- gstreamer-rtsp/src/auto/flags.rs | 52 +-- gstreamer-rtsp/src/auto/versions.txt | 2 +- gstreamer-rtsp/sys/build.rs | 2 +- gstreamer-rtsp/sys/src/auto/versions.txt | 2 +- gstreamer-rtsp/sys/src/lib.rs | 32 +- gstreamer-rtsp/sys/tests/abi.rs | 20 +- gstreamer-sdp/src/auto/versions.txt | 2 +- gstreamer-sdp/sys/build.rs | 2 +- gstreamer-sdp/sys/src/auto/versions.txt | 2 +- gstreamer-sdp/sys/src/lib.rs | 38 +- gstreamer-sdp/sys/tests/abi.rs | 20 +- gstreamer-tag/sys/build.rs | 2 +- gstreamer-tag/sys/src/auto/versions.txt | 2 +- gstreamer-tag/sys/src/lib.rs | 12 +- gstreamer-tag/sys/tests/abi.rs | 20 +- gstreamer-validate/src/auto/flags.rs | 8 +- gstreamer-validate/src/auto/versions.txt | 2 +- gstreamer-validate/sys/build.rs | 2 +- gstreamer-validate/sys/src/auto/versions.txt | 2 +- gstreamer-validate/sys/src/lib.rs | 76 ++-- gstreamer-validate/sys/tests/abi.rs | 20 +- gstreamer-video/src/auto/flags.rs | 138 ++++---- gstreamer-video/src/auto/versions.txt | 2 +- gstreamer-video/sys/build.rs | 2 +- gstreamer-video/sys/src/auto/versions.txt | 2 +- gstreamer-video/sys/src/lib.rs | 147 ++++---- gstreamer-video/sys/tests/abi.rs | 20 +- gstreamer-webrtc/src/auto/versions.txt | 2 +- gstreamer-webrtc/sys/build.rs | 2 +- gstreamer-webrtc/sys/src/auto/versions.txt | 2 +- gstreamer-webrtc/sys/src/lib.rs | 28 +- gstreamer-webrtc/sys/tests/abi.rs | 20 +- gstreamer/src/auto/bus.rs | 4 +- gstreamer/src/auto/flags.rs | 326 +++++++++--------- gstreamer/src/auto/versions.txt | 2 +- gstreamer/sys/build.rs | 2 +- gstreamer/sys/src/auto/versions.txt | 2 +- gstreamer/sys/src/lib.rs | 269 +++++++-------- gstreamer/sys/tests/abi.rs | 20 +- 147 files changed, 1413 insertions(+), 1551 deletions(-) diff --git a/gstreamer-allocators/src/auto/flags.rs b/gstreamer-allocators/src/auto/flags.rs index 352874cc9..ffd69244b 100644 --- a/gstreamer-allocators/src/auto/flags.rs +++ b/gstreamer-allocators/src/auto/flags.rs @@ -10,13 +10,13 @@ bitflags! { #[doc(alias = "GstFdMemoryFlags")] pub struct FdMemoryFlags: u32 { #[doc(alias = "GST_FD_MEMORY_FLAG_NONE")] - const NONE = ffi::GST_FD_MEMORY_FLAG_NONE as u32; + const NONE = ffi::GST_FD_MEMORY_FLAG_NONE as _; #[doc(alias = "GST_FD_MEMORY_FLAG_KEEP_MAPPED")] - const KEEP_MAPPED = ffi::GST_FD_MEMORY_FLAG_KEEP_MAPPED as u32; + const KEEP_MAPPED = ffi::GST_FD_MEMORY_FLAG_KEEP_MAPPED as _; #[doc(alias = "GST_FD_MEMORY_FLAG_MAP_PRIVATE")] - const MAP_PRIVATE = ffi::GST_FD_MEMORY_FLAG_MAP_PRIVATE as u32; + const MAP_PRIVATE = ffi::GST_FD_MEMORY_FLAG_MAP_PRIVATE as _; #[doc(alias = "GST_FD_MEMORY_FLAG_DONT_CLOSE")] - const DONT_CLOSE = ffi::GST_FD_MEMORY_FLAG_DONT_CLOSE as u32; + const DONT_CLOSE = ffi::GST_FD_MEMORY_FLAG_DONT_CLOSE as _; } } diff --git a/gstreamer-allocators/src/auto/versions.txt b/gstreamer-allocators/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-allocators/src/auto/versions.txt +++ b/gstreamer-allocators/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-allocators/sys/build.rs b/gstreamer-allocators/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-allocators/sys/build.rs +++ b/gstreamer-allocators/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-allocators/sys/src/auto/versions.txt b/gstreamer-allocators/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-allocators/sys/src/auto/versions.txt +++ b/gstreamer-allocators/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-allocators/sys/src/lib.rs b/gstreamer-allocators/sys/src/lib.rs index 5c05aac2d..4329a18b1 100644 --- a/gstreamer-allocators/sys/src/lib.rs +++ b/gstreamer-allocators/sys/src/lib.rs @@ -44,7 +44,7 @@ pub struct GstDmaBufAllocatorClass { impl ::std::fmt::Debug for GstDmaBufAllocatorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDmaBufAllocatorClass @ {:p}", self)) + f.debug_struct(&format!("GstDmaBufAllocatorClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -58,7 +58,7 @@ pub struct GstFdAllocatorClass { impl ::std::fmt::Debug for GstFdAllocatorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstFdAllocatorClass @ {:p}", self)) + f.debug_struct(&format!("GstFdAllocatorClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -74,7 +74,7 @@ pub struct GstPhysMemoryAllocatorInterface { impl ::std::fmt::Debug for GstPhysMemoryAllocatorInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPhysMemoryAllocatorInterface @ {:p}", self)) + f.debug_struct(&format!("GstPhysMemoryAllocatorInterface @ {self:p}")) .field("get_phys_addr", &self.get_phys_addr) .finish() } @@ -90,7 +90,7 @@ pub struct GstDmaBufAllocator { impl ::std::fmt::Debug for GstDmaBufAllocator { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDmaBufAllocator @ {:p}", self)) + f.debug_struct(&format!("GstDmaBufAllocator @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -104,7 +104,7 @@ pub struct GstFdAllocator { impl ::std::fmt::Debug for GstFdAllocator { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstFdAllocator @ {:p}", self)) + f.debug_struct(&format!("GstFdAllocator @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -119,7 +119,7 @@ pub struct GstPhysMemoryAllocator { impl ::std::fmt::Debug for GstPhysMemoryAllocator { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstPhysMemoryAllocator @ {:p}", self) + write!(f, "GstPhysMemoryAllocator @ {self:p}") } } diff --git a/gstreamer-allocators/sys/tests/abi.rs b/gstreamer-allocators/sys/tests/abi.rs index e5c155a7a..60848bc90 100644 --- a/gstreamer-allocators/sys/tests/abi.rs +++ b/gstreamer-allocators/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-app/src/auto/versions.txt b/gstreamer-app/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-app/src/auto/versions.txt +++ b/gstreamer-app/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-app/sys/build.rs b/gstreamer-app/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-app/sys/build.rs +++ b/gstreamer-app/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-app/sys/src/auto/versions.txt b/gstreamer-app/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-app/sys/src/auto/versions.txt +++ b/gstreamer-app/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-app/sys/src/lib.rs b/gstreamer-app/sys/src/lib.rs index fccaabfba..17d7e201d 100644 --- a/gstreamer-app/sys/src/lib.rs +++ b/gstreamer-app/sys/src/lib.rs @@ -45,7 +45,7 @@ pub struct GstAppSinkCallbacks { impl ::std::fmt::Debug for GstAppSinkCallbacks { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAppSinkCallbacks @ {:p}", self)) + f.debug_struct(&format!("GstAppSinkCallbacks @ {self:p}")) .field("eos", &self.eos) .field("new_preroll", &self.new_preroll) .field("new_sample", &self.new_sample) @@ -74,7 +74,7 @@ pub struct GstAppSinkClass { impl ::std::fmt::Debug for GstAppSinkClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAppSinkClass @ {:p}", self)) + f.debug_struct(&format!("GstAppSinkClass @ {self:p}")) .field("basesink_class", &self.basesink_class) .field("eos", &self.eos) .field("new_preroll", &self.new_preroll) @@ -107,7 +107,7 @@ pub struct GstAppSrcCallbacks { impl ::std::fmt::Debug for GstAppSrcCallbacks { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAppSrcCallbacks @ {:p}", self)) + f.debug_struct(&format!("GstAppSrcCallbacks @ {self:p}")) .field("need_data", &self.need_data) .field("enough_data", &self.enough_data) .field("seek_data", &self.seek_data) @@ -134,7 +134,7 @@ pub struct GstAppSrcClass { impl ::std::fmt::Debug for GstAppSrcClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAppSrcClass @ {:p}", self)) + f.debug_struct(&format!("GstAppSrcClass @ {self:p}")) .field("basesrc_class", &self.basesrc_class) .field("need_data", &self.need_data) .field("enough_data", &self.enough_data) @@ -166,7 +166,7 @@ pub struct GstAppSink { impl ::std::fmt::Debug for GstAppSink { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAppSink @ {:p}", self)) + f.debug_struct(&format!("GstAppSink @ {self:p}")) .field("basesink", &self.basesink) .finish() } @@ -182,7 +182,7 @@ pub struct GstAppSrc { impl ::std::fmt::Debug for GstAppSrc { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAppSrc @ {:p}", self)) + f.debug_struct(&format!("GstAppSrc @ {self:p}")) .field("basesrc", &self.basesrc) .finish() } diff --git a/gstreamer-app/sys/tests/abi.rs b/gstreamer-app/sys/tests/abi.rs index 1173ded24..e6f00b7dc 100644 --- a/gstreamer-app/sys/tests/abi.rs +++ b/gstreamer-app/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-audio/src/auto/flags.rs b/gstreamer-audio/src/auto/flags.rs index e2fe296b9..cae459e8b 100644 --- a/gstreamer-audio/src/auto/flags.rs +++ b/gstreamer-audio/src/auto/flags.rs @@ -14,7 +14,7 @@ bitflags! { #[doc(alias = "GstAudioFlags")] pub struct AudioFlags: u32 { #[doc(alias = "GST_AUDIO_FLAG_UNPOSITIONED")] - const UNPOSITIONED = ffi::GST_AUDIO_FLAG_UNPOSITIONED as u32; + const UNPOSITIONED = ffi::GST_AUDIO_FLAG_UNPOSITIONED as _; } } @@ -72,15 +72,15 @@ bitflags! { #[doc(alias = "GstAudioFormatFlags")] pub struct AudioFormatFlags: u32 { #[doc(alias = "GST_AUDIO_FORMAT_FLAG_INTEGER")] - const INTEGER = ffi::GST_AUDIO_FORMAT_FLAG_INTEGER as u32; + const INTEGER = ffi::GST_AUDIO_FORMAT_FLAG_INTEGER as _; #[doc(alias = "GST_AUDIO_FORMAT_FLAG_FLOAT")] - const FLOAT = ffi::GST_AUDIO_FORMAT_FLAG_FLOAT as u32; + const FLOAT = ffi::GST_AUDIO_FORMAT_FLAG_FLOAT as _; #[doc(alias = "GST_AUDIO_FORMAT_FLAG_SIGNED")] - const SIGNED = ffi::GST_AUDIO_FORMAT_FLAG_SIGNED as u32; + const SIGNED = ffi::GST_AUDIO_FORMAT_FLAG_SIGNED as _; #[doc(alias = "GST_AUDIO_FORMAT_FLAG_COMPLEX")] - const COMPLEX = ffi::GST_AUDIO_FORMAT_FLAG_COMPLEX as u32; + const COMPLEX = ffi::GST_AUDIO_FORMAT_FLAG_COMPLEX as _; #[doc(alias = "GST_AUDIO_FORMAT_FLAG_UNPACK")] - const UNPACK = ffi::GST_AUDIO_FORMAT_FLAG_UNPACK as u32; + const UNPACK = ffi::GST_AUDIO_FORMAT_FLAG_UNPACK as _; } } @@ -138,7 +138,7 @@ bitflags! { #[doc(alias = "GstAudioPackFlags")] pub struct AudioPackFlags: u32 { #[doc(alias = "GST_AUDIO_PACK_FLAG_TRUNCATE_RANGE")] - const TRUNCATE_RANGE = ffi::GST_AUDIO_PACK_FLAG_TRUNCATE_RANGE as u32; + const TRUNCATE_RANGE = ffi::GST_AUDIO_PACK_FLAG_TRUNCATE_RANGE as _; } } diff --git a/gstreamer-audio/src/auto/versions.txt b/gstreamer-audio/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-audio/src/auto/versions.txt +++ b/gstreamer-audio/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-audio/sys/build.rs b/gstreamer-audio/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-audio/sys/build.rs +++ b/gstreamer-audio/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-audio/sys/src/auto/versions.txt b/gstreamer-audio/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-audio/sys/src/auto/versions.txt +++ b/gstreamer-audio/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-audio/sys/src/lib.rs b/gstreamer-audio/sys/src/lib.rs index f416ea2c0..b9b9992e9 100644 --- a/gstreamer-audio/sys/src/lib.rs +++ b/gstreamer-audio/sys/src/lib.rs @@ -338,7 +338,7 @@ pub struct GstAudioAggregatorClass { impl ::std::fmt::Debug for GstAudioAggregatorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioAggregatorClass @ {:p}", self)) + f.debug_struct(&format!("GstAudioAggregatorClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("create_output_buffer", &self.create_output_buffer) .field("aggregate_one_buffer", &self.aggregate_one_buffer) @@ -355,7 +355,7 @@ pub struct GstAudioAggregatorConvertPadClass { impl ::std::fmt::Debug for GstAudioAggregatorConvertPadClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioAggregatorConvertPadClass @ {:p}", self)) + f.debug_struct(&format!("GstAudioAggregatorConvertPadClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -387,7 +387,7 @@ pub struct GstAudioAggregatorPadClass { impl ::std::fmt::Debug for GstAudioAggregatorPadClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioAggregatorPadClass @ {:p}", self)) + f.debug_struct(&format!("GstAudioAggregatorPadClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("convert_buffer", &self.convert_buffer) .field("update_conversion_info", &self.update_conversion_info) @@ -425,7 +425,7 @@ pub struct GstAudioBaseSinkClass { impl ::std::fmt::Debug for GstAudioBaseSinkClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioBaseSinkClass @ {:p}", self)) + f.debug_struct(&format!("GstAudioBaseSinkClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("create_ringbuffer", &self.create_ringbuffer) .field("payload", &self.payload) @@ -452,7 +452,7 @@ pub struct GstAudioBaseSrcClass { impl ::std::fmt::Debug for GstAudioBaseSrcClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioBaseSrcClass @ {:p}", self)) + f.debug_struct(&format!("GstAudioBaseSrcClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("create_ringbuffer", &self.create_ringbuffer) .finish() @@ -483,7 +483,7 @@ pub struct GstAudioBuffer { impl ::std::fmt::Debug for GstAudioBuffer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioBuffer @ {:p}", self)) + f.debug_struct(&format!("GstAudioBuffer @ {self:p}")) .field("info", &self.info) .field("n_samples", &self.n_samples) .field("n_planes", &self.n_planes) @@ -505,7 +505,7 @@ pub struct GstAudioCdSrcClass { impl ::std::fmt::Debug for GstAudioCdSrcClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioCdSrcClass @ {:p}", self)) + f.debug_struct(&format!("GstAudioCdSrcClass @ {self:p}")) .field("pushsrc_class", &self.pushsrc_class) .field("open", &self.open) .field("close", &self.close) @@ -536,7 +536,7 @@ pub struct GstAudioCdSrcTrack { impl ::std::fmt::Debug for GstAudioCdSrcTrack { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioCdSrcTrack @ {:p}", self)) + f.debug_struct(&format!("GstAudioCdSrcTrack @ {self:p}")) .field("is_audio", &self.is_audio) .field("num", &self.num) .field("start", &self.start) @@ -565,7 +565,7 @@ pub struct GstAudioClippingMeta { impl ::std::fmt::Debug for GstAudioClippingMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioClippingMeta @ {:p}", self)) + f.debug_struct(&format!("GstAudioClippingMeta @ {self:p}")) .field("meta", &self.meta) .field("format", &self.format) .field("start", &self.start) @@ -583,7 +583,7 @@ pub struct GstAudioClockClass { impl ::std::fmt::Debug for GstAudioClockClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioClockClass @ {:p}", self)) + f.debug_struct(&format!("GstAudioClockClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -597,7 +597,7 @@ pub struct GstAudioConverter { impl ::std::fmt::Debug for GstAudioConverter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioConverter @ {:p}", self)) + f.debug_struct(&format!("GstAudioConverter @ {self:p}")) .finish() } } @@ -655,7 +655,7 @@ pub struct GstAudioDecoderClass { impl ::std::fmt::Debug for GstAudioDecoderClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioDecoderClass @ {:p}", self)) + f.debug_struct(&format!("GstAudioDecoderClass @ {self:p}")) .field("element_class", &self.element_class) .field("start", &self.start) .field("stop", &self.stop) @@ -700,7 +700,7 @@ pub struct GstAudioDownmixMeta { impl ::std::fmt::Debug for GstAudioDownmixMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioDownmixMeta @ {:p}", self)) + f.debug_struct(&format!("GstAudioDownmixMeta @ {self:p}")) .field("meta", &self.meta) .field("from_position", &self.from_position) .field("to_position", &self.to_position) @@ -756,7 +756,7 @@ pub struct GstAudioEncoderClass { impl ::std::fmt::Debug for GstAudioEncoderClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioEncoderClass @ {:p}", self)) + f.debug_struct(&format!("GstAudioEncoderClass @ {self:p}")) .field("element_class", &self.element_class) .field("start", &self.start) .field("stop", &self.stop) @@ -797,7 +797,7 @@ pub struct GstAudioFilterClass { impl ::std::fmt::Debug for GstAudioFilterClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioFilterClass @ {:p}", self)) + f.debug_struct(&format!("GstAudioFilterClass @ {self:p}")) .field("basetransformclass", &self.basetransformclass) .field("setup", &self.setup) .finish() @@ -823,7 +823,7 @@ pub struct GstAudioFormatInfo { impl ::std::fmt::Debug for GstAudioFormatInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioFormatInfo @ {:p}", self)) + f.debug_struct(&format!("GstAudioFormatInfo @ {self:p}")) .field("format", &self.format) .field("name", &self.name) .field("description", &self.description) @@ -854,7 +854,7 @@ pub struct GstAudioInfo { impl ::std::fmt::Debug for GstAudioInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioInfo @ {:p}", self)) + f.debug_struct(&format!("GstAudioInfo @ {self:p}")) .field("finfo", &self.finfo) .field("flags", &self.flags) .field("layout", &self.layout) @@ -875,7 +875,7 @@ pub struct GstAudioLevelMeta { impl ::std::fmt::Debug for GstAudioLevelMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioLevelMeta @ {:p}", self)) + f.debug_struct(&format!("GstAudioLevelMeta @ {self:p}")) .field("meta", &self.meta) .field("level", &self.level) .field("voice_activity", &self.voice_activity) @@ -896,7 +896,7 @@ pub struct GstAudioMeta { impl ::std::fmt::Debug for GstAudioMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioMeta @ {:p}", self)) + f.debug_struct(&format!("GstAudioMeta @ {self:p}")) .field("meta", &self.meta) .field("info", &self.info) .field("samples", &self.samples) @@ -953,7 +953,7 @@ pub struct GstAudioRingBufferClass { impl ::std::fmt::Debug for GstAudioRingBufferClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioRingBufferClass @ {:p}", self)) + f.debug_struct(&format!("GstAudioRingBufferClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("open_device", &self.open_device) .field("acquire", &self.acquire) @@ -987,7 +987,7 @@ pub struct GstAudioRingBufferSpec { impl ::std::fmt::Debug for GstAudioRingBufferSpec { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioRingBufferSpec @ {:p}", self)) + f.debug_struct(&format!("GstAudioRingBufferSpec @ {self:p}")) .field("caps", &self.caps) .field("type_", &self.type_) .field("info", &self.info) @@ -1020,7 +1020,7 @@ pub struct GstAudioSinkClass { impl ::std::fmt::Debug for GstAudioSinkClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioSinkClass @ {:p}", self)) + f.debug_struct(&format!("GstAudioSinkClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("open", &self.open) .field("prepare", &self.prepare) @@ -1045,7 +1045,7 @@ pub struct GstAudioSinkClassExtension { impl ::std::fmt::Debug for GstAudioSinkClassExtension { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioSinkClassExtension @ {:p}", self)) + f.debug_struct(&format!("GstAudioSinkClassExtension @ {self:p}")) .field("clear_all", &self.clear_all) .finish() } @@ -1070,7 +1070,7 @@ pub struct GstAudioSrcClass { impl ::std::fmt::Debug for GstAudioSrcClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioSrcClass @ {:p}", self)) + f.debug_struct(&format!("GstAudioSrcClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("open", &self.open) .field("prepare", &self.prepare) @@ -1091,7 +1091,7 @@ pub struct GstAudioStreamAlign { impl ::std::fmt::Debug for GstAudioStreamAlign { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioStreamAlign @ {:p}", self)) + f.debug_struct(&format!("GstAudioStreamAlign @ {self:p}")) .finish() } } @@ -1104,7 +1104,7 @@ pub struct GstStreamVolumeInterface { impl ::std::fmt::Debug for GstStreamVolumeInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstStreamVolumeInterface @ {:p}", self)) + f.debug_struct(&format!("GstStreamVolumeInterface @ {self:p}")) .field("iface", &self.iface) .finish() } @@ -1122,7 +1122,7 @@ pub struct GstAudioAggregator { impl ::std::fmt::Debug for GstAudioAggregator { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioAggregator @ {:p}", self)) + f.debug_struct(&format!("GstAudioAggregator @ {self:p}")) .field("parent", &self.parent) .field("current_caps", &self.current_caps) .finish() @@ -1139,7 +1139,7 @@ pub struct GstAudioAggregatorConvertPad { impl ::std::fmt::Debug for GstAudioAggregatorConvertPad { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioAggregatorConvertPad @ {:p}", self)) + f.debug_struct(&format!("GstAudioAggregatorConvertPad @ {self:p}")) .finish() } } @@ -1155,7 +1155,7 @@ pub struct GstAudioAggregatorPad { impl ::std::fmt::Debug for GstAudioAggregatorPad { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioAggregatorPad @ {:p}", self)) + f.debug_struct(&format!("GstAudioAggregatorPad @ {self:p}")) .field("parent", &self.parent) .field("info", &self.info) .finish() @@ -1178,7 +1178,7 @@ pub struct GstAudioBaseSink { impl ::std::fmt::Debug for GstAudioBaseSink { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioBaseSink @ {:p}", self)) + f.debug_struct(&format!("GstAudioBaseSink @ {self:p}")) .field("element", &self.element) .field("ringbuffer", &self.ringbuffer) .field("buffer_time", &self.buffer_time) @@ -1205,7 +1205,7 @@ pub struct GstAudioBaseSrc { impl ::std::fmt::Debug for GstAudioBaseSrc { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioBaseSrc @ {:p}", self)) + f.debug_struct(&format!("GstAudioBaseSrc @ {self:p}")) .field("element", &self.element) .field("ringbuffer", &self.ringbuffer) .field("buffer_time", &self.buffer_time) @@ -1228,7 +1228,7 @@ pub struct GstAudioCdSrc { impl ::std::fmt::Debug for GstAudioCdSrc { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioCdSrc @ {:p}", self)) + f.debug_struct(&format!("GstAudioCdSrc @ {self:p}")) .field("pushsrc", &self.pushsrc) .field("tags", &self.tags) .finish() @@ -1249,7 +1249,7 @@ pub struct GstAudioClock { impl ::std::fmt::Debug for GstAudioClock { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioClock @ {:p}", self)) + f.debug_struct(&format!("GstAudioClock @ {self:p}")) .field("clock", &self.clock) .field("func", &self.func) .field("user_data", &self.user_data) @@ -1273,7 +1273,7 @@ pub struct GstAudioDecoder { impl ::std::fmt::Debug for GstAudioDecoder { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioDecoder @ {:p}", self)) + f.debug_struct(&format!("GstAudioDecoder @ {self:p}")) .field("element", &self.element) .field("sinkpad", &self.sinkpad) .field("srcpad", &self.srcpad) @@ -1299,7 +1299,7 @@ pub struct GstAudioEncoder { impl ::std::fmt::Debug for GstAudioEncoder { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioEncoder @ {:p}", self)) + f.debug_struct(&format!("GstAudioEncoder @ {self:p}")) .field("element", &self.element) .field("sinkpad", &self.sinkpad) .field("srcpad", &self.srcpad) @@ -1320,7 +1320,7 @@ pub struct GstAudioFilter { impl ::std::fmt::Debug for GstAudioFilter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioFilter @ {:p}", self)) + f.debug_struct(&format!("GstAudioFilter @ {self:p}")) .field("basetransform", &self.basetransform) .field("info", &self.info) .finish() @@ -1357,7 +1357,7 @@ pub struct GstAudioRingBuffer { impl ::std::fmt::Debug for GstAudioRingBuffer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioRingBuffer @ {:p}", self)) + f.debug_struct(&format!("GstAudioRingBuffer @ {self:p}")) .field("object", &self.object) .field("cond", &self.cond) .field("open", &self.open) @@ -1385,7 +1385,7 @@ pub struct GstAudioSink { impl ::std::fmt::Debug for GstAudioSink { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioSink @ {:p}", self)) + f.debug_struct(&format!("GstAudioSink @ {self:p}")) .field("element", &self.element) .finish() } @@ -1401,7 +1401,7 @@ pub struct GstAudioSrc { impl ::std::fmt::Debug for GstAudioSrc { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioSrc @ {:p}", self)) + f.debug_struct(&format!("GstAudioSrc @ {self:p}")) .field("element", &self.element) .finish() } @@ -1416,7 +1416,7 @@ pub struct GstStreamVolume { impl ::std::fmt::Debug for GstStreamVolume { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstStreamVolume @ {:p}", self) + write!(f, "GstStreamVolume @ {self:p}") } } diff --git a/gstreamer-audio/sys/tests/abi.rs b/gstreamer-audio/sys/tests/abi.rs index b4fd8fcbf..5858dca3c 100644 --- a/gstreamer-audio/sys/tests/abi.rs +++ b/gstreamer-audio/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-base/src/auto/flags.rs b/gstreamer-base/src/auto/flags.rs index 32c993da9..596134069 100644 --- a/gstreamer-base/src/auto/flags.rs +++ b/gstreamer-base/src/auto/flags.rs @@ -10,15 +10,15 @@ bitflags! { #[doc(alias = "GstBaseParseFrameFlags")] pub struct BaseParseFrameFlags: u32 { #[doc(alias = "GST_BASE_PARSE_FRAME_FLAG_NEW_FRAME")] - const NEW_FRAME = ffi::GST_BASE_PARSE_FRAME_FLAG_NEW_FRAME as u32; + const NEW_FRAME = ffi::GST_BASE_PARSE_FRAME_FLAG_NEW_FRAME as _; #[doc(alias = "GST_BASE_PARSE_FRAME_FLAG_NO_FRAME")] - const NO_FRAME = ffi::GST_BASE_PARSE_FRAME_FLAG_NO_FRAME as u32; + const NO_FRAME = ffi::GST_BASE_PARSE_FRAME_FLAG_NO_FRAME as _; #[doc(alias = "GST_BASE_PARSE_FRAME_FLAG_CLIP")] - const CLIP = ffi::GST_BASE_PARSE_FRAME_FLAG_CLIP as u32; + const CLIP = ffi::GST_BASE_PARSE_FRAME_FLAG_CLIP as _; #[doc(alias = "GST_BASE_PARSE_FRAME_FLAG_DROP")] - const DROP = ffi::GST_BASE_PARSE_FRAME_FLAG_DROP as u32; + const DROP = ffi::GST_BASE_PARSE_FRAME_FLAG_DROP as _; #[doc(alias = "GST_BASE_PARSE_FRAME_FLAG_QUEUE")] - const QUEUE = ffi::GST_BASE_PARSE_FRAME_FLAG_QUEUE as u32; + const QUEUE = ffi::GST_BASE_PARSE_FRAME_FLAG_QUEUE as _; } } diff --git a/gstreamer-base/src/auto/versions.txt b/gstreamer-base/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-base/src/auto/versions.txt +++ b/gstreamer-base/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-base/sys/build.rs b/gstreamer-base/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-base/sys/build.rs +++ b/gstreamer-base/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-base/sys/src/auto/versions.txt b/gstreamer-base/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-base/sys/src/auto/versions.txt +++ b/gstreamer-base/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-base/sys/src/lib.rs b/gstreamer-base/sys/src/lib.rs index 32e97df04..b13b0f562 100644 --- a/gstreamer-base/sys/src/lib.rs +++ b/gstreamer-base/sys/src/lib.rs @@ -64,7 +64,7 @@ pub union GstCollectData_ABI { impl ::std::fmt::Debug for GstCollectData_ABI { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstCollectData_ABI @ {:p}", self)) + f.debug_struct(&format!("GstCollectData_ABI @ {self:p}")) .field("abi", unsafe { &self.abi }) .finish() } @@ -232,7 +232,7 @@ pub struct GstAggregatorClass { impl ::std::fmt::Debug for GstAggregatorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAggregatorClass @ {:p}", self)) + f.debug_struct(&format!("GstAggregatorClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("flush", &self.flush) .field("clip", &self.clip) @@ -280,7 +280,7 @@ pub struct GstAggregatorPadClass { impl ::std::fmt::Debug for GstAggregatorPadClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAggregatorPadClass @ {:p}", self)) + f.debug_struct(&format!("GstAggregatorPadClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("flush", &self.flush) .field("skip_buffer", &self.skip_buffer) @@ -344,7 +344,7 @@ pub struct GstBaseParseClass { impl ::std::fmt::Debug for GstBaseParseClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBaseParseClass @ {:p}", self)) + f.debug_struct(&format!("GstBaseParseClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("start", &self.start) .field("stop", &self.stop) @@ -378,7 +378,7 @@ pub struct GstBaseParseFrame { impl ::std::fmt::Debug for GstBaseParseFrame { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBaseParseFrame @ {:p}", self)) + f.debug_struct(&format!("GstBaseParseFrame @ {self:p}")) .field("buffer", &self.buffer) .field("out_buffer", &self.out_buffer) .field("flags", &self.flags) @@ -441,7 +441,7 @@ pub struct GstBaseSinkClass { impl ::std::fmt::Debug for GstBaseSinkClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBaseSinkClass @ {:p}", self)) + f.debug_struct(&format!("GstBaseSinkClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("get_caps", &self.get_caps) .field("set_caps", &self.set_caps) @@ -534,7 +534,7 @@ pub struct GstBaseSrcClass { impl ::std::fmt::Debug for GstBaseSrcClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBaseSrcClass @ {:p}", self)) + f.debug_struct(&format!("GstBaseSrcClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("get_caps", &self.get_caps) .field("negotiate", &self.negotiate) @@ -694,7 +694,7 @@ pub struct GstBaseTransformClass { impl ::std::fmt::Debug for GstBaseTransformClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBaseTransformClass @ {:p}", self)) + f.debug_struct(&format!("GstBaseTransformClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("passthrough_on_same_caps", &self.passthrough_on_same_caps) .field( @@ -747,7 +747,7 @@ pub struct GstBitReader { impl ::std::fmt::Debug for GstBitReader { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBitReader @ {:p}", self)) + f.debug_struct(&format!("GstBitReader @ {self:p}")) .field("data", &self.data) .field("size", &self.size) .field("byte", &self.byte) @@ -769,7 +769,7 @@ pub struct GstBitWriter { impl ::std::fmt::Debug for GstBitWriter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBitWriter @ {:p}", self)) + f.debug_struct(&format!("GstBitWriter @ {self:p}")) .field("data", &self.data) .field("bit_size", &self.bit_size) .finish() @@ -787,7 +787,7 @@ pub struct GstByteReader { impl ::std::fmt::Debug for GstByteReader { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstByteReader @ {:p}", self)) + f.debug_struct(&format!("GstByteReader @ {self:p}")) .field("data", &self.data) .field("size", &self.size) .field("byte", &self.byte) @@ -807,7 +807,7 @@ pub struct GstByteWriter { impl ::std::fmt::Debug for GstByteWriter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstByteWriter @ {:p}", self)) + f.debug_struct(&format!("GstByteWriter @ {self:p}")) .field("parent", &self.parent) .field("alloc_size", &self.alloc_size) .field("fixed", &self.fixed) @@ -831,7 +831,7 @@ pub struct GstCollectData { impl ::std::fmt::Debug for GstCollectData { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstCollectData @ {:p}", self)) + f.debug_struct(&format!("GstCollectData @ {self:p}")) .field("collect", &self.collect) .field("pad", &self.pad) .field("buffer", &self.buffer) @@ -858,7 +858,7 @@ pub struct GstCollectData_ABI_abi { impl ::std::fmt::Debug for GstCollectData_ABI_abi { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstCollectData_ABI_abi @ {:p}", self)) + f.debug_struct(&format!("GstCollectData_ABI_abi @ {self:p}")) .field("dts", &self.dts) .finish() } @@ -873,7 +873,7 @@ pub struct GstCollectPadsClass { impl ::std::fmt::Debug for GstCollectPadsClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstCollectPadsClass @ {:p}", self)) + f.debug_struct(&format!("GstCollectPadsClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -898,7 +898,7 @@ pub struct GstDataQueueClass { impl ::std::fmt::Debug for GstDataQueueClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDataQueueClass @ {:p}", self)) + f.debug_struct(&format!("GstDataQueueClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("empty", &self.empty) .field("full", &self.full) @@ -920,7 +920,7 @@ pub struct GstDataQueueItem { impl ::std::fmt::Debug for GstDataQueueItem { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDataQueueItem @ {:p}", self)) + f.debug_struct(&format!("GstDataQueueItem @ {self:p}")) .field("object", &self.object) .field("size", &self.size) .field("duration", &self.duration) @@ -948,7 +948,7 @@ pub struct GstDataQueueSize { impl ::std::fmt::Debug for GstDataQueueSize { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDataQueueSize @ {:p}", self)) + f.debug_struct(&format!("GstDataQueueSize @ {self:p}")) .field("visible", &self.visible) .field("bytes", &self.bytes) .field("time", &self.time) @@ -964,7 +964,7 @@ pub struct GstFlowCombiner { impl ::std::fmt::Debug for GstFlowCombiner { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstFlowCombiner @ {:p}", self)) + f.debug_struct(&format!("GstFlowCombiner @ {self:p}")) .finish() } } @@ -984,7 +984,7 @@ pub struct GstPushSrcClass { impl ::std::fmt::Debug for GstPushSrcClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPushSrcClass @ {:p}", self)) + f.debug_struct(&format!("GstPushSrcClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("create", &self.create) .field("alloc", &self.alloc) @@ -1010,7 +1010,7 @@ pub struct GstAdapter { impl ::std::fmt::Debug for GstAdapter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAdapter @ {:p}", self)).finish() + f.debug_struct(&format!("GstAdapter @ {self:p}")).finish() } } @@ -1025,7 +1025,7 @@ pub struct GstAggregator { impl ::std::fmt::Debug for GstAggregator { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAggregator @ {:p}", self)) + f.debug_struct(&format!("GstAggregator @ {self:p}")) .field("parent", &self.parent) .field("srcpad", &self.srcpad) .finish() @@ -1043,7 +1043,7 @@ pub struct GstAggregatorPad { impl ::std::fmt::Debug for GstAggregatorPad { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAggregatorPad @ {:p}", self)) + f.debug_struct(&format!("GstAggregatorPad @ {self:p}")) .field("parent", &self.parent) .field("segment", &self.segment) .finish() @@ -1064,7 +1064,7 @@ pub struct GstBaseParse { impl ::std::fmt::Debug for GstBaseParse { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBaseParse @ {:p}", self)) + f.debug_struct(&format!("GstBaseParse @ {self:p}")) .field("element", &self.element) .field("sinkpad", &self.sinkpad) .field("srcpad", &self.srcpad) @@ -1102,7 +1102,7 @@ pub struct GstBaseSink { impl ::std::fmt::Debug for GstBaseSink { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBaseSink @ {:p}", self)) + f.debug_struct(&format!("GstBaseSink @ {self:p}")) .field("element", &self.element) .field("sinkpad", &self.sinkpad) .field("pad_mode", &self.pad_mode) @@ -1147,7 +1147,7 @@ pub struct GstBaseSrc { impl ::std::fmt::Debug for GstBaseSrc { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBaseSrc @ {:p}", self)) + f.debug_struct(&format!("GstBaseSrc @ {self:p}")) .field("element", &self.element) .field("srcpad", &self.srcpad) .field("live_lock", &self.live_lock) @@ -1185,7 +1185,7 @@ pub struct GstBaseTransform { impl ::std::fmt::Debug for GstBaseTransform { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBaseTransform @ {:p}", self)) + f.debug_struct(&format!("GstBaseTransform @ {self:p}")) .field("element", &self.element) .field("sinkpad", &self.sinkpad) .field("srcpad", &self.srcpad) @@ -1208,7 +1208,7 @@ pub struct GstCollectPads { impl ::std::fmt::Debug for GstCollectPads { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstCollectPads @ {:p}", self)) + f.debug_struct(&format!("GstCollectPads @ {self:p}")) .field("object", &self.object) .field("data", &self.data) .finish() @@ -1225,7 +1225,7 @@ pub struct GstDataQueue { impl ::std::fmt::Debug for GstDataQueue { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDataQueue @ {:p}", self)) + f.debug_struct(&format!("GstDataQueue @ {self:p}")) .field("object", &self.object) .finish() } @@ -1240,7 +1240,7 @@ pub struct GstPushSrc { impl ::std::fmt::Debug for GstPushSrc { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPushSrc @ {:p}", self)) + f.debug_struct(&format!("GstPushSrc @ {self:p}")) .field("parent", &self.parent) .finish() } diff --git a/gstreamer-base/sys/tests/abi.rs b/gstreamer-base/sys/tests/abi.rs index 0eb5c031a..9481f6141 100644 --- a/gstreamer-base/sys/tests/abi.rs +++ b/gstreamer-base/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-check/src/auto/versions.txt b/gstreamer-check/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-check/src/auto/versions.txt +++ b/gstreamer-check/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-check/sys/build.rs b/gstreamer-check/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-check/sys/build.rs +++ b/gstreamer-check/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-check/sys/src/auto/versions.txt b/gstreamer-check/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-check/sys/src/auto/versions.txt +++ b/gstreamer-check/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-check/sys/src/lib.rs b/gstreamer-check/sys/src/lib.rs index a93fe4b26..746df05de 100644 --- a/gstreamer-check/sys/src/lib.rs +++ b/gstreamer-check/sys/src/lib.rs @@ -41,7 +41,7 @@ pub struct GstHarness { impl ::std::fmt::Debug for GstHarness { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstHarness @ {:p}", self)) + f.debug_struct(&format!("GstHarness @ {self:p}")) .field("element", &self.element) .field("srcpad", &self.srcpad) .field("sinkpad", &self.sinkpad) @@ -83,7 +83,7 @@ pub struct GstTestClockClass { impl ::std::fmt::Debug for GstTestClockClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTestClockClass @ {:p}", self)) + f.debug_struct(&format!("GstTestClockClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -107,7 +107,7 @@ pub struct GstTestClock { impl ::std::fmt::Debug for GstTestClock { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTestClock @ {:p}", self)) + f.debug_struct(&format!("GstTestClock @ {self:p}")) .field("parent", &self.parent) .finish() } diff --git a/gstreamer-check/sys/tests/abi.rs b/gstreamer-check/sys/tests/abi.rs index 7c63d4a53..d71c83459 100644 --- a/gstreamer-check/sys/tests/abi.rs +++ b/gstreamer-check/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-controller/src/auto/versions.txt b/gstreamer-controller/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-controller/src/auto/versions.txt +++ b/gstreamer-controller/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-controller/sys/build.rs b/gstreamer-controller/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-controller/sys/build.rs +++ b/gstreamer-controller/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-controller/sys/src/auto/versions.txt b/gstreamer-controller/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-controller/sys/src/auto/versions.txt +++ b/gstreamer-controller/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-controller/sys/src/lib.rs b/gstreamer-controller/sys/src/lib.rs index 89f509d17..c4c3ed7c2 100644 --- a/gstreamer-controller/sys/src/lib.rs +++ b/gstreamer-controller/sys/src/lib.rs @@ -46,7 +46,7 @@ pub union GstControlPoint_cache { impl ::std::fmt::Debug for GstControlPoint_cache { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstControlPoint_cache @ {:p}", self)) + f.debug_struct(&format!("GstControlPoint_cache @ {self:p}")) .field("cubic", unsafe { &self.cubic }) .field("cubic_monotonic", unsafe { &self.cubic_monotonic }) .finish() @@ -62,7 +62,7 @@ pub union GstDirectControlBinding_ABI { impl ::std::fmt::Debug for GstDirectControlBinding_ABI { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDirectControlBinding_ABI @ {:p}", self)) + f.debug_struct(&format!("GstDirectControlBinding_ABI @ {self:p}")) .field("_gst_reserved", unsafe { &self._gst_reserved }) .field("abi", unsafe { &self.abi }) .finish() @@ -85,7 +85,7 @@ pub struct GstARGBControlBindingClass { impl ::std::fmt::Debug for GstARGBControlBindingClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstARGBControlBindingClass @ {:p}", self)) + f.debug_struct(&format!("GstARGBControlBindingClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -101,7 +101,7 @@ pub struct GstControlPoint { impl ::std::fmt::Debug for GstControlPoint { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstControlPoint @ {:p}", self)) + f.debug_struct(&format!("GstControlPoint @ {self:p}")) .field("timestamp", &self.timestamp) .field("value", &self.value) .field("cache", &self.cache) @@ -118,7 +118,7 @@ pub struct GstControlPoint_cache_cubic { impl ::std::fmt::Debug for GstControlPoint_cache_cubic { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstControlPoint_cache_cubic @ {:p}", self)) + f.debug_struct(&format!("GstControlPoint_cache_cubic @ {self:p}")) .field("h", &self.h) .field("z", &self.z) .finish() @@ -135,14 +135,11 @@ pub struct GstControlPoint_cache_cubic_monotonic { impl ::std::fmt::Debug for GstControlPoint_cache_cubic_monotonic { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!( - "GstControlPoint_cache_cubic_monotonic @ {:p}", - self - )) - .field("c1s", &self.c1s) - .field("c2s", &self.c2s) - .field("c3s", &self.c3s) - .finish() + f.debug_struct(&format!("GstControlPoint_cache_cubic_monotonic @ {self:p}")) + .field("c1s", &self.c1s) + .field("c2s", &self.c2s) + .field("c3s", &self.c3s) + .finish() } } @@ -155,7 +152,7 @@ pub struct GstDirectControlBindingClass { impl ::std::fmt::Debug for GstDirectControlBindingClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDirectControlBindingClass @ {:p}", self)) + f.debug_struct(&format!("GstDirectControlBindingClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -169,7 +166,7 @@ pub struct GstDirectControlBinding_ABI_abi { impl ::std::fmt::Debug for GstDirectControlBinding_ABI_abi { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDirectControlBinding_ABI_abi @ {:p}", self)) + f.debug_struct(&format!("GstDirectControlBinding_ABI_abi @ {self:p}")) .field("want_absolute", &self.want_absolute) .finish() } @@ -184,7 +181,7 @@ pub struct GstInterpolationControlSourceClass { impl ::std::fmt::Debug for GstInterpolationControlSourceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstInterpolationControlSourceClass @ {:p}", self)) + f.debug_struct(&format!("GstInterpolationControlSourceClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -207,7 +204,7 @@ pub struct GstLFOControlSourceClass { impl ::std::fmt::Debug for GstLFOControlSourceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstLFOControlSourceClass @ {:p}", self)) + f.debug_struct(&format!("GstLFOControlSourceClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -230,7 +227,7 @@ pub struct GstProxyControlBindingClass { impl ::std::fmt::Debug for GstProxyControlBindingClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstProxyControlBindingClass @ {:p}", self)) + f.debug_struct(&format!("GstProxyControlBindingClass @ {self:p}")) .finish() } } @@ -244,7 +241,7 @@ pub struct GstTimedValueControlSourceClass { impl ::std::fmt::Debug for GstTimedValueControlSourceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTimedValueControlSourceClass @ {:p}", self)) + f.debug_struct(&format!("GstTimedValueControlSourceClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -267,7 +264,7 @@ pub struct GstTriggerControlSourceClass { impl ::std::fmt::Debug for GstTriggerControlSourceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTriggerControlSourceClass @ {:p}", self)) + f.debug_struct(&format!("GstTriggerControlSourceClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -297,7 +294,7 @@ pub struct GstARGBControlBinding { impl ::std::fmt::Debug for GstARGBControlBinding { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstARGBControlBinding @ {:p}", self)) + f.debug_struct(&format!("GstARGBControlBinding @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -318,7 +315,7 @@ pub struct GstDirectControlBinding { impl ::std::fmt::Debug for GstDirectControlBinding { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDirectControlBinding @ {:p}", self)) + f.debug_struct(&format!("GstDirectControlBinding @ {self:p}")) .field("parent", &self.parent) .field("ABI", &self.ABI) .finish() @@ -335,7 +332,7 @@ pub struct GstInterpolationControlSource { impl ::std::fmt::Debug for GstInterpolationControlSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstInterpolationControlSource @ {:p}", self)) + f.debug_struct(&format!("GstInterpolationControlSource @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -352,7 +349,7 @@ pub struct GstLFOControlSource { impl ::std::fmt::Debug for GstLFOControlSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstLFOControlSource @ {:p}", self)) + f.debug_struct(&format!("GstLFOControlSource @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -369,7 +366,7 @@ pub struct GstProxyControlBinding { impl ::std::fmt::Debug for GstProxyControlBinding { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstProxyControlBinding @ {:p}", self)) + f.debug_struct(&format!("GstProxyControlBinding @ {self:p}")) .finish() } } @@ -388,7 +385,7 @@ pub struct GstTimedValueControlSource { impl ::std::fmt::Debug for GstTimedValueControlSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTimedValueControlSource @ {:p}", self)) + f.debug_struct(&format!("GstTimedValueControlSource @ {self:p}")) .field("parent", &self.parent) .field("lock", &self.lock) .field("values", &self.values) @@ -408,7 +405,7 @@ pub struct GstTriggerControlSource { impl ::std::fmt::Debug for GstTriggerControlSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTriggerControlSource @ {:p}", self)) + f.debug_struct(&format!("GstTriggerControlSource @ {self:p}")) .field("parent", &self.parent) .finish() } diff --git a/gstreamer-controller/sys/tests/abi.rs b/gstreamer-controller/sys/tests/abi.rs index d14cf3e99..53a483e20 100644 --- a/gstreamer-controller/sys/tests/abi.rs +++ b/gstreamer-controller/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-editing-services/src/auto/command_line_formatter.rs b/gstreamer-editing-services/src/auto/command_line_formatter.rs index 2be7dfe1d..ee08672f2 100644 --- a/gstreamer-editing-services/src/auto/command_line_formatter.rs +++ b/gstreamer-editing-services/src/auto/command_line_formatter.rs @@ -25,7 +25,7 @@ impl CommandLineFormatter { #[doc(alias = "get_help")] pub fn help(commands: &[&str]) -> glib::GString { assert_initialized_main_thread!(); - let nargs = commands.len() as i32; + let nargs = commands.len() as _; unsafe { from_glib_full(ffi::ges_command_line_formatter_get_help( nargs, diff --git a/gstreamer-editing-services/src/auto/flags.rs b/gstreamer-editing-services/src/auto/flags.rs index 68b7ade74..b08ade76c 100644 --- a/gstreamer-editing-services/src/auto/flags.rs +++ b/gstreamer-editing-services/src/auto/flags.rs @@ -18,9 +18,9 @@ bitflags! { #[doc(alias = "GESMarkerFlags")] pub struct MarkerFlags: u32 { #[doc(alias = "GES_MARKER_FLAG_NONE")] - const NONE = ffi::GES_MARKER_FLAG_NONE as u32; + const NONE = ffi::GES_MARKER_FLAG_NONE as _; #[doc(alias = "GES_MARKER_FLAG_SNAPPABLE")] - const SNAPPABLE = ffi::GES_MARKER_FLAG_SNAPPABLE as u32; + const SNAPPABLE = ffi::GES_MARKER_FLAG_SNAPPABLE as _; } } @@ -90,11 +90,11 @@ bitflags! { #[doc(alias = "GESMetaFlag")] pub struct MetaFlag: u32 { #[doc(alias = "GES_META_READABLE")] - const READABLE = ffi::GES_META_READABLE as u32; + const READABLE = ffi::GES_META_READABLE as _; #[doc(alias = "GES_META_WRITABLE")] - const WRITABLE = ffi::GES_META_WRITABLE as u32; + const WRITABLE = ffi::GES_META_WRITABLE as _; #[doc(alias = "GES_META_READ_WRITE")] - const READWRITE = ffi::GES_META_READ_WRITE as u32; + const READWRITE = ffi::GES_META_READ_WRITE as _; } } @@ -152,15 +152,15 @@ bitflags! { #[doc(alias = "GESPipelineFlags")] pub struct PipelineFlags: u32 { #[doc(alias = "GES_PIPELINE_MODE_PREVIEW_AUDIO")] - const AUDIO_PREVIEW = ffi::GES_PIPELINE_MODE_PREVIEW_AUDIO as u32; + const AUDIO_PREVIEW = ffi::GES_PIPELINE_MODE_PREVIEW_AUDIO as _; #[doc(alias = "GES_PIPELINE_MODE_PREVIEW_VIDEO")] - const VIDEO_PREVIEW = ffi::GES_PIPELINE_MODE_PREVIEW_VIDEO as u32; + const VIDEO_PREVIEW = ffi::GES_PIPELINE_MODE_PREVIEW_VIDEO as _; #[doc(alias = "GES_PIPELINE_MODE_PREVIEW")] - const FULL_PREVIEW = ffi::GES_PIPELINE_MODE_PREVIEW as u32; + const FULL_PREVIEW = ffi::GES_PIPELINE_MODE_PREVIEW as _; #[doc(alias = "GES_PIPELINE_MODE_RENDER")] - const RENDER = ffi::GES_PIPELINE_MODE_RENDER as u32; + const RENDER = ffi::GES_PIPELINE_MODE_RENDER as _; #[doc(alias = "GES_PIPELINE_MODE_SMART_RENDER")] - const SMART_RENDER = ffi::GES_PIPELINE_MODE_SMART_RENDER as u32; + const SMART_RENDER = ffi::GES_PIPELINE_MODE_SMART_RENDER as _; } } @@ -218,15 +218,15 @@ bitflags! { #[doc(alias = "GESTrackType")] pub struct TrackType: u32 { #[doc(alias = "GES_TRACK_TYPE_UNKNOWN")] - const UNKNOWN = ffi::GES_TRACK_TYPE_UNKNOWN as u32; + const UNKNOWN = ffi::GES_TRACK_TYPE_UNKNOWN as _; #[doc(alias = "GES_TRACK_TYPE_AUDIO")] - const AUDIO = ffi::GES_TRACK_TYPE_AUDIO as u32; + const AUDIO = ffi::GES_TRACK_TYPE_AUDIO as _; #[doc(alias = "GES_TRACK_TYPE_VIDEO")] - const VIDEO = ffi::GES_TRACK_TYPE_VIDEO as u32; + const VIDEO = ffi::GES_TRACK_TYPE_VIDEO as _; #[doc(alias = "GES_TRACK_TYPE_TEXT")] - const TEXT = ffi::GES_TRACK_TYPE_TEXT as u32; + const TEXT = ffi::GES_TRACK_TYPE_TEXT as _; #[doc(alias = "GES_TRACK_TYPE_CUSTOM")] - const CUSTOM = ffi::GES_TRACK_TYPE_CUSTOM as u32; + const CUSTOM = ffi::GES_TRACK_TYPE_CUSTOM as _; } } diff --git a/gstreamer-editing-services/src/auto/formatter.rs b/gstreamer-editing-services/src/auto/formatter.rs index 163dd6764..1361fe11f 100644 --- a/gstreamer-editing-services/src/auto/formatter.rs +++ b/gstreamer-editing-services/src/auto/formatter.rs @@ -54,6 +54,7 @@ impl Formatter { #[doc(alias = "ges_formatter_get_default")] #[doc(alias = "get_default")] + #[allow(clippy::should_implement_trait)] pub fn default() -> Asset { assert_initialized_main_thread!(); unsafe { from_glib_none(ffi::ges_formatter_get_default()) } diff --git a/gstreamer-editing-services/src/auto/meta_container.rs b/gstreamer-editing-services/src/auto/meta_container.rs index 127b5116c..54670fc7a 100644 --- a/gstreamer-editing-services/src/auto/meta_container.rs +++ b/gstreamer-editing-services/src/auto/meta_container.rs @@ -715,7 +715,7 @@ impl> MetaContainerExt for O { } unsafe { let f: Box_ = Box_::new(f); - let detailed_signal_name = detail.map(|name| format!("notify-meta::{}\0", name)); + let detailed_signal_name = detail.map(|name| format!("notify-meta::{name}\0")); let signal_name: &[u8] = detailed_signal_name .as_ref() .map_or(&b"notify-meta\0"[..], |n| n.as_bytes()); diff --git a/gstreamer-editing-services/src/auto/timeline_element.rs b/gstreamer-editing-services/src/auto/timeline_element.rs index efbc79759..b74b118c4 100644 --- a/gstreamer-editing-services/src/auto/timeline_element.rs +++ b/gstreamer-editing-services/src/auto/timeline_element.rs @@ -513,7 +513,7 @@ impl> TimelineElementExt for O { self.as_ref().to_glib_none().0, n_properties.as_mut_ptr(), ), - n_properties.assume_init() as usize, + n_properties.assume_init() as _, ); ret } @@ -862,7 +862,7 @@ impl> TimelineElementExt for O { } unsafe { let f: Box_ = Box_::new(f); - let detailed_signal_name = detail.map(|name| format!("deep-notify::{}\0", name)); + let detailed_signal_name = detail.map(|name| format!("deep-notify::{name}\0")); let signal_name: &[u8] = detailed_signal_name .as_ref() .map_or(&b"deep-notify\0"[..], |n| n.as_bytes()); diff --git a/gstreamer-editing-services/src/auto/track_element.rs b/gstreamer-editing-services/src/auto/track_element.rs index 7775c05d2..50782b381 100644 --- a/gstreamer-editing-services/src/auto/track_element.rs +++ b/gstreamer-editing-services/src/auto/track_element.rs @@ -392,7 +392,7 @@ impl> TrackElementExt for O { self.as_ref().to_glib_none().0, n_properties.as_mut_ptr(), ), - n_properties.assume_init() as usize, + n_properties.assume_init() as _, ); ret } diff --git a/gstreamer-editing-services/src/auto/versions.txt b/gstreamer-editing-services/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-editing-services/src/auto/versions.txt +++ b/gstreamer-editing-services/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-editing-services/sys/build.rs b/gstreamer-editing-services/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-editing-services/sys/build.rs +++ b/gstreamer-editing-services/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-editing-services/sys/src/auto/versions.txt b/gstreamer-editing-services/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-editing-services/sys/src/auto/versions.txt +++ b/gstreamer-editing-services/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-editing-services/sys/src/lib.rs b/gstreamer-editing-services/sys/src/lib.rs index 751421219..784b6ee8e 100644 --- a/gstreamer-editing-services/sys/src/lib.rs +++ b/gstreamer-editing-services/sys/src/lib.rs @@ -226,7 +226,7 @@ pub union GESClipClass_ABI { impl ::std::fmt::Debug for GESClipClass_ABI { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESClipClass_ABI @ {:p}", self)) + f.debug_struct(&format!("GESClipClass_ABI @ {self:p}")) .field("_ges_reserved", unsafe { &self._ges_reserved }) .field("abi", unsafe { &self.abi }) .finish() @@ -242,7 +242,7 @@ pub union GESTrackElementClass_ABI { impl ::std::fmt::Debug for GESTrackElementClass_ABI { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTrackElementClass_ABI @ {:p}", self)) + f.debug_struct(&format!("GESTrackElementClass_ABI @ {self:p}")) .field("_ges_reserved", unsafe { &self._ges_reserved }) .field("abi", unsafe { &self.abi }) .finish() @@ -258,7 +258,7 @@ pub union GESVideoSourceClass_ABI { impl ::std::fmt::Debug for GESVideoSourceClass_ABI { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESVideoSourceClass_ABI @ {:p}", self)) + f.debug_struct(&format!("GESVideoSourceClass_ABI @ {self:p}")) .field("_ges_reserved", unsafe { &self._ges_reserved }) .field("abi", unsafe { &self.abi }) .finish() @@ -329,7 +329,7 @@ pub struct GESAssetClass { impl ::std::fmt::Debug for GESAssetClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESAssetClass @ {:p}", self)) + f.debug_struct(&format!("GESAssetClass @ {self:p}")) .field("parent", &self.parent) .field("start_loading", &self.start_loading) .field("extract", &self.extract) @@ -359,7 +359,7 @@ pub struct GESAudioSourceClass { impl ::std::fmt::Debug for GESAudioSourceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESAudioSourceClass @ {:p}", self)) + f.debug_struct(&format!("GESAudioSourceClass @ {self:p}")) .field("create_source", &self.create_source) .finish() } @@ -382,7 +382,7 @@ pub struct GESAudioTestSourceClass { impl ::std::fmt::Debug for GESAudioTestSourceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESAudioTestSourceClass @ {:p}", self)) + f.debug_struct(&format!("GESAudioTestSourceClass @ {self:p}")) .finish() } } @@ -404,7 +404,7 @@ pub struct GESAudioTrackClass { impl ::std::fmt::Debug for GESAudioTrackClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESAudioTrackClass @ {:p}", self)) + f.debug_struct(&format!("GESAudioTrackClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("_ges_reserved", &self._ges_reserved) .finish() @@ -428,7 +428,7 @@ pub struct GESAudioTransitionClass { impl ::std::fmt::Debug for GESAudioTransitionClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESAudioTransitionClass @ {:p}", self)) + f.debug_struct(&format!("GESAudioTransitionClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("_ges_reserved", &self._ges_reserved) .finish() @@ -452,7 +452,7 @@ pub struct GESAudioUriSourceClass { impl ::std::fmt::Debug for GESAudioUriSourceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESAudioUriSourceClass @ {:p}", self)) + f.debug_struct(&format!("GESAudioUriSourceClass @ {self:p}")) .finish() } } @@ -474,7 +474,7 @@ pub struct GESBaseEffectClass { impl ::std::fmt::Debug for GESBaseEffectClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESBaseEffectClass @ {:p}", self)) + f.debug_struct(&format!("GESBaseEffectClass @ {self:p}")) .finish() } } @@ -488,7 +488,7 @@ pub struct GESBaseEffectClipClass { impl ::std::fmt::Debug for GESBaseEffectClipClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESBaseEffectClipClass @ {:p}", self)) + f.debug_struct(&format!("GESBaseEffectClipClass @ {self:p}")) .finish() } } @@ -518,7 +518,7 @@ pub struct GESBaseTransitionClipClass { impl ::std::fmt::Debug for GESBaseTransitionClipClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESBaseTransitionClipClass @ {:p}", self)) + f.debug_struct(&format!("GESBaseTransitionClipClass @ {self:p}")) .finish() } } @@ -548,7 +548,7 @@ pub struct GESBaseXmlFormatterClass { impl ::std::fmt::Debug for GESBaseXmlFormatterClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESBaseXmlFormatterClass @ {:p}", self)) + f.debug_struct(&format!("GESBaseXmlFormatterClass @ {self:p}")) .field("parent", &self.parent) .field("content_parser", &self.content_parser) .field("save", &self.save) @@ -576,7 +576,7 @@ pub struct GESClipAssetClass { impl ::std::fmt::Debug for GESClipAssetClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESClipAssetClass @ {:p}", self)) + f.debug_struct(&format!("GESClipAssetClass @ {self:p}")) .field("parent", &self.parent) .field("get_natural_framerate", &self.get_natural_framerate) .field("_ges_reserved", &self._ges_reserved) @@ -603,7 +603,7 @@ pub struct GESClipClass { impl ::std::fmt::Debug for GESClipClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESClipClass @ {:p}", self)) + f.debug_struct(&format!("GESClipClass @ {self:p}")) .field("create_track_element", &self.create_track_element) .field("create_track_elements", &self.create_track_elements) .field("ABI", &self.ABI) @@ -619,7 +619,7 @@ pub struct GESClipClass_ABI_abi { impl ::std::fmt::Debug for GESClipClass_ABI_abi { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESClipClass_ABI_abi @ {:p}", self)) + f.debug_struct(&format!("GESClipClass_ABI_abi @ {self:p}")) .field("can_add_effects", &self.can_add_effects) .finish() } @@ -641,7 +641,7 @@ pub struct GESCommandLineFormatterClass { impl ::std::fmt::Debug for GESCommandLineFormatterClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESCommandLineFormatterClass @ {:p}", self)) + f.debug_struct(&format!("GESCommandLineFormatterClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -683,7 +683,7 @@ pub struct GESContainerClass { impl ::std::fmt::Debug for GESContainerClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESContainerClass @ {:p}", self)) + f.debug_struct(&format!("GESContainerClass @ {self:p}")) .field("child_added", &self.child_added) .field("child_removed", &self.child_removed) .field("add_child", &self.add_child) @@ -712,7 +712,7 @@ pub struct GESEffectAssetClass { impl ::std::fmt::Debug for GESEffectAssetClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESEffectAssetClass @ {:p}", self)) + f.debug_struct(&format!("GESEffectAssetClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("_ges_reserved", &self._ges_reserved) .finish() @@ -737,7 +737,7 @@ pub struct GESEffectClass { impl ::std::fmt::Debug for GESEffectClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESEffectClass @ {:p}", self)) + f.debug_struct(&format!("GESEffectClass @ {self:p}")) .finish() } } @@ -751,7 +751,7 @@ pub struct GESEffectClipClass { impl ::std::fmt::Debug for GESEffectClipClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESEffectClipClass @ {:p}", self)) + f.debug_struct(&format!("GESEffectClipClass @ {self:p}")) .finish() } } @@ -798,7 +798,7 @@ pub struct GESExtractableInterface { impl ::std::fmt::Debug for GESExtractableInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESExtractableInterface @ {:p}", self)) + f.debug_struct(&format!("GESExtractableInterface @ {self:p}")) .field("parent", &self.parent) .field("asset_type", &self.asset_type) .field("check_id", &self.check_id) @@ -832,7 +832,7 @@ pub struct GESFormatterClass { impl ::std::fmt::Debug for GESFormatterClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESFormatterClass @ {:p}", self)) + f.debug_struct(&format!("GESFormatterClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("can_load_uri", &self.can_load_uri) .field("load_from_uri", &self.load_from_uri) @@ -858,7 +858,7 @@ pub struct GESGroupClass { impl ::std::fmt::Debug for GESGroupClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESGroupClass @ {:p}", self)) + f.debug_struct(&format!("GESGroupClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("_ges_reserved", &self._ges_reserved) .finish() @@ -882,7 +882,7 @@ pub struct GESImageSourceClass { impl ::std::fmt::Debug for GESImageSourceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESImageSourceClass @ {:p}", self)) + f.debug_struct(&format!("GESImageSourceClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("_ges_reserved", &self._ges_reserved) .finish() @@ -909,7 +909,7 @@ pub struct GESLayerClass { impl ::std::fmt::Debug for GESLayerClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESLayerClass @ {:p}", self)) + f.debug_struct(&format!("GESLayerClass @ {self:p}")) .field("get_objects", &self.get_objects) .field("object_added", &self.object_added) .field("object_removed", &self.object_removed) @@ -933,7 +933,7 @@ pub struct GESMarkerClass { impl ::std::fmt::Debug for GESMarkerClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESMarkerClass @ {:p}", self)) + f.debug_struct(&format!("GESMarkerClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -947,7 +947,7 @@ pub struct GESMarkerListClass { impl ::std::fmt::Debug for GESMarkerListClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESMarkerListClass @ {:p}", self)) + f.debug_struct(&format!("GESMarkerListClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -962,7 +962,7 @@ pub struct GESMetaContainerInterface { impl ::std::fmt::Debug for GESMetaContainerInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESMetaContainerInterface @ {:p}", self)) + f.debug_struct(&format!("GESMetaContainerInterface @ {self:p}")) .field("parent_iface", &self.parent_iface) .field("_ges_reserved", &self._ges_reserved) .finish() @@ -978,7 +978,7 @@ pub struct GESMultiFileSourceClass { impl ::std::fmt::Debug for GESMultiFileSourceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESMultiFileSourceClass @ {:p}", self)) + f.debug_struct(&format!("GESMultiFileSourceClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("_ges_reserved", &self._ges_reserved) .finish() @@ -1002,7 +1002,7 @@ pub struct GESOperationClass { impl ::std::fmt::Debug for GESOperationClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESOperationClass @ {:p}", self)) + f.debug_struct(&format!("GESOperationClass @ {self:p}")) .finish() } } @@ -1016,7 +1016,7 @@ pub struct GESOperationClipClass { impl ::std::fmt::Debug for GESOperationClipClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESOperationClipClass @ {:p}", self)) + f.debug_struct(&format!("GESOperationClipClass @ {self:p}")) .finish() } } @@ -1046,7 +1046,7 @@ pub struct GESOverlayClipClass { impl ::std::fmt::Debug for GESOverlayClipClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESOverlayClipClass @ {:p}", self)) + f.debug_struct(&format!("GESOverlayClipClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -1069,7 +1069,7 @@ pub struct GESPipelineClass { impl ::std::fmt::Debug for GESPipelineClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESPipelineClass @ {:p}", self)) + f.debug_struct(&format!("GESPipelineClass @ {self:p}")) .finish() } } @@ -1091,7 +1091,7 @@ pub struct GESPitiviFormatterClass { impl ::std::fmt::Debug for GESPitiviFormatterClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESPitiviFormatterClass @ {:p}", self)) + f.debug_struct(&format!("GESPitiviFormatterClass @ {self:p}")) .finish() } } @@ -1124,7 +1124,7 @@ pub struct GESProjectClass { impl ::std::fmt::Debug for GESProjectClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESProjectClass @ {:p}", self)) + f.debug_struct(&format!("GESProjectClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("asset_added", &self.asset_added) .field("asset_loading", &self.asset_loading) @@ -1157,7 +1157,7 @@ pub struct GESSourceClass { impl ::std::fmt::Debug for GESSourceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESSourceClass @ {:p}", self)) + f.debug_struct(&format!("GESSourceClass @ {self:p}")) .field("select_pad", &self.select_pad) .field("create_source", &self.create_source) .finish() @@ -1172,7 +1172,7 @@ pub struct GESSourceClipAssetClass { impl ::std::fmt::Debug for GESSourceClipAssetClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESSourceClipAssetClass @ {:p}", self)) + f.debug_struct(&format!("GESSourceClipAssetClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -1187,7 +1187,7 @@ pub struct GESSourceClipClass { impl ::std::fmt::Debug for GESSourceClipClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESSourceClipClass @ {:p}", self)) + f.debug_struct(&format!("GESSourceClipClass @ {self:p}")) .finish() } } @@ -1217,7 +1217,7 @@ pub struct GESTestClipClass { impl ::std::fmt::Debug for GESTestClipClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTestClipClass @ {:p}", self)) + f.debug_struct(&format!("GESTestClipClass @ {self:p}")) .finish() } } @@ -1239,7 +1239,7 @@ pub struct GESTextOverlayClass { impl ::std::fmt::Debug for GESTextOverlayClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTextOverlayClass @ {:p}", self)) + f.debug_struct(&format!("GESTextOverlayClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -1254,7 +1254,7 @@ pub struct GESTextOverlayClipClass { impl ::std::fmt::Debug for GESTextOverlayClipClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTextOverlayClipClass @ {:p}", self)) + f.debug_struct(&format!("GESTextOverlayClipClass @ {self:p}")) .finish() } } @@ -1291,7 +1291,7 @@ pub struct GESTimelineClass { impl ::std::fmt::Debug for GESTimelineClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTimelineClass @ {:p}", self)) + f.debug_struct(&format!("GESTimelineClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("track_added", &self.track_added) .field("track_removed", &self.track_removed) @@ -1368,7 +1368,7 @@ pub struct GESTimelineElementClass { impl ::std::fmt::Debug for GESTimelineElementClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTimelineElementClass @ {:p}", self)) + f.debug_struct(&format!("GESTimelineElementClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("set_parent", &self.set_parent) .field("set_start", &self.set_start) @@ -1420,7 +1420,7 @@ pub struct GESTitleClipClass { impl ::std::fmt::Debug for GESTitleClipClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTitleClipClass @ {:p}", self)) + f.debug_struct(&format!("GESTitleClipClass @ {self:p}")) .finish() } } @@ -1442,7 +1442,7 @@ pub struct GESTitleSourceClass { impl ::std::fmt::Debug for GESTitleSourceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTitleSourceClass @ {:p}", self)) + f.debug_struct(&format!("GESTitleSourceClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -1466,7 +1466,7 @@ pub struct GESTrackClass { impl ::std::fmt::Debug for GESTrackClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTrackClass @ {:p}", self)) + f.debug_struct(&format!("GESTrackClass @ {self:p}")) .field("get_mixing_element", &self.get_mixing_element) .finish() } @@ -1483,7 +1483,7 @@ pub struct GESTrackElementAssetClass { impl ::std::fmt::Debug for GESTrackElementAssetClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTrackElementAssetClass @ {:p}", self)) + f.debug_struct(&format!("GESTrackElementAssetClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("get_natural_framerate", &self.get_natural_framerate) .field("_ges_reserved", &self._ges_reserved) @@ -1525,7 +1525,7 @@ pub struct GESTrackElementClass { impl ::std::fmt::Debug for GESTrackElementClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTrackElementClass @ {:p}", self)) + f.debug_struct(&format!("GESTrackElementClass @ {self:p}")) .field("nleobject_factorytype", &self.nleobject_factorytype) .field("create_gnl_object", &self.create_gnl_object) .field("create_element", &self.create_element) @@ -1547,7 +1547,7 @@ pub struct GESTrackElementClass_ABI_abi { impl ::std::fmt::Debug for GESTrackElementClass_ABI_abi { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTrackElementClass_ABI_abi @ {:p}", self)) + f.debug_struct(&format!("GESTrackElementClass_ABI_abi @ {self:p}")) .field( "default_has_internal_source", &self.default_has_internal_source, @@ -1582,7 +1582,7 @@ pub struct GESTransitionClass { impl ::std::fmt::Debug for GESTransitionClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTransitionClass @ {:p}", self)) + f.debug_struct(&format!("GESTransitionClass @ {self:p}")) .finish() } } @@ -1596,7 +1596,7 @@ pub struct GESTransitionClipClass { impl ::std::fmt::Debug for GESTransitionClipClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTransitionClipClass @ {:p}", self)) + f.debug_struct(&format!("GESTransitionClipClass @ {self:p}")) .finish() } } @@ -1636,7 +1636,7 @@ pub struct GESUriClipAssetClass { impl ::std::fmt::Debug for GESUriClipAssetClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESUriClipAssetClass @ {:p}", self)) + f.debug_struct(&format!("GESUriClipAssetClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("discovered", &self.discovered) .finish() @@ -1660,7 +1660,7 @@ pub struct GESUriClipClass { impl ::std::fmt::Debug for GESUriClipClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESUriClipClass @ {:p}", self)) + f.debug_struct(&format!("GESUriClipClass @ {self:p}")) .finish() } } @@ -1690,7 +1690,7 @@ pub struct GESUriSourceAssetClass { impl ::std::fmt::Debug for GESUriSourceAssetClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESUriSourceAssetClass @ {:p}", self)) + f.debug_struct(&format!("GESUriSourceAssetClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("_ges_reserved", &self._ges_reserved) .finish() @@ -1715,7 +1715,7 @@ pub struct GESVideoSourceClass { impl ::std::fmt::Debug for GESVideoSourceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESVideoSourceClass @ {:p}", self)) + f.debug_struct(&format!("GESVideoSourceClass @ {self:p}")) .field("create_source", &self.create_source) .field("ABI", &self.ABI) .finish() @@ -1736,7 +1736,7 @@ pub struct GESVideoSourceClass_ABI_abi { impl ::std::fmt::Debug for GESVideoSourceClass_ABI_abi { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESVideoSourceClass_ABI_abi @ {:p}", self)) + f.debug_struct(&format!("GESVideoSourceClass_ABI_abi @ {self:p}")) .field( "disable_scale_in_compositor", &self.disable_scale_in_compositor, @@ -1765,7 +1765,7 @@ pub struct GESVideoTestSourceClass { impl ::std::fmt::Debug for GESVideoTestSourceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESVideoTestSourceClass @ {:p}", self)) + f.debug_struct(&format!("GESVideoTestSourceClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("_ges_reserved", &self._ges_reserved) .finish() @@ -1789,7 +1789,7 @@ pub struct GESVideoTrackClass { impl ::std::fmt::Debug for GESVideoTrackClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESVideoTrackClass @ {:p}", self)) + f.debug_struct(&format!("GESVideoTrackClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("_ges_reserved", &self._ges_reserved) .finish() @@ -1813,7 +1813,7 @@ pub struct GESVideoTransitionClass { impl ::std::fmt::Debug for GESVideoTransitionClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESVideoTransitionClass @ {:p}", self)) + f.debug_struct(&format!("GESVideoTransitionClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -1836,7 +1836,7 @@ pub struct GESVideoUriSourceClass { impl ::std::fmt::Debug for GESVideoUriSourceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESVideoUriSourceClass @ {:p}", self)) + f.debug_struct(&format!("GESVideoUriSourceClass @ {self:p}")) .finish() } } @@ -1858,7 +1858,7 @@ pub struct GESXmlFormatterClass { impl ::std::fmt::Debug for GESXmlFormatterClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESXmlFormatterClass @ {:p}", self)) + f.debug_struct(&format!("GESXmlFormatterClass @ {self:p}")) .field("parent", &self.parent) .field("_ges_reserved", &self._ges_reserved) .finish() @@ -1884,7 +1884,7 @@ pub struct GESAsset { impl ::std::fmt::Debug for GESAsset { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESAsset @ {:p}", self)) + f.debug_struct(&format!("GESAsset @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1900,7 +1900,7 @@ pub struct GESAudioSource { impl ::std::fmt::Debug for GESAudioSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESAudioSource @ {:p}", self)) + f.debug_struct(&format!("GESAudioSource @ {self:p}")) .finish() } } @@ -1915,7 +1915,7 @@ pub struct GESAudioTestSource { impl ::std::fmt::Debug for GESAudioTestSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESAudioTestSource @ {:p}", self)) + f.debug_struct(&format!("GESAudioTestSource @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1931,7 +1931,7 @@ pub struct GESAudioTrack { impl ::std::fmt::Debug for GESAudioTrack { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESAudioTrack @ {:p}", self)) + f.debug_struct(&format!("GESAudioTrack @ {self:p}")) .field("parent_instance", &self.parent_instance) .finish() } @@ -1947,7 +1947,7 @@ pub struct GESAudioTransition { impl ::std::fmt::Debug for GESAudioTransition { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESAudioTransition @ {:p}", self)) + f.debug_struct(&format!("GESAudioTransition @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1964,7 +1964,7 @@ pub struct GESAudioUriSource { impl ::std::fmt::Debug for GESAudioUriSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESAudioUriSource @ {:p}", self)) + f.debug_struct(&format!("GESAudioUriSource @ {self:p}")) .finish() } } @@ -1979,7 +1979,7 @@ pub struct GESBaseEffect { impl ::std::fmt::Debug for GESBaseEffect { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESBaseEffect @ {:p}", self)) + f.debug_struct(&format!("GESBaseEffect @ {self:p}")) .finish() } } @@ -1994,7 +1994,7 @@ pub struct GESBaseEffectClip { impl ::std::fmt::Debug for GESBaseEffectClip { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESBaseEffectClip @ {:p}", self)) + f.debug_struct(&format!("GESBaseEffectClip @ {self:p}")) .finish() } } @@ -2009,7 +2009,7 @@ pub struct GESBaseTransitionClip { impl ::std::fmt::Debug for GESBaseTransitionClip { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESBaseTransitionClip @ {:p}", self)) + f.debug_struct(&format!("GESBaseTransitionClip @ {self:p}")) .finish() } } @@ -2025,7 +2025,7 @@ pub struct GESBaseXmlFormatter { impl ::std::fmt::Debug for GESBaseXmlFormatter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESBaseXmlFormatter @ {:p}", self)) + f.debug_struct(&format!("GESBaseXmlFormatter @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2041,7 +2041,7 @@ pub struct GESClip { impl ::std::fmt::Debug for GESClip { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESClip @ {:p}", self)) + f.debug_struct(&format!("GESClip @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2057,7 +2057,7 @@ pub struct GESClipAsset { impl ::std::fmt::Debug for GESClipAsset { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESClipAsset @ {:p}", self)) + f.debug_struct(&format!("GESClipAsset @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2072,7 +2072,7 @@ pub struct GESCommandLineFormatter { impl ::std::fmt::Debug for GESCommandLineFormatter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESCommandLineFormatter @ {:p}", self)) + f.debug_struct(&format!("GESCommandLineFormatter @ {self:p}")) .field("parent_instance", &self.parent_instance) .field("priv_", &self.priv_) .finish() @@ -2093,7 +2093,7 @@ pub struct GESContainer { impl ::std::fmt::Debug for GESContainer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESContainer @ {:p}", self)) + f.debug_struct(&format!("GESContainer @ {self:p}")) .field("parent", &self.parent) .field("children", &self.children) .field("height", &self.height) @@ -2113,7 +2113,7 @@ pub struct GESEffect { impl ::std::fmt::Debug for GESEffect { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESEffect @ {:p}", self)).finish() + f.debug_struct(&format!("GESEffect @ {self:p}")).finish() } } @@ -2127,7 +2127,7 @@ pub struct GESEffectAsset { impl ::std::fmt::Debug for GESEffectAsset { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESEffectAsset @ {:p}", self)) + f.debug_struct(&format!("GESEffectAsset @ {self:p}")) .field("parent_instance", &self.parent_instance) .field("priv_", &self.priv_) .field("_ges_reserved", &self._ges_reserved) @@ -2145,7 +2145,7 @@ pub struct GESEffectClip { impl ::std::fmt::Debug for GESEffectClip { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESEffectClip @ {:p}", self)) + f.debug_struct(&format!("GESEffectClip @ {self:p}")) .finish() } } @@ -2162,7 +2162,7 @@ pub struct GESFormatter { impl ::std::fmt::Debug for GESFormatter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESFormatter @ {:p}", self)) + f.debug_struct(&format!("GESFormatter @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2178,7 +2178,7 @@ pub struct GESGroup { impl ::std::fmt::Debug for GESGroup { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESGroup @ {:p}", self)) + f.debug_struct(&format!("GESGroup @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2195,7 +2195,7 @@ pub struct GESImageSource { impl ::std::fmt::Debug for GESImageSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESImageSource @ {:p}", self)) + f.debug_struct(&format!("GESImageSource @ {self:p}")) .finish() } } @@ -2213,7 +2213,7 @@ pub struct GESLayer { impl ::std::fmt::Debug for GESLayer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESLayer @ {:p}", self)) + f.debug_struct(&format!("GESLayer @ {self:p}")) .field("parent", &self.parent) .field("timeline", &self.timeline) .field("min_nle_priority", &self.min_nle_priority) @@ -2232,7 +2232,7 @@ pub struct GESMarker { impl ::std::fmt::Debug for GESMarker { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESMarker @ {:p}", self)).finish() + f.debug_struct(&format!("GESMarker @ {self:p}")).finish() } } @@ -2244,7 +2244,7 @@ pub struct GESMarkerList { impl ::std::fmt::Debug for GESMarkerList { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESMarkerList @ {:p}", self)) + f.debug_struct(&format!("GESMarkerList @ {self:p}")) .finish() } } @@ -2260,7 +2260,7 @@ pub struct GESMultiFileSource { impl ::std::fmt::Debug for GESMultiFileSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESMultiFileSource @ {:p}", self)) + f.debug_struct(&format!("GESMultiFileSource @ {self:p}")) .finish() } } @@ -2275,8 +2275,7 @@ pub struct GESOperation { impl ::std::fmt::Debug for GESOperation { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESOperation @ {:p}", self)) - .finish() + f.debug_struct(&format!("GESOperation @ {self:p}")).finish() } } @@ -2290,7 +2289,7 @@ pub struct GESOperationClip { impl ::std::fmt::Debug for GESOperationClip { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESOperationClip @ {:p}", self)) + f.debug_struct(&format!("GESOperationClip @ {self:p}")) .finish() } } @@ -2305,7 +2304,7 @@ pub struct GESOverlayClip { impl ::std::fmt::Debug for GESOverlayClip { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESOverlayClip @ {:p}", self)) + f.debug_struct(&format!("GESOverlayClip @ {self:p}")) .finish() } } @@ -2320,8 +2319,7 @@ pub struct GESPipeline { impl ::std::fmt::Debug for GESPipeline { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESPipeline @ {:p}", self)) - .finish() + f.debug_struct(&format!("GESPipeline @ {self:p}")).finish() } } @@ -2335,7 +2333,7 @@ pub struct GESPitiviFormatter { impl ::std::fmt::Debug for GESPitiviFormatter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESPitiviFormatter @ {:p}", self)) + f.debug_struct(&format!("GESPitiviFormatter @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2351,7 +2349,7 @@ pub struct GESProject { impl ::std::fmt::Debug for GESProject { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESProject @ {:p}", self)) + f.debug_struct(&format!("GESProject @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2367,7 +2365,7 @@ pub struct GESSource { impl ::std::fmt::Debug for GESSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESSource @ {:p}", self)).finish() + f.debug_struct(&format!("GESSource @ {self:p}")).finish() } } @@ -2381,7 +2379,7 @@ pub struct GESSourceClip { impl ::std::fmt::Debug for GESSourceClip { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESSourceClip @ {:p}", self)) + f.debug_struct(&format!("GESSourceClip @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2395,7 +2393,7 @@ pub struct GESSourceClipAsset { impl ::std::fmt::Debug for GESSourceClipAsset { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESSourceClipAsset @ {:p}", self)) + f.debug_struct(&format!("GESSourceClipAsset @ {self:p}")) .field("parent_instance", &self.parent_instance) .finish() } @@ -2411,7 +2409,7 @@ pub struct GESTestClip { impl ::std::fmt::Debug for GESTestClip { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTestClip @ {:p}", self)) + f.debug_struct(&format!("GESTestClip @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2427,7 +2425,7 @@ pub struct GESTextOverlay { impl ::std::fmt::Debug for GESTextOverlay { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTextOverlay @ {:p}", self)) + f.debug_struct(&format!("GESTextOverlay @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2443,7 +2441,7 @@ pub struct GESTextOverlayClip { impl ::std::fmt::Debug for GESTextOverlayClip { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTextOverlayClip @ {:p}", self)) + f.debug_struct(&format!("GESTextOverlayClip @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2461,7 +2459,7 @@ pub struct GESTimeline { impl ::std::fmt::Debug for GESTimeline { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTimeline @ {:p}", self)) + f.debug_struct(&format!("GESTimeline @ {self:p}")) .field("parent", &self.parent) .field("layers", &self.layers) .field("tracks", &self.tracks) @@ -2488,7 +2486,7 @@ pub struct GESTimelineElement { impl ::std::fmt::Debug for GESTimelineElement { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTimelineElement @ {:p}", self)) + f.debug_struct(&format!("GESTimelineElement @ {self:p}")) .field("parent_instance", &self.parent_instance) .field("parent", &self.parent) .field("asset", &self.asset) @@ -2513,7 +2511,7 @@ pub struct GESTitleClip { impl ::std::fmt::Debug for GESTitleClip { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTitleClip @ {:p}", self)) + f.debug_struct(&format!("GESTitleClip @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2529,7 +2527,7 @@ pub struct GESTitleSource { impl ::std::fmt::Debug for GESTitleSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTitleSource @ {:p}", self)) + f.debug_struct(&format!("GESTitleSource @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2546,7 +2544,7 @@ pub struct GESTrack { impl ::std::fmt::Debug for GESTrack { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTrack @ {:p}", self)) + f.debug_struct(&format!("GESTrack @ {self:p}")) .field("parent", &self.parent) .field("type_", &self.type_) .finish() @@ -2565,7 +2563,7 @@ pub struct GESTrackElement { impl ::std::fmt::Debug for GESTrackElement { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTrackElement @ {:p}", self)) + f.debug_struct(&format!("GESTrackElement @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2581,7 +2579,7 @@ pub struct GESTrackElementAsset { impl ::std::fmt::Debug for GESTrackElementAsset { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTrackElementAsset @ {:p}", self)) + f.debug_struct(&format!("GESTrackElementAsset @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2597,7 +2595,7 @@ pub struct GESTransition { impl ::std::fmt::Debug for GESTransition { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTransition @ {:p}", self)) + f.debug_struct(&format!("GESTransition @ {self:p}")) .finish() } } @@ -2613,7 +2611,7 @@ pub struct GESTransitionClip { impl ::std::fmt::Debug for GESTransitionClip { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESTransitionClip @ {:p}", self)) + f.debug_struct(&format!("GESTransitionClip @ {self:p}")) .field("vtype", &self.vtype) .finish() } @@ -2629,7 +2627,7 @@ pub struct GESUriClip { impl ::std::fmt::Debug for GESUriClip { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESUriClip @ {:p}", self)) + f.debug_struct(&format!("GESUriClip @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2645,7 +2643,7 @@ pub struct GESUriClipAsset { impl ::std::fmt::Debug for GESUriClipAsset { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESUriClipAsset @ {:p}", self)) + f.debug_struct(&format!("GESUriClipAsset @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2661,7 +2659,7 @@ pub struct GESUriSourceAsset { impl ::std::fmt::Debug for GESUriSourceAsset { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESUriSourceAsset @ {:p}", self)) + f.debug_struct(&format!("GESUriSourceAsset @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2677,7 +2675,7 @@ pub struct GESVideoSource { impl ::std::fmt::Debug for GESVideoSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESVideoSource @ {:p}", self)) + f.debug_struct(&format!("GESVideoSource @ {self:p}")) .finish() } } @@ -2692,7 +2690,7 @@ pub struct GESVideoTestSource { impl ::std::fmt::Debug for GESVideoTestSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESVideoTestSource @ {:p}", self)) + f.debug_struct(&format!("GESVideoTestSource @ {self:p}")) .finish() } } @@ -2707,7 +2705,7 @@ pub struct GESVideoTrack { impl ::std::fmt::Debug for GESVideoTrack { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESVideoTrack @ {:p}", self)) + f.debug_struct(&format!("GESVideoTrack @ {self:p}")) .field("parent_instance", &self.parent_instance) .finish() } @@ -2723,7 +2721,7 @@ pub struct GESVideoTransition { impl ::std::fmt::Debug for GESVideoTransition { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESVideoTransition @ {:p}", self)) + f.debug_struct(&format!("GESVideoTransition @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2740,7 +2738,7 @@ pub struct GESVideoUriSource { impl ::std::fmt::Debug for GESVideoUriSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESVideoUriSource @ {:p}", self)) + f.debug_struct(&format!("GESVideoUriSource @ {self:p}")) .finish() } } @@ -2755,7 +2753,7 @@ pub struct GESXmlFormatter { impl ::std::fmt::Debug for GESXmlFormatter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GESXmlFormatter @ {:p}", self)) + f.debug_struct(&format!("GESXmlFormatter @ {self:p}")) .field("parent", &self.parent) .field("priv_", &self.priv_) .field("_ges_reserved", &self._ges_reserved) @@ -2772,7 +2770,7 @@ pub struct GESExtractable { impl ::std::fmt::Debug for GESExtractable { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GESExtractable @ {:p}", self) + write!(f, "GESExtractable @ {self:p}") } } @@ -2784,7 +2782,7 @@ pub struct GESMetaContainer { impl ::std::fmt::Debug for GESMetaContainer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GESMetaContainer @ {:p}", self) + write!(f, "GESMetaContainer @ {self:p}") } } diff --git a/gstreamer-editing-services/sys/tests/abi.rs b/gstreamer-editing-services/sys/tests/abi.rs index d1b257ddf..2e4337d5d 100644 --- a/gstreamer-editing-services/sys/tests/abi.rs +++ b/gstreamer-editing-services/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-gl/egl/src/auto/versions.txt b/gstreamer-gl/egl/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-gl/egl/src/auto/versions.txt +++ b/gstreamer-gl/egl/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-gl/egl/sys/build.rs b/gstreamer-gl/egl/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-gl/egl/sys/build.rs +++ b/gstreamer-gl/egl/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-gl/egl/sys/src/auto/versions.txt b/gstreamer-gl/egl/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-gl/egl/sys/src/auto/versions.txt +++ b/gstreamer-gl/egl/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-gl/egl/sys/src/lib.rs b/gstreamer-gl/egl/sys/src/lib.rs index ee4179900..a1a628d85 100644 --- a/gstreamer-gl/egl/sys/src/lib.rs +++ b/gstreamer-gl/egl/sys/src/lib.rs @@ -35,7 +35,7 @@ pub struct GstGLDisplayEGLClass { impl ::std::fmt::Debug for GstGLDisplayEGLClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLDisplayEGLClass @ {:p}", self)) + f.debug_struct(&format!("GstGLDisplayEGLClass @ {self:p}")) .field("object_class", &self.object_class) .field("_padding", &self._padding) .finish() @@ -54,7 +54,7 @@ pub struct GstGLDisplayEGL { impl ::std::fmt::Debug for GstGLDisplayEGL { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLDisplayEGL @ {:p}", self)) + f.debug_struct(&format!("GstGLDisplayEGL @ {self:p}")) .field("parent", &self.parent) .finish() } diff --git a/gstreamer-gl/egl/sys/tests/abi.rs b/gstreamer-gl/egl/sys/tests/abi.rs index 8aacecc16..5397787cf 100644 --- a/gstreamer-gl/egl/sys/tests/abi.rs +++ b/gstreamer-gl/egl/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-gl/src/auto/flags.rs b/gstreamer-gl/src/auto/flags.rs index 2938aca1e..28af23f2e 100644 --- a/gstreamer-gl/src/auto/flags.rs +++ b/gstreamer-gl/src/auto/flags.rs @@ -15,13 +15,13 @@ bitflags! { #[doc(alias = "GstGLAPI")] pub struct GLAPI: u32 { #[doc(alias = "GST_GL_API_OPENGL")] - const OPENGL = ffi::GST_GL_API_OPENGL as u32; + const OPENGL = ffi::GST_GL_API_OPENGL as _; #[doc(alias = "GST_GL_API_OPENGL3")] - const OPENGL3 = ffi::GST_GL_API_OPENGL3 as u32; + const OPENGL3 = ffi::GST_GL_API_OPENGL3 as _; #[doc(alias = "GST_GL_API_GLES1")] - const GLES1 = ffi::GST_GL_API_GLES1 as u32; + const GLES1 = ffi::GST_GL_API_GLES1 as _; #[doc(alias = "GST_GL_API_GLES2")] - const GLES2 = ffi::GST_GL_API_GLES2 as u32; + const GLES2 = ffi::GST_GL_API_GLES2 as _; } } @@ -103,13 +103,13 @@ bitflags! { #[doc(alias = "GstGLConfigSurfaceType")] pub struct GLConfigSurfaceType: u32 { #[doc(alias = "GST_GL_CONFIG_SURFACE_TYPE_NONE")] - const NONE = ffi::GST_GL_CONFIG_SURFACE_TYPE_NONE as u32; + const NONE = ffi::GST_GL_CONFIG_SURFACE_TYPE_NONE as _; #[doc(alias = "GST_GL_CONFIG_SURFACE_TYPE_WINDOW")] - const WINDOW = ffi::GST_GL_CONFIG_SURFACE_TYPE_WINDOW as u32; + const WINDOW = ffi::GST_GL_CONFIG_SURFACE_TYPE_WINDOW as _; #[doc(alias = "GST_GL_CONFIG_SURFACE_TYPE_PBUFFER")] - const PBUFFER = ffi::GST_GL_CONFIG_SURFACE_TYPE_PBUFFER as u32; + const PBUFFER = ffi::GST_GL_CONFIG_SURFACE_TYPE_PBUFFER as _; #[doc(alias = "GST_GL_CONFIG_SURFACE_TYPE_PIXMAP")] - const PIXMAP = ffi::GST_GL_CONFIG_SURFACE_TYPE_PIXMAP as u32; + const PIXMAP = ffi::GST_GL_CONFIG_SURFACE_TYPE_PIXMAP as _; } } @@ -190,37 +190,37 @@ bitflags! { #[doc(alias = "GstGLDisplayType")] pub struct GLDisplayType: u32 { #[doc(alias = "GST_GL_DISPLAY_TYPE_X11")] - const X11 = ffi::GST_GL_DISPLAY_TYPE_X11 as u32; + const X11 = ffi::GST_GL_DISPLAY_TYPE_X11 as _; #[doc(alias = "GST_GL_DISPLAY_TYPE_WAYLAND")] - const WAYLAND = ffi::GST_GL_DISPLAY_TYPE_WAYLAND as u32; + const WAYLAND = ffi::GST_GL_DISPLAY_TYPE_WAYLAND as _; #[doc(alias = "GST_GL_DISPLAY_TYPE_COCOA")] - const COCOA = ffi::GST_GL_DISPLAY_TYPE_COCOA as u32; + const COCOA = ffi::GST_GL_DISPLAY_TYPE_COCOA as _; #[doc(alias = "GST_GL_DISPLAY_TYPE_WIN32")] - const WIN32 = ffi::GST_GL_DISPLAY_TYPE_WIN32 as u32; + const WIN32 = ffi::GST_GL_DISPLAY_TYPE_WIN32 as _; #[doc(alias = "GST_GL_DISPLAY_TYPE_DISPMANX")] - const DISPMANX = ffi::GST_GL_DISPLAY_TYPE_DISPMANX as u32; + const DISPMANX = ffi::GST_GL_DISPLAY_TYPE_DISPMANX as _; #[doc(alias = "GST_GL_DISPLAY_TYPE_EGL")] - const EGL = ffi::GST_GL_DISPLAY_TYPE_EGL as u32; + const EGL = ffi::GST_GL_DISPLAY_TYPE_EGL as _; #[doc(alias = "GST_GL_DISPLAY_TYPE_VIV_FB")] - const VIV_FB = ffi::GST_GL_DISPLAY_TYPE_VIV_FB as u32; + const VIV_FB = ffi::GST_GL_DISPLAY_TYPE_VIV_FB as _; #[doc(alias = "GST_GL_DISPLAY_TYPE_GBM")] - const GBM = ffi::GST_GL_DISPLAY_TYPE_GBM as u32; + const GBM = ffi::GST_GL_DISPLAY_TYPE_GBM as _; #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] #[doc(alias = "GST_GL_DISPLAY_TYPE_EGL_DEVICE")] - const EGL_DEVICE = ffi::GST_GL_DISPLAY_TYPE_EGL_DEVICE as u32; + const EGL_DEVICE = ffi::GST_GL_DISPLAY_TYPE_EGL_DEVICE as _; #[cfg(any(feature = "v1_20", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_20")))] #[doc(alias = "GST_GL_DISPLAY_TYPE_EAGL")] - const EAGL = ffi::GST_GL_DISPLAY_TYPE_EAGL as u32; + const EAGL = ffi::GST_GL_DISPLAY_TYPE_EAGL as _; #[cfg(any(feature = "v1_20", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_20")))] #[doc(alias = "GST_GL_DISPLAY_TYPE_WINRT")] - const WINRT = ffi::GST_GL_DISPLAY_TYPE_WINRT as u32; + const WINRT = ffi::GST_GL_DISPLAY_TYPE_WINRT as _; #[cfg(any(feature = "v1_20", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_20")))] #[doc(alias = "GST_GL_DISPLAY_TYPE_ANDROID")] - const ANDROID = ffi::GST_GL_DISPLAY_TYPE_ANDROID as u32; + const ANDROID = ffi::GST_GL_DISPLAY_TYPE_ANDROID as _; } } @@ -278,15 +278,15 @@ bitflags! { #[doc(alias = "GstGLPlatform")] pub struct GLPlatform: u32 { #[doc(alias = "GST_GL_PLATFORM_EGL")] - const EGL = ffi::GST_GL_PLATFORM_EGL as u32; + const EGL = ffi::GST_GL_PLATFORM_EGL as _; #[doc(alias = "GST_GL_PLATFORM_GLX")] - const GLX = ffi::GST_GL_PLATFORM_GLX as u32; + const GLX = ffi::GST_GL_PLATFORM_GLX as _; #[doc(alias = "GST_GL_PLATFORM_WGL")] - const WGL = ffi::GST_GL_PLATFORM_WGL as u32; + const WGL = ffi::GST_GL_PLATFORM_WGL as _; #[doc(alias = "GST_GL_PLATFORM_CGL")] - const CGL = ffi::GST_GL_PLATFORM_CGL as u32; + const CGL = ffi::GST_GL_PLATFORM_CGL as _; #[doc(alias = "GST_GL_PLATFORM_EAGL")] - const EAGL = ffi::GST_GL_PLATFORM_EAGL as u32; + const EAGL = ffi::GST_GL_PLATFORM_EAGL as _; } } @@ -370,11 +370,11 @@ bitflags! { #[doc(alias = "GstGLSLProfile")] pub struct GLSLProfile: u32 { #[doc(alias = "GST_GLSL_PROFILE_ES")] - const ES = ffi::GST_GLSL_PROFILE_ES as u32; + const ES = ffi::GST_GLSL_PROFILE_ES as _; #[doc(alias = "GST_GLSL_PROFILE_CORE")] - const CORE = ffi::GST_GLSL_PROFILE_CORE as u32; + const CORE = ffi::GST_GLSL_PROFILE_CORE as _; #[doc(alias = "GST_GLSL_PROFILE_COMPATIBILITY")] - const COMPATIBILITY = ffi::GST_GLSL_PROFILE_COMPATIBILITY as u32; + const COMPATIBILITY = ffi::GST_GLSL_PROFILE_COMPATIBILITY as _; } } diff --git a/gstreamer-gl/src/auto/gl_memory_allocator.rs b/gstreamer-gl/src/auto/gl_memory_allocator.rs index e61c5bffd..b7da91ec1 100644 --- a/gstreamer-gl/src/auto/gl_memory_allocator.rs +++ b/gstreamer-gl/src/auto/gl_memory_allocator.rs @@ -22,6 +22,7 @@ impl GLMemoryAllocator { #[doc(alias = "gst_gl_memory_allocator_get_default")] #[doc(alias = "get_default")] + #[allow(clippy::should_implement_trait)] pub fn default(context: &impl IsA) -> GLMemoryAllocator { skip_assert_initialized!(); unsafe { diff --git a/gstreamer-gl/src/auto/gl_shader.rs b/gstreamer-gl/src/auto/gl_shader.rs index 81f1a53a6..8ce9bfbaf 100644 --- a/gstreamer-gl/src/auto/gl_shader.rs +++ b/gstreamer-gl/src/auto/gl_shader.rs @@ -191,7 +191,7 @@ impl GLShader { #[doc(alias = "gst_gl_shader_set_uniform_1fv")] pub fn set_uniform_1fv(&self, name: &str, value: &[f32]) { - let count = value.len() as u32; + let count = value.len() as _; unsafe { ffi::gst_gl_shader_set_uniform_1fv( self.to_glib_none().0, @@ -211,7 +211,7 @@ impl GLShader { #[doc(alias = "gst_gl_shader_set_uniform_1iv")] pub fn set_uniform_1iv(&self, name: &str, value: &[i32]) { - let count = value.len() as u32; + let count = value.len() as _; unsafe { ffi::gst_gl_shader_set_uniform_1iv( self.to_glib_none().0, @@ -231,7 +231,7 @@ impl GLShader { #[doc(alias = "gst_gl_shader_set_uniform_2fv")] pub fn set_uniform_2fv(&self, name: &str, value: &[f32]) { - let count = value.len() as u32; + let count = value.len() as _; unsafe { ffi::gst_gl_shader_set_uniform_2fv( self.to_glib_none().0, @@ -251,7 +251,7 @@ impl GLShader { #[doc(alias = "gst_gl_shader_set_uniform_2iv")] pub fn set_uniform_2iv(&self, name: &str, value: &[i32]) { - let count = value.len() as u32; + let count = value.len() as _; unsafe { ffi::gst_gl_shader_set_uniform_2iv( self.to_glib_none().0, @@ -277,7 +277,7 @@ impl GLShader { #[doc(alias = "gst_gl_shader_set_uniform_3fv")] pub fn set_uniform_3fv(&self, name: &str, value: &[f32]) { - let count = value.len() as u32; + let count = value.len() as _; unsafe { ffi::gst_gl_shader_set_uniform_3fv( self.to_glib_none().0, @@ -303,7 +303,7 @@ impl GLShader { #[doc(alias = "gst_gl_shader_set_uniform_3iv")] pub fn set_uniform_3iv(&self, name: &str, value: &[i32]) { - let count = value.len() as u32; + let count = value.len() as _; unsafe { ffi::gst_gl_shader_set_uniform_3iv( self.to_glib_none().0, @@ -330,7 +330,7 @@ impl GLShader { #[doc(alias = "gst_gl_shader_set_uniform_4fv")] pub fn set_uniform_4fv(&self, name: &str, value: &[f32]) { - let count = value.len() as u32; + let count = value.len() as _; unsafe { ffi::gst_gl_shader_set_uniform_4fv( self.to_glib_none().0, @@ -357,7 +357,7 @@ impl GLShader { #[doc(alias = "gst_gl_shader_set_uniform_4iv")] pub fn set_uniform_4iv(&self, name: &str, value: &[i32]) { - let count = value.len() as u32; + let count = value.len() as _; unsafe { ffi::gst_gl_shader_set_uniform_4iv( self.to_glib_none().0, diff --git a/gstreamer-gl/src/auto/glsl_stage.rs b/gstreamer-gl/src/auto/glsl_stage.rs index af3b94c84..9b63ba789 100644 --- a/gstreamer-gl/src/auto/glsl_stage.rs +++ b/gstreamer-gl/src/auto/glsl_stage.rs @@ -82,7 +82,7 @@ impl GLSLStage { str: &[&str], ) -> GLSLStage { skip_assert_initialized!(); - let n_strings = str.len() as i32; + let n_strings = str.len() as _; unsafe { from_glib_none(ffi::gst_glsl_stage_new_with_strings( context.as_ref().to_glib_none().0, @@ -140,7 +140,7 @@ impl GLSLStage { profile: GLSLProfile, str: &[&str], ) -> Result<(), glib::error::BoolError> { - let n_strings = str.len() as i32; + let n_strings = str.len() as _; unsafe { glib::result_from_gboolean!( ffi::gst_glsl_stage_set_strings( diff --git a/gstreamer-gl/src/auto/versions.txt b/gstreamer-gl/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-gl/src/auto/versions.txt +++ b/gstreamer-gl/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-gl/sys/build.rs b/gstreamer-gl/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-gl/sys/build.rs +++ b/gstreamer-gl/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-gl/sys/src/auto/versions.txt b/gstreamer-gl/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-gl/sys/src/auto/versions.txt +++ b/gstreamer-gl/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-gl/sys/src/lib.rs b/gstreamer-gl/sys/src/lib.rs index 3e93c8f9b..ec002ea21 100644 --- a/gstreamer-gl/sys/src/lib.rs +++ b/gstreamer-gl/sys/src/lib.rs @@ -282,7 +282,7 @@ pub struct GstGLAllocationParams { impl ::std::fmt::Debug for GstGLAllocationParams { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLAllocationParams @ {:p}", self)) + f.debug_struct(&format!("GstGLAllocationParams @ {self:p}")) .field("struct_size", &self.struct_size) .field("copy", &self.copy) .field("free", &self.free) @@ -317,7 +317,7 @@ pub struct GstGLAsyncDebug { impl ::std::fmt::Debug for GstGLAsyncDebug { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLAsyncDebug @ {:p}", self)) + f.debug_struct(&format!("GstGLAsyncDebug @ {self:p}")) .finish() } } @@ -341,7 +341,7 @@ pub struct GstGLBaseFilterClass { impl ::std::fmt::Debug for GstGLBaseFilterClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLBaseFilterClass @ {:p}", self)) + f.debug_struct(&format!("GstGLBaseFilterClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("supported_gl_api", &self.supported_gl_api) .field("gl_start", &self.gl_start) @@ -379,7 +379,7 @@ pub struct GstGLBaseMemory { impl ::std::fmt::Debug for GstGLBaseMemory { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLBaseMemory @ {:p}", self)) + f.debug_struct(&format!("GstGLBaseMemory @ {self:p}")) .field("mem", &self.mem) .field("context", &self.context) .field("lock", &self.lock) @@ -407,7 +407,7 @@ pub struct GstGLBaseMemoryAllocatorClass { impl ::std::fmt::Debug for GstGLBaseMemoryAllocatorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLBaseMemoryAllocatorClass @ {:p}", self)) + f.debug_struct(&format!("GstGLBaseMemoryAllocatorClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("alloc", &self.alloc) .field("create", &self.create) @@ -433,7 +433,7 @@ pub struct GstGLBaseSrcClass { impl ::std::fmt::Debug for GstGLBaseSrcClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLBaseSrcClass @ {:p}", self)) + f.debug_struct(&format!("GstGLBaseSrcClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("supported_gl_api", &self.supported_gl_api) .field("gl_start", &self.gl_start) @@ -462,7 +462,7 @@ pub struct GstGLBuffer { impl ::std::fmt::Debug for GstGLBuffer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLBuffer @ {:p}", self)) + f.debug_struct(&format!("GstGLBuffer @ {self:p}")) .field("mem", &self.mem) .field("id", &self.id) .field("target", &self.target) @@ -482,7 +482,7 @@ pub struct GstGLBufferAllocationParams { impl ::std::fmt::Debug for GstGLBufferAllocationParams { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLBufferAllocationParams @ {:p}", self)) + f.debug_struct(&format!("GstGLBufferAllocationParams @ {self:p}")) .field("parent", &self.parent) .field("gl_target", &self.gl_target) .field("gl_usage", &self.gl_usage) @@ -499,7 +499,7 @@ pub struct GstGLBufferAllocatorClass { impl ::std::fmt::Debug for GstGLBufferAllocatorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLBufferAllocatorClass @ {:p}", self)) + f.debug_struct(&format!("GstGLBufferAllocatorClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -514,7 +514,7 @@ pub struct GstGLBufferPoolClass { impl ::std::fmt::Debug for GstGLBufferPoolClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLBufferPoolClass @ {:p}", self)) + f.debug_struct(&format!("GstGLBufferPoolClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -537,7 +537,7 @@ pub struct GstGLColorConvertClass { impl ::std::fmt::Debug for GstGLColorConvertClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLColorConvertClass @ {:p}", self)) + f.debug_struct(&format!("GstGLColorConvertClass @ {self:p}")) .finish() } } @@ -583,7 +583,7 @@ pub struct GstGLContextClass { impl ::std::fmt::Debug for GstGLContextClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLContextClass @ {:p}", self)) + f.debug_struct(&format!("GstGLContextClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("get_current_context", &self.get_current_context) .field("get_gl_context", &self.get_gl_context) @@ -622,7 +622,7 @@ pub struct GstGLDisplayClass { impl ::std::fmt::Debug for GstGLDisplayClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLDisplayClass @ {:p}", self)) + f.debug_struct(&format!("GstGLDisplayClass @ {self:p}")) .field("object_class", &self.object_class) .field("get_handle", &self.get_handle) .field("create_window", &self.create_window) @@ -669,7 +669,7 @@ pub struct GstGLFilterClass { impl ::std::fmt::Debug for GstGLFilterClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLFilterClass @ {:p}", self)) + f.debug_struct(&format!("GstGLFilterClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("set_caps", &self.set_caps) .field("filter", &self.filter) @@ -689,7 +689,7 @@ pub struct GstGLFramebufferClass { impl ::std::fmt::Debug for GstGLFramebufferClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLFramebufferClass @ {:p}", self)) + f.debug_struct(&format!("GstGLFramebufferClass @ {self:p}")) .finish() } } @@ -729,7 +729,7 @@ pub struct GstGLMemory { impl ::std::fmt::Debug for GstGLMemory { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLMemory @ {:p}", self)) + f.debug_struct(&format!("GstGLMemory @ {self:p}")) .field("mem", &self.mem) .field("tex_id", &self.tex_id) .field("tex_target", &self.tex_target) @@ -757,7 +757,7 @@ pub struct GstGLMemoryAllocatorClass { impl ::std::fmt::Debug for GstGLMemoryAllocatorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLMemoryAllocatorClass @ {:p}", self)) + f.debug_struct(&format!("GstGLMemoryAllocatorClass @ {self:p}")) .field("map", &self.map) .field("copy", &self.copy) .field("unmap", &self.unmap) @@ -775,7 +775,7 @@ pub struct GstGLMemoryPBO { impl ::std::fmt::Debug for GstGLMemoryPBO { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLMemoryPBO @ {:p}", self)) + f.debug_struct(&format!("GstGLMemoryPBO @ {self:p}")) .finish() } } @@ -789,7 +789,7 @@ pub struct GstGLMemoryPBOAllocatorClass { impl ::std::fmt::Debug for GstGLMemoryPBOAllocatorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLMemoryPBOAllocatorClass @ {:p}", self)) + f.debug_struct(&format!("GstGLMemoryPBOAllocatorClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -804,7 +804,7 @@ pub struct GstGLOverlayCompositorClass { impl ::std::fmt::Debug for GstGLOverlayCompositorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLOverlayCompositorClass @ {:p}", self)) + f.debug_struct(&format!("GstGLOverlayCompositorClass @ {self:p}")) .field("object_class", &self.object_class) .finish() } @@ -824,7 +824,7 @@ pub struct GstGLQuery { impl ::std::fmt::Debug for GstGLQuery { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLQuery @ {:p}", self)).finish() + f.debug_struct(&format!("GstGLQuery @ {self:p}")).finish() } } @@ -842,7 +842,7 @@ pub struct GstGLRenderbuffer { impl ::std::fmt::Debug for GstGLRenderbuffer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLRenderbuffer @ {:p}", self)) + f.debug_struct(&format!("GstGLRenderbuffer @ {self:p}")) .field("renderbuffer_id", &self.renderbuffer_id) .field("renderbuffer_format", &self.renderbuffer_format) .field("width", &self.width) @@ -864,7 +864,7 @@ pub struct GstGLRenderbufferAllocationParams { impl ::std::fmt::Debug for GstGLRenderbufferAllocationParams { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLRenderbufferAllocationParams @ {:p}", self)) + f.debug_struct(&format!("GstGLRenderbufferAllocationParams @ {self:p}")) .field("renderbuffer_format", &self.renderbuffer_format) .field("width", &self.width) .field("height", &self.height) @@ -881,7 +881,7 @@ pub struct GstGLRenderbufferAllocatorClass { impl ::std::fmt::Debug for GstGLRenderbufferAllocatorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLRenderbufferAllocatorClass @ {:p}", self)) + f.debug_struct(&format!("GstGLRenderbufferAllocatorClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -896,7 +896,7 @@ pub struct GstGLSLStageClass { impl ::std::fmt::Debug for GstGLSLStageClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLSLStageClass @ {:p}", self)) + f.debug_struct(&format!("GstGLSLStageClass @ {self:p}")) .finish() } } @@ -917,7 +917,7 @@ pub struct GstGLShaderClass { impl ::std::fmt::Debug for GstGLShaderClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLShaderClass @ {:p}", self)) + f.debug_struct(&format!("GstGLShaderClass @ {self:p}")) .finish() } } @@ -956,7 +956,7 @@ pub struct GstGLSyncMeta { impl ::std::fmt::Debug for GstGLSyncMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLSyncMeta @ {:p}", self)) + f.debug_struct(&format!("GstGLSyncMeta @ {self:p}")) .field("parent", &self.parent) .field("context", &self.context) .field("data", &self.data) @@ -982,7 +982,7 @@ pub struct GstGLUploadClass { impl ::std::fmt::Debug for GstGLUploadClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLUploadClass @ {:p}", self)) + f.debug_struct(&format!("GstGLUploadClass @ {self:p}")) .field("object_class", &self.object_class) .finish() } @@ -1010,7 +1010,7 @@ pub struct GstGLVideoAllocationParams { impl ::std::fmt::Debug for GstGLVideoAllocationParams { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLVideoAllocationParams @ {:p}", self)) + f.debug_struct(&format!("GstGLVideoAllocationParams @ {self:p}")) .field("parent", &self.parent) .field("v_info", &self.v_info) .field("plane", &self.plane) @@ -1030,7 +1030,7 @@ pub struct GstGLViewConvertClass { impl ::std::fmt::Debug for GstGLViewConvertClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLViewConvertClass @ {:p}", self)) + f.debug_struct(&format!("GstGLViewConvertClass @ {self:p}")) .finish() } } @@ -1072,7 +1072,7 @@ pub struct GstGLWindowClass { impl ::std::fmt::Debug for GstGLWindowClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLWindowClass @ {:p}", self)) + f.debug_struct(&format!("GstGLWindowClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("get_display", &self.get_display) .field("set_window_handle", &self.set_window_handle) @@ -1118,7 +1118,7 @@ pub struct GstGLBaseFilter { impl ::std::fmt::Debug for GstGLBaseFilter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLBaseFilter @ {:p}", self)) + f.debug_struct(&format!("GstGLBaseFilter @ {self:p}")) .field("parent", &self.parent) .field("display", &self.display) .field("context", &self.context) @@ -1138,7 +1138,7 @@ pub struct GstGLBaseMemoryAllocator { impl ::std::fmt::Debug for GstGLBaseMemoryAllocator { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLBaseMemoryAllocator @ {:p}", self)) + f.debug_struct(&format!("GstGLBaseMemoryAllocator @ {self:p}")) .finish() } } @@ -1158,7 +1158,7 @@ pub struct GstGLBaseSrc { impl ::std::fmt::Debug for GstGLBaseSrc { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLBaseSrc @ {:p}", self)) + f.debug_struct(&format!("GstGLBaseSrc @ {self:p}")) .field("parent", &self.parent) .field("display", &self.display) .field("context", &self.context) @@ -1178,7 +1178,7 @@ pub struct GstGLBufferAllocator { impl ::std::fmt::Debug for GstGLBufferAllocator { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLBufferAllocator @ {:p}", self)) + f.debug_struct(&format!("GstGLBufferAllocator @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1195,7 +1195,7 @@ pub struct GstGLBufferPool { impl ::std::fmt::Debug for GstGLBufferPool { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLBufferPool @ {:p}", self)) + f.debug_struct(&format!("GstGLBufferPool @ {self:p}")) .field("bufferpool", &self.bufferpool) .field("context", &self.context) .finish() @@ -1221,7 +1221,7 @@ pub struct GstGLColorConvert { impl ::std::fmt::Debug for GstGLColorConvert { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLColorConvert @ {:p}", self)) + f.debug_struct(&format!("GstGLColorConvert @ {self:p}")) .finish() } } @@ -1239,7 +1239,7 @@ pub struct GstGLContext { impl ::std::fmt::Debug for GstGLContext { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLContext @ {:p}", self)) + f.debug_struct(&format!("GstGLContext @ {self:p}")) .field("gl_vtable", &self.gl_vtable) .finish() } @@ -1259,8 +1259,7 @@ pub struct GstGLDisplay { impl ::std::fmt::Debug for GstGLDisplay { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLDisplay @ {:p}", self)) - .finish() + f.debug_struct(&format!("GstGLDisplay @ {self:p}")).finish() } } @@ -1289,7 +1288,7 @@ pub struct GstGLFilter { impl ::std::fmt::Debug for GstGLFilter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLFilter @ {:p}", self)) + f.debug_struct(&format!("GstGLFilter @ {self:p}")) .field("parent", &self.parent) .field("in_info", &self.in_info) .field("out_info", &self.out_info) @@ -1314,7 +1313,7 @@ pub struct GstGLFramebuffer { impl ::std::fmt::Debug for GstGLFramebuffer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLFramebuffer @ {:p}", self)) + f.debug_struct(&format!("GstGLFramebuffer @ {self:p}")) .finish() } } @@ -1328,7 +1327,7 @@ pub struct GstGLMemoryAllocator { impl ::std::fmt::Debug for GstGLMemoryAllocator { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLMemoryAllocator @ {:p}", self)) + f.debug_struct(&format!("GstGLMemoryAllocator @ {self:p}")) .finish() } } @@ -1342,7 +1341,7 @@ pub struct GstGLMemoryPBOAllocator { impl ::std::fmt::Debug for GstGLMemoryPBOAllocator { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLMemoryPBOAllocator @ {:p}", self)) + f.debug_struct(&format!("GstGLMemoryPBOAllocator @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1364,7 +1363,7 @@ pub struct GstGLOverlayCompositor { impl ::std::fmt::Debug for GstGLOverlayCompositor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLOverlayCompositor @ {:p}", self)) + f.debug_struct(&format!("GstGLOverlayCompositor @ {self:p}")) .finish() } } @@ -1378,7 +1377,7 @@ pub struct GstGLRenderbufferAllocator { impl ::std::fmt::Debug for GstGLRenderbufferAllocator { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLRenderbufferAllocator @ {:p}", self)) + f.debug_struct(&format!("GstGLRenderbufferAllocator @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1395,8 +1394,7 @@ pub struct GstGLSLStage { impl ::std::fmt::Debug for GstGLSLStage { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLSLStage @ {:p}", self)) - .finish() + f.debug_struct(&format!("GstGLSLStage @ {self:p}")).finish() } } @@ -1411,7 +1409,7 @@ pub struct GstGLShader { impl ::std::fmt::Debug for GstGLShader { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLShader @ {:p}", self)) + f.debug_struct(&format!("GstGLShader @ {self:p}")) .field("parent", &self.parent) .field("context", &self.context) .finish() @@ -1429,7 +1427,7 @@ pub struct GstGLUpload { impl ::std::fmt::Debug for GstGLUpload { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLUpload @ {:p}", self)) + f.debug_struct(&format!("GstGLUpload @ {self:p}")) .field("parent", &self.parent) .field("context", &self.context) .finish() @@ -1461,7 +1459,7 @@ pub struct GstGLViewConvert { impl ::std::fmt::Debug for GstGLViewConvert { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLViewConvert @ {:p}", self)) + f.debug_struct(&format!("GstGLViewConvert @ {self:p}")) .field("object", &self.object) .field("context", &self.context) .field("shader", &self.shader) @@ -1507,8 +1505,7 @@ pub struct GstGLWindow { impl ::std::fmt::Debug for GstGLWindow { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLWindow @ {:p}", self)) - .finish() + f.debug_struct(&format!("GstGLWindow @ {self:p}")).finish() } } diff --git a/gstreamer-gl/sys/tests/abi.rs b/gstreamer-gl/sys/tests/abi.rs index faf20292d..f1deb415a 100644 --- a/gstreamer-gl/sys/tests/abi.rs +++ b/gstreamer-gl/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-gl/wayland/src/auto/versions.txt b/gstreamer-gl/wayland/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-gl/wayland/src/auto/versions.txt +++ b/gstreamer-gl/wayland/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-gl/wayland/sys/build.rs b/gstreamer-gl/wayland/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-gl/wayland/sys/build.rs +++ b/gstreamer-gl/wayland/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-gl/wayland/sys/src/auto/versions.txt b/gstreamer-gl/wayland/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-gl/wayland/sys/src/auto/versions.txt +++ b/gstreamer-gl/wayland/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-gl/wayland/sys/src/lib.rs b/gstreamer-gl/wayland/sys/src/lib.rs index d65e534c7..873e38fc6 100644 --- a/gstreamer-gl/wayland/sys/src/lib.rs +++ b/gstreamer-gl/wayland/sys/src/lib.rs @@ -31,7 +31,7 @@ pub struct GstGLDisplayWaylandClass { impl ::std::fmt::Debug for GstGLDisplayWaylandClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLDisplayWaylandClass @ {:p}", self)) + f.debug_struct(&format!("GstGLDisplayWaylandClass @ {self:p}")) .field("object_class", &self.object_class) .field("_padding", &self._padding) .finish() @@ -54,7 +54,7 @@ pub struct GstGLDisplayWayland { impl ::std::fmt::Debug for GstGLDisplayWayland { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLDisplayWayland @ {:p}", self)) + f.debug_struct(&format!("GstGLDisplayWayland @ {self:p}")) .field("parent", &self.parent) .field("display", &self.display) .field("registry", &self.registry) diff --git a/gstreamer-gl/wayland/sys/tests/abi.rs b/gstreamer-gl/wayland/sys/tests/abi.rs index 23699f625..e207326ab 100644 --- a/gstreamer-gl/wayland/sys/tests/abi.rs +++ b/gstreamer-gl/wayland/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-gl/x11/src/auto/versions.txt b/gstreamer-gl/x11/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-gl/x11/src/auto/versions.txt +++ b/gstreamer-gl/x11/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-gl/x11/sys/build.rs b/gstreamer-gl/x11/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-gl/x11/sys/build.rs +++ b/gstreamer-gl/x11/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-gl/x11/sys/src/auto/versions.txt b/gstreamer-gl/x11/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-gl/x11/sys/src/auto/versions.txt +++ b/gstreamer-gl/x11/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-gl/x11/sys/src/lib.rs b/gstreamer-gl/x11/sys/src/lib.rs index 749f8d784..8f9962b6a 100644 --- a/gstreamer-gl/x11/sys/src/lib.rs +++ b/gstreamer-gl/x11/sys/src/lib.rs @@ -31,7 +31,7 @@ pub struct GstGLDisplayX11Class { impl ::std::fmt::Debug for GstGLDisplayX11Class { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLDisplayX11Class @ {:p}", self)) + f.debug_struct(&format!("GstGLDisplayX11Class @ {self:p}")) .field("object_class", &self.object_class) .field("_padding", &self._padding) .finish() @@ -52,7 +52,7 @@ pub struct GstGLDisplayX11 { impl ::std::fmt::Debug for GstGLDisplayX11 { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGLDisplayX11 @ {:p}", self)) + f.debug_struct(&format!("GstGLDisplayX11 @ {self:p}")) .finish() } } diff --git a/gstreamer-gl/x11/sys/tests/abi.rs b/gstreamer-gl/x11/sys/tests/abi.rs index 12f4c940c..43eadd240 100644 --- a/gstreamer-gl/x11/sys/tests/abi.rs +++ b/gstreamer-gl/x11/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-mpegts/src/auto/versions.txt b/gstreamer-mpegts/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-mpegts/src/auto/versions.txt +++ b/gstreamer-mpegts/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-mpegts/sys/build.rs b/gstreamer-mpegts/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-mpegts/sys/build.rs +++ b/gstreamer-mpegts/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-mpegts/sys/src/auto/versions.txt b/gstreamer-mpegts/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-mpegts/sys/src/auto/versions.txt +++ b/gstreamer-mpegts/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-mpegts/sys/src/lib.rs b/gstreamer-mpegts/sys/src/lib.rs index 86dc481f3..9f62ed1ae 100644 --- a/gstreamer-mpegts/sys/src/lib.rs +++ b/gstreamer-mpegts/sys/src/lib.rs @@ -693,7 +693,7 @@ pub struct GstMpegtsAtscEIT { impl ::std::fmt::Debug for GstMpegtsAtscEIT { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsAtscEIT @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsAtscEIT @ {self:p}")) .field("source_id", &self.source_id) .field("protocol_version", &self.protocol_version) .field("events", &self.events) @@ -714,7 +714,7 @@ pub struct GstMpegtsAtscEITEvent { impl ::std::fmt::Debug for GstMpegtsAtscEITEvent { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsAtscEITEvent @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsAtscEITEvent @ {self:p}")) .field("event_id", &self.event_id) .field("start_time", &self.start_time) .field("etm_location", &self.etm_location) @@ -736,7 +736,7 @@ pub struct GstMpegtsAtscETT { impl ::std::fmt::Debug for GstMpegtsAtscETT { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsAtscETT @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsAtscETT @ {self:p}")) .field("ett_table_id_extension", &self.ett_table_id_extension) .field("protocol_version", &self.protocol_version) .field("etm_id", &self.etm_id) @@ -756,7 +756,7 @@ pub struct GstMpegtsAtscMGT { impl ::std::fmt::Debug for GstMpegtsAtscMGT { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsAtscMGT @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsAtscMGT @ {self:p}")) .field("protocol_version", &self.protocol_version) .field("tables_defined", &self.tables_defined) .field("tables", &self.tables) @@ -777,7 +777,7 @@ pub struct GstMpegtsAtscMGTTable { impl ::std::fmt::Debug for GstMpegtsAtscMGTTable { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsAtscMGTTable @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsAtscMGTTable @ {self:p}")) .field("table_type", &self.table_type) .field("pid", &self.pid) .field("version_number", &self.version_number) @@ -796,7 +796,7 @@ pub struct GstMpegtsAtscMultString { impl ::std::fmt::Debug for GstMpegtsAtscMultString { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsAtscMultString @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsAtscMultString @ {self:p}")) .field("iso_639_langcode", &self.iso_639_langcode) .field("segments", &self.segments) .finish() @@ -815,7 +815,7 @@ pub struct GstMpegtsAtscRRT { impl ::std::fmt::Debug for GstMpegtsAtscRRT { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsAtscRRT @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsAtscRRT @ {self:p}")) .field("protocol_version", &self.protocol_version) .field("names", &self.names) .field("dimensions_defined", &self.dimensions_defined) @@ -836,7 +836,7 @@ pub struct GstMpegtsAtscRRTDimension { impl ::std::fmt::Debug for GstMpegtsAtscRRTDimension { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsAtscRRTDimension @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsAtscRRTDimension @ {self:p}")) .field("names", &self.names) .field("graduated_scale", &self.graduated_scale) .field("values_defined", &self.values_defined) @@ -854,7 +854,7 @@ pub struct GstMpegtsAtscRRTDimensionValue { impl ::std::fmt::Debug for GstMpegtsAtscRRTDimensionValue { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsAtscRRTDimensionValue @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsAtscRRTDimensionValue @ {self:p}")) .field("abbrev_ratings", &self.abbrev_ratings) .field("ratings", &self.ratings) .finish() @@ -876,7 +876,7 @@ pub struct GstMpegtsAtscSTT { impl ::std::fmt::Debug for GstMpegtsAtscSTT { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsAtscSTT @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsAtscSTT @ {self:p}")) .field("protocol_version", &self.protocol_version) .field("system_time", &self.system_time) .field("gps_utc_offset", &self.gps_utc_offset) @@ -901,7 +901,7 @@ pub struct GstMpegtsAtscStringSegment { impl ::std::fmt::Debug for GstMpegtsAtscStringSegment { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsAtscStringSegment @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsAtscStringSegment @ {self:p}")) .field("compression_type", &self.compression_type) .field("mode", &self.mode) .field("compressed_data_size", &self.compressed_data_size) @@ -922,7 +922,7 @@ pub struct GstMpegtsAtscVCT { impl ::std::fmt::Debug for GstMpegtsAtscVCT { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsAtscVCT @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsAtscVCT @ {self:p}")) .field("transport_stream_id", &self.transport_stream_id) .field("protocol_version", &self.protocol_version) .field("sources", &self.sources) @@ -954,7 +954,7 @@ pub struct GstMpegtsAtscVCTSource { impl ::std::fmt::Debug for GstMpegtsAtscVCTSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsAtscVCTSource @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsAtscVCTSource @ {self:p}")) .field("short_name", &self.short_name) .field("major_channel_number", &self.major_channel_number) .field("minor_channel_number", &self.minor_channel_number) @@ -994,26 +994,23 @@ pub struct GstMpegtsAudioPreselectionDescriptor { impl ::std::fmt::Debug for GstMpegtsAudioPreselectionDescriptor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!( - "GstMpegtsAudioPreselectionDescriptor @ {:p}", - self - )) - .field("preselection_id", &self.preselection_id) - .field( - "audio_rendering_indication", - &self.audio_rendering_indication, - ) - .field("audio_description", &self.audio_description) - .field("spoken_subtitles", &self.spoken_subtitles) - .field("dialogue_enhancement", &self.dialogue_enhancement) - .field("interactivity_enabled", &self.interactivity_enabled) - .field("language_code_present", &self.language_code_present) - .field("text_label_present", &self.text_label_present) - .field("multi_stream_info_present", &self.multi_stream_info_present) - .field("future_extension", &self.future_extension) - .field("language_code", &self.language_code) - .field("message_id", &self.message_id) - .finish() + f.debug_struct(&format!("GstMpegtsAudioPreselectionDescriptor @ {self:p}")) + .field("preselection_id", &self.preselection_id) + .field( + "audio_rendering_indication", + &self.audio_rendering_indication, + ) + .field("audio_description", &self.audio_description) + .field("spoken_subtitles", &self.spoken_subtitles) + .field("dialogue_enhancement", &self.dialogue_enhancement) + .field("interactivity_enabled", &self.interactivity_enabled) + .field("language_code_present", &self.language_code_present) + .field("text_label_present", &self.text_label_present) + .field("multi_stream_info_present", &self.multi_stream_info_present) + .field("future_extension", &self.future_extension) + .field("language_code", &self.language_code) + .field("message_id", &self.message_id) + .finish() } } @@ -1026,7 +1023,7 @@ pub struct GstMpegtsBAT { impl ::std::fmt::Debug for GstMpegtsBAT { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsBAT @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsBAT @ {self:p}")) .field("descriptors", &self.descriptors) .field("streams", &self.streams) .finish() @@ -1043,7 +1040,7 @@ pub struct GstMpegtsBATStream { impl ::std::fmt::Debug for GstMpegtsBATStream { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsBATStream @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsBATStream @ {self:p}")) .field("transport_stream_id", &self.transport_stream_id) .field("original_network_id", &self.original_network_id) .field("descriptors", &self.descriptors) @@ -1064,8 +1061,7 @@ pub struct GstMpegtsCableDeliverySystemDescriptor { impl ::std::fmt::Debug for GstMpegtsCableDeliverySystemDescriptor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { f.debug_struct(&format!( - "GstMpegtsCableDeliverySystemDescriptor @ {:p}", - self + "GstMpegtsCableDeliverySystemDescriptor @ {self:p}" )) .field("frequency", &self.frequency) .field("outer_fec", &self.outer_fec) @@ -1088,7 +1084,7 @@ pub struct GstMpegtsComponentDescriptor { impl ::std::fmt::Debug for GstMpegtsComponentDescriptor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsComponentDescriptor @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsComponentDescriptor @ {self:p}")) .field("stream_content", &self.stream_content) .field("component_type", &self.component_type) .field("component_tag", &self.component_tag) @@ -1108,7 +1104,7 @@ pub struct GstMpegtsContent { impl ::std::fmt::Debug for GstMpegtsContent { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsContent @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsContent @ {self:p}")) .field("content_nibble_1", &self.content_nibble_1) .field("content_nibble_2", &self.content_nibble_2) .field("user_byte", &self.user_byte) @@ -1130,7 +1126,7 @@ pub struct GstMpegtsDVBLinkageDescriptor { impl ::std::fmt::Debug for GstMpegtsDVBLinkageDescriptor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsDVBLinkageDescriptor @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsDVBLinkageDescriptor @ {self:p}")) .field("transport_stream_id", &self.transport_stream_id) .field("original_network_id", &self.original_network_id) .field("service_id", &self.service_id) @@ -1151,7 +1147,7 @@ pub struct GstMpegtsDVBLinkageEvent { impl ::std::fmt::Debug for GstMpegtsDVBLinkageEvent { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsDVBLinkageEvent @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsDVBLinkageEvent @ {self:p}")) .field("target_event_id", &self.target_event_id) .field("target_listed", &self.target_listed) .field("event_simulcast", &self.event_simulcast) @@ -1177,7 +1173,7 @@ pub struct GstMpegtsDVBLinkageExtendedEvent { impl ::std::fmt::Debug for GstMpegtsDVBLinkageExtendedEvent { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsDVBLinkageExtendedEvent @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsDVBLinkageExtendedEvent @ {self:p}")) .field("target_event_id", &self.target_event_id) .field("target_listed", &self.target_listed) .field("event_simulcast", &self.event_simulcast) @@ -1210,7 +1206,7 @@ pub struct GstMpegtsDVBLinkageMobileHandOver { impl ::std::fmt::Debug for GstMpegtsDVBLinkageMobileHandOver { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsDVBLinkageMobileHandOver @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsDVBLinkageMobileHandOver @ {self:p}")) .field("hand_over_type", &self.hand_over_type) .field("origin_type", &self.origin_type) .field("network_id", &self.network_id) @@ -1228,7 +1224,7 @@ pub struct GstMpegtsDVBParentalRatingItem { impl ::std::fmt::Debug for GstMpegtsDVBParentalRatingItem { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsDVBParentalRatingItem @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsDVBParentalRatingItem @ {self:p}")) .field("country_code", &self.country_code) .field("rating", &self.rating) .finish() @@ -1244,7 +1240,7 @@ pub struct GstMpegtsDVBServiceListItem { impl ::std::fmt::Debug for GstMpegtsDVBServiceListItem { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsDVBServiceListItem @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsDVBServiceListItem @ {self:p}")) .field("service_id", &self.service_id) .field("type_", &self.type_) .finish() @@ -1264,7 +1260,7 @@ pub struct GstMpegtsDataBroadcastDescriptor { impl ::std::fmt::Debug for GstMpegtsDataBroadcastDescriptor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsDataBroadcastDescriptor @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsDataBroadcastDescriptor @ {self:p}")) .field("data_broadcast_id", &self.data_broadcast_id) .field("component_tag", &self.component_tag) .field("length", &self.length) @@ -1287,7 +1283,7 @@ pub struct GstMpegtsDescriptor { impl ::std::fmt::Debug for GstMpegtsDescriptor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsDescriptor @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsDescriptor @ {self:p}")) .field("tag", &self.tag) .field("tag_extension", &self.tag_extension) .field("length", &self.length) @@ -1306,8 +1302,7 @@ pub struct GstMpegtsDvbMultilingualBouquetNameItem { impl ::std::fmt::Debug for GstMpegtsDvbMultilingualBouquetNameItem { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { f.debug_struct(&format!( - "GstMpegtsDvbMultilingualBouquetNameItem @ {:p}", - self + "GstMpegtsDvbMultilingualBouquetNameItem @ {self:p}" )) .field("language_code", &self.language_code) .field("bouquet_name", &self.bouquet_name) @@ -1324,13 +1319,10 @@ pub struct GstMpegtsDvbMultilingualComponentItem { impl ::std::fmt::Debug for GstMpegtsDvbMultilingualComponentItem { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!( - "GstMpegtsDvbMultilingualComponentItem @ {:p}", - self - )) - .field("language_code", &self.language_code) - .field("description", &self.description) - .finish() + f.debug_struct(&format!("GstMpegtsDvbMultilingualComponentItem @ {self:p}")) + .field("language_code", &self.language_code) + .field("description", &self.description) + .finish() } } @@ -1344,8 +1336,7 @@ pub struct GstMpegtsDvbMultilingualNetworkNameItem { impl ::std::fmt::Debug for GstMpegtsDvbMultilingualNetworkNameItem { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { f.debug_struct(&format!( - "GstMpegtsDvbMultilingualNetworkNameItem @ {:p}", - self + "GstMpegtsDvbMultilingualNetworkNameItem @ {self:p}" )) .field("language_code", &self.language_code) .field("network_name", &self.network_name) @@ -1364,8 +1355,7 @@ pub struct GstMpegtsDvbMultilingualServiceNameItem { impl ::std::fmt::Debug for GstMpegtsDvbMultilingualServiceNameItem { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { f.debug_struct(&format!( - "GstMpegtsDvbMultilingualServiceNameItem @ {:p}", - self + "GstMpegtsDvbMultilingualServiceNameItem @ {self:p}" )) .field("language_code", &self.language_code) .field("provider_name", &self.provider_name) @@ -1388,7 +1378,7 @@ pub struct GstMpegtsEIT { impl ::std::fmt::Debug for GstMpegtsEIT { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsEIT @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsEIT @ {self:p}")) .field("transport_stream_id", &self.transport_stream_id) .field("original_network_id", &self.original_network_id) .field( @@ -1416,7 +1406,7 @@ pub struct GstMpegtsEITEvent { impl ::std::fmt::Debug for GstMpegtsEITEvent { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsEITEvent @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsEITEvent @ {self:p}")) .field("event_id", &self.event_id) .field("start_time", &self.start_time) .field("duration", &self.duration) @@ -1439,7 +1429,7 @@ pub struct GstMpegtsExtendedEventDescriptor { impl ::std::fmt::Debug for GstMpegtsExtendedEventDescriptor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsExtendedEventDescriptor @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsExtendedEventDescriptor @ {self:p}")) .field("descriptor_number", &self.descriptor_number) .field("last_descriptor_number", &self.last_descriptor_number) .field("language_code", &self.language_code) @@ -1458,7 +1448,7 @@ pub struct GstMpegtsExtendedEventItem { impl ::std::fmt::Debug for GstMpegtsExtendedEventItem { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsExtendedEventItem @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsExtendedEventItem @ {self:p}")) .field("item_description", &self.item_description) .field("item", &self.item) .finish() @@ -1475,7 +1465,7 @@ pub struct GstMpegtsISO639LanguageDescriptor { impl ::std::fmt::Debug for GstMpegtsISO639LanguageDescriptor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsISO639LanguageDescriptor @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsISO639LanguageDescriptor @ {self:p}")) .field("nb_language", &self.nb_language) .finish() } @@ -1491,7 +1481,7 @@ pub struct GstMpegtsLogicalChannel { impl ::std::fmt::Debug for GstMpegtsLogicalChannel { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsLogicalChannel @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsLogicalChannel @ {self:p}")) .field("service_id", &self.service_id) .field("visible_service", &self.visible_service) .field("logical_channel_number", &self.logical_channel_number) @@ -1508,7 +1498,7 @@ pub struct GstMpegtsLogicalChannelDescriptor { impl ::std::fmt::Debug for GstMpegtsLogicalChannelDescriptor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsLogicalChannelDescriptor @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsLogicalChannelDescriptor @ {self:p}")) .field("nb_channels", &self.nb_channels) .finish() } @@ -1525,7 +1515,7 @@ pub struct GstMpegtsNIT { impl ::std::fmt::Debug for GstMpegtsNIT { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsNIT @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsNIT @ {self:p}")) .field("actual_network", &self.actual_network) .field("network_id", &self.network_id) .field("descriptors", &self.descriptors) @@ -1544,7 +1534,7 @@ pub struct GstMpegtsNITStream { impl ::std::fmt::Debug for GstMpegtsNITStream { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsNITStream @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsNITStream @ {self:p}")) .field("transport_stream_id", &self.transport_stream_id) .field("original_network_id", &self.original_network_id) .field("descriptors", &self.descriptors) @@ -1563,7 +1553,7 @@ pub struct GstMpegtsPMT { impl ::std::fmt::Debug for GstMpegtsPMT { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsPMT @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsPMT @ {self:p}")) .field("pcr_pid", &self.pcr_pid) .field("program_number", &self.program_number) .field("descriptors", &self.descriptors) @@ -1582,7 +1572,7 @@ pub struct GstMpegtsPMTStream { impl ::std::fmt::Debug for GstMpegtsPMTStream { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsPMTStream @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsPMTStream @ {self:p}")) .field("stream_type", &self.stream_type) .field("pid", &self.pid) .field("descriptors", &self.descriptors) @@ -1599,7 +1589,7 @@ pub struct GstMpegtsPatProgram { impl ::std::fmt::Debug for GstMpegtsPatProgram { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsPatProgram @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsPatProgram @ {self:p}")) .field("program_number", &self.program_number) .field( "network_or_program_map_PID", @@ -1629,7 +1619,7 @@ pub struct GstMpegtsSCTESIT { impl ::std::fmt::Debug for GstMpegtsSCTESIT { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsSCTESIT @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsSCTESIT @ {self:p}")) .field("encrypted_packet", &self.encrypted_packet) .field("encryption_algorithm", &self.encryption_algorithm) .field("pts_adjustment", &self.pts_adjustment) @@ -1658,7 +1648,7 @@ pub struct GstMpegtsSCTESpliceComponent { impl ::std::fmt::Debug for GstMpegtsSCTESpliceComponent { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsSCTESpliceComponent @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsSCTESpliceComponent @ {self:p}")) .field("tag", &self.tag) .field("splice_time_specified", &self.splice_time_specified) .field("splice_time", &self.splice_time) @@ -1690,7 +1680,7 @@ pub struct GstMpegtsSCTESpliceEvent { impl ::std::fmt::Debug for GstMpegtsSCTESpliceEvent { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsSCTESpliceEvent @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsSCTESpliceEvent @ {self:p}")) .field("insert_event", &self.insert_event) .field("splice_event_id", &self.splice_event_id) .field( @@ -1731,7 +1721,7 @@ pub struct GstMpegtsSDT { impl ::std::fmt::Debug for GstMpegtsSDT { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsSDT @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsSDT @ {self:p}")) .field("original_network_id", &self.original_network_id) .field("actual_ts", &self.actual_ts) .field("transport_stream_id", &self.transport_stream_id) @@ -1753,7 +1743,7 @@ pub struct GstMpegtsSDTService { impl ::std::fmt::Debug for GstMpegtsSDTService { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsSDTService @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsSDTService @ {self:p}")) .field("service_id", &self.service_id) .field("EIT_schedule_flag", &self.EIT_schedule_flag) .field( @@ -1776,7 +1766,7 @@ pub struct GstMpegtsSIT { impl ::std::fmt::Debug for GstMpegtsSIT { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsSIT @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsSIT @ {self:p}")) .field("descriptors", &self.descriptors) .field("services", &self.services) .finish() @@ -1793,7 +1783,7 @@ pub struct GstMpegtsSITService { impl ::std::fmt::Debug for GstMpegtsSITService { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsSITService @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsSITService @ {self:p}")) .field("service_id", &self.service_id) .field("running_status", &self.running_status) .field("descriptors", &self.descriptors) @@ -1818,8 +1808,7 @@ pub struct GstMpegtsSatelliteDeliverySystemDescriptor { impl ::std::fmt::Debug for GstMpegtsSatelliteDeliverySystemDescriptor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { f.debug_struct(&format!( - "GstMpegtsSatelliteDeliverySystemDescriptor @ {:p}", - self + "GstMpegtsSatelliteDeliverySystemDescriptor @ {self:p}" )) .field("frequency", &self.frequency) .field("orbital_position", &self.orbital_position) @@ -1859,7 +1848,7 @@ pub struct GstMpegtsSection { impl ::std::fmt::Debug for GstMpegtsSection { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsSection @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsSection @ {self:p}")) .field("section_type", &self.section_type) .field("pid", &self.pid) .field("table_id", &self.table_id) @@ -1883,7 +1872,7 @@ pub struct GstMpegtsT2DeliverySystemCell { impl ::std::fmt::Debug for GstMpegtsT2DeliverySystemCell { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsT2DeliverySystemCell @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsT2DeliverySystemCell @ {self:p}")) .field("cell_id", &self.cell_id) .field("centre_frequencies", &self.centre_frequencies) .field("sub_cells", &self.sub_cells) @@ -1901,8 +1890,7 @@ pub struct GstMpegtsT2DeliverySystemCellExtension { impl ::std::fmt::Debug for GstMpegtsT2DeliverySystemCellExtension { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { f.debug_struct(&format!( - "GstMpegtsT2DeliverySystemCellExtension @ {:p}", - self + "GstMpegtsT2DeliverySystemCellExtension @ {self:p}" )) .field("cell_id_extension", &self.cell_id_extension) .field("transposer_frequency", &self.transposer_frequency) @@ -1926,7 +1914,7 @@ pub struct GstMpegtsT2DeliverySystemDescriptor { impl ::std::fmt::Debug for GstMpegtsT2DeliverySystemDescriptor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsT2DeliverySystemDescriptor @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsT2DeliverySystemDescriptor @ {self:p}")) .field("plp_id", &self.plp_id) .field("t2_system_id", &self.t2_system_id) .field("siso_miso", &self.siso_miso) @@ -1949,7 +1937,7 @@ pub struct GstMpegtsTOT { impl ::std::fmt::Debug for GstMpegtsTOT { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMpegtsTOT @ {:p}", self)) + f.debug_struct(&format!("GstMpegtsTOT @ {self:p}")) .field("utc_time", &self.utc_time) .field("descriptors", &self.descriptors) .finish() @@ -1976,8 +1964,7 @@ pub struct GstMpegtsTerrestrialDeliverySystemDescriptor { impl ::std::fmt::Debug for GstMpegtsTerrestrialDeliverySystemDescriptor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { f.debug_struct(&format!( - "GstMpegtsTerrestrialDeliverySystemDescriptor @ {:p}", - self + "GstMpegtsTerrestrialDeliverySystemDescriptor @ {self:p}" )) .field("frequency", &self.frequency) .field("bandwidth", &self.bandwidth) diff --git a/gstreamer-mpegts/sys/tests/abi.rs b/gstreamer-mpegts/sys/tests/abi.rs index f4618ded6..9c6cb64b5 100644 --- a/gstreamer-mpegts/sys/tests/abi.rs +++ b/gstreamer-mpegts/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-net/src/auto/versions.txt b/gstreamer-net/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-net/src/auto/versions.txt +++ b/gstreamer-net/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-net/sys/build.rs b/gstreamer-net/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-net/sys/build.rs +++ b/gstreamer-net/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-net/sys/src/auto/versions.txt b/gstreamer-net/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-net/sys/src/auto/versions.txt +++ b/gstreamer-net/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-net/sys/src/lib.rs b/gstreamer-net/sys/src/lib.rs index 83986ae5f..d88faf4ae 100644 --- a/gstreamer-net/sys/src/lib.rs +++ b/gstreamer-net/sys/src/lib.rs @@ -47,7 +47,7 @@ pub struct GstNetAddressMeta { impl ::std::fmt::Debug for GstNetAddressMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstNetAddressMeta @ {:p}", self)) + f.debug_struct(&format!("GstNetAddressMeta @ {self:p}")) .field("meta", &self.meta) .field("addr", &self.addr) .finish() @@ -63,7 +63,7 @@ pub struct GstNetClientClockClass { impl ::std::fmt::Debug for GstNetClientClockClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstNetClientClockClass @ {:p}", self)) + f.debug_struct(&format!("GstNetClientClockClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -86,7 +86,7 @@ pub struct GstNetControlMessageMeta { impl ::std::fmt::Debug for GstNetControlMessageMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstNetControlMessageMeta @ {:p}", self)) + f.debug_struct(&format!("GstNetControlMessageMeta @ {self:p}")) .field("meta", &self.meta) .field("message", &self.message) .finish() @@ -102,7 +102,7 @@ pub struct GstNetTimePacket { impl ::std::fmt::Debug for GstNetTimePacket { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstNetTimePacket @ {:p}", self)) + f.debug_struct(&format!("GstNetTimePacket @ {self:p}")) .field("local_time", &self.local_time) .field("remote_time", &self.remote_time) .finish() @@ -118,7 +118,7 @@ pub struct GstNetTimeProviderClass { impl ::std::fmt::Debug for GstNetTimeProviderClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstNetTimeProviderClass @ {:p}", self)) + f.debug_struct(&format!("GstNetTimeProviderClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("_gst_reserved", &self._gst_reserved) .finish() @@ -142,7 +142,7 @@ pub struct GstNtpClockClass { impl ::std::fmt::Debug for GstNtpClockClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstNtpClockClass @ {:p}", self)) + f.debug_struct(&format!("GstNtpClockClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -157,7 +157,7 @@ pub struct GstPtpClockClass { impl ::std::fmt::Debug for GstPtpClockClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPtpClockClass @ {:p}", self)) + f.debug_struct(&format!("GstPtpClockClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -182,7 +182,7 @@ pub struct GstNetClientClock { impl ::std::fmt::Debug for GstNetClientClock { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstNetClientClock @ {:p}", self)) + f.debug_struct(&format!("GstNetClientClock @ {self:p}")) .field("clock", &self.clock) .finish() } @@ -198,7 +198,7 @@ pub struct GstNetTimeProvider { impl ::std::fmt::Debug for GstNetTimeProvider { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstNetTimeProvider @ {:p}", self)) + f.debug_struct(&format!("GstNetTimeProvider @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -214,7 +214,7 @@ pub struct GstNtpClock { impl ::std::fmt::Debug for GstNtpClock { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstNtpClock @ {:p}", self)) + f.debug_struct(&format!("GstNtpClock @ {self:p}")) .field("clock", &self.clock) .finish() } @@ -230,7 +230,7 @@ pub struct GstPtpClock { impl ::std::fmt::Debug for GstPtpClock { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPtpClock @ {:p}", self)) + f.debug_struct(&format!("GstPtpClock @ {self:p}")) .field("clock", &self.clock) .finish() } diff --git a/gstreamer-net/sys/tests/abi.rs b/gstreamer-net/sys/tests/abi.rs index f3029f21d..a413780f6 100644 --- a/gstreamer-net/sys/tests/abi.rs +++ b/gstreamer-net/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-pbutils/src/auto/flags.rs b/gstreamer-pbutils/src/auto/flags.rs index 4ceaa93e6..2c9ef982c 100644 --- a/gstreamer-pbutils/src/auto/flags.rs +++ b/gstreamer-pbutils/src/auto/flags.rs @@ -14,11 +14,11 @@ bitflags! { #[doc(alias = "GstDiscovererSerializeFlags")] pub struct DiscovererSerializeFlags: u32 { #[doc(alias = "GST_DISCOVERER_SERIALIZE_CAPS")] - const CAPS = ffi::GST_DISCOVERER_SERIALIZE_CAPS as u32; + const CAPS = ffi::GST_DISCOVERER_SERIALIZE_CAPS as _; #[doc(alias = "GST_DISCOVERER_SERIALIZE_TAGS")] - const TAGS = ffi::GST_DISCOVERER_SERIALIZE_TAGS as u32; + const TAGS = ffi::GST_DISCOVERER_SERIALIZE_TAGS as _; #[doc(alias = "GST_DISCOVERER_SERIALIZE_MISC")] - const MISC = ffi::GST_DISCOVERER_SERIALIZE_MISC as u32; + const MISC = ffi::GST_DISCOVERER_SERIALIZE_MISC as _; } } @@ -78,23 +78,23 @@ bitflags! { #[doc(alias = "GstPbUtilsCapsDescriptionFlags")] pub struct PbUtilsCapsDescriptionFlags: u32 { #[doc(alias = "GST_PBUTILS_CAPS_DESCRIPTION_FLAG_CONTAINER")] - const CONTAINER = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_CONTAINER as u32; + const CONTAINER = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_CONTAINER as _; #[doc(alias = "GST_PBUTILS_CAPS_DESCRIPTION_FLAG_AUDIO")] - const AUDIO = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_AUDIO as u32; + const AUDIO = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_AUDIO as _; #[doc(alias = "GST_PBUTILS_CAPS_DESCRIPTION_FLAG_VIDEO")] - const VIDEO = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_VIDEO as u32; + const VIDEO = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_VIDEO as _; #[doc(alias = "GST_PBUTILS_CAPS_DESCRIPTION_FLAG_IMAGE")] - const IMAGE = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_IMAGE as u32; + const IMAGE = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_IMAGE as _; #[doc(alias = "GST_PBUTILS_CAPS_DESCRIPTION_FLAG_SUBTITLE")] - const SUBTITLE = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_SUBTITLE as u32; + const SUBTITLE = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_SUBTITLE as _; #[doc(alias = "GST_PBUTILS_CAPS_DESCRIPTION_FLAG_TAG")] - const TAG = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_TAG as u32; + const TAG = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_TAG as _; #[doc(alias = "GST_PBUTILS_CAPS_DESCRIPTION_FLAG_GENERIC")] - const GENERIC = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_GENERIC as u32; + const GENERIC = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_GENERIC as _; #[cfg(any(feature = "v1_22", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_22")))] #[doc(alias = "GST_PBUTILS_CAPS_DESCRIPTION_FLAG_METADATA")] - const METADATA = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_METADATA as u32; + const METADATA = ffi::GST_PBUTILS_CAPS_DESCRIPTION_FLAG_METADATA as _; } } diff --git a/gstreamer-pbutils/src/auto/functions.rs b/gstreamer-pbutils/src/auto/functions.rs index 2e9628269..19f5b6f32 100644 --- a/gstreamer-pbutils/src/auto/functions.rs +++ b/gstreamer-pbutils/src/auto/functions.rs @@ -13,7 +13,7 @@ use std::mem; #[doc(alias = "gst_codec_utils_aac_get_channels")] pub fn codec_utils_aac_get_channels(audio_config: &[u8]) -> u32 { assert_initialized_main_thread!(); - let len = audio_config.len() as u32; + let len = audio_config.len() as _; unsafe { ffi::gst_codec_utils_aac_get_channels(audio_config.to_glib_none().0, len) } } @@ -26,7 +26,7 @@ pub fn codec_utils_aac_get_index_from_sample_rate(rate: u32) -> i32 { #[doc(alias = "gst_codec_utils_aac_get_level")] pub fn codec_utils_aac_get_level(audio_config: &[u8]) -> Result { assert_initialized_main_thread!(); - let len = audio_config.len() as u32; + let len = audio_config.len() as _; unsafe { Option::<_>::from_glib_none(ffi::gst_codec_utils_aac_get_level( audio_config.to_glib_none().0, @@ -39,7 +39,7 @@ pub fn codec_utils_aac_get_level(audio_config: &[u8]) -> Result Result { assert_initialized_main_thread!(); - let len = audio_config.len() as u32; + let len = audio_config.len() as _; unsafe { Option::<_>::from_glib_none(ffi::gst_codec_utils_aac_get_profile( audio_config.to_glib_none().0, @@ -52,7 +52,7 @@ pub fn codec_utils_aac_get_profile(audio_config: &[u8]) -> Result u32 { assert_initialized_main_thread!(); - let len = audio_config.len() as u32; + let len = audio_config.len() as _; unsafe { ffi::gst_codec_utils_aac_get_sample_rate(audio_config.to_glib_none().0, len) } } @@ -90,7 +90,7 @@ pub fn codec_utils_caps_get_mime_codec(caps: &gst::Caps) -> Result Result { assert_initialized_main_thread!(); - let len = sps.len() as u32; + let len = sps.len() as _; unsafe { Option::<_>::from_glib_none(ffi::gst_codec_utils_h264_get_level( sps.to_glib_none().0, @@ -109,7 +109,7 @@ pub fn codec_utils_h264_get_level_idc(level: &str) -> u8 { #[doc(alias = "gst_codec_utils_h264_get_profile")] pub fn codec_utils_h264_get_profile(sps: &[u8]) -> Result { assert_initialized_main_thread!(); - let len = sps.len() as u32; + let len = sps.len() as _; unsafe { Option::<_>::from_glib_none(ffi::gst_codec_utils_h264_get_profile( sps.to_glib_none().0, @@ -124,7 +124,7 @@ pub fn codec_utils_h265_get_level( profile_tier_level: &[u8], ) -> Result { assert_initialized_main_thread!(); - let len = profile_tier_level.len() as u32; + let len = profile_tier_level.len() as _; unsafe { Option::<_>::from_glib_none(ffi::gst_codec_utils_h265_get_level( profile_tier_level.to_glib_none().0, @@ -145,7 +145,7 @@ pub fn codec_utils_h265_get_profile( profile_tier_level: &[u8], ) -> Result { assert_initialized_main_thread!(); - let len = profile_tier_level.len() as u32; + let len = profile_tier_level.len() as _; unsafe { Option::<_>::from_glib_none(ffi::gst_codec_utils_h265_get_profile( profile_tier_level.to_glib_none().0, @@ -160,7 +160,7 @@ pub fn codec_utils_h265_get_tier( profile_tier_level: &[u8], ) -> Result { assert_initialized_main_thread!(); - let len = profile_tier_level.len() as u32; + let len = profile_tier_level.len() as _; unsafe { Option::<_>::from_glib_none(ffi::gst_codec_utils_h265_get_tier( profile_tier_level.to_glib_none().0, @@ -175,7 +175,7 @@ pub fn codec_utils_mpeg4video_get_level( vis_obj_seq: &[u8], ) -> Result { assert_initialized_main_thread!(); - let len = vis_obj_seq.len() as u32; + let len = vis_obj_seq.len() as _; unsafe { Option::<_>::from_glib_none(ffi::gst_codec_utils_mpeg4video_get_level( vis_obj_seq.to_glib_none().0, @@ -190,7 +190,7 @@ pub fn codec_utils_mpeg4video_get_profile( vis_obj_seq: &[u8], ) -> Result { assert_initialized_main_thread!(); - let len = vis_obj_seq.len() as u32; + let len = vis_obj_seq.len() as _; unsafe { Option::<_>::from_glib_none(ffi::gst_codec_utils_mpeg4video_get_profile( vis_obj_seq.to_glib_none().0, diff --git a/gstreamer-pbutils/src/auto/versions.txt b/gstreamer-pbutils/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-pbutils/src/auto/versions.txt +++ b/gstreamer-pbutils/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-pbutils/sys/build.rs b/gstreamer-pbutils/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-pbutils/sys/build.rs +++ b/gstreamer-pbutils/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-pbutils/sys/src/auto/versions.txt b/gstreamer-pbutils/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-pbutils/sys/src/auto/versions.txt +++ b/gstreamer-pbutils/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-pbutils/sys/src/lib.rs b/gstreamer-pbutils/sys/src/lib.rs index a38f5ee3e..580c7a144 100644 --- a/gstreamer-pbutils/sys/src/lib.rs +++ b/gstreamer-pbutils/sys/src/lib.rs @@ -124,7 +124,7 @@ pub struct GstAudioVisualizerClass { impl ::std::fmt::Debug for GstAudioVisualizerClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioVisualizerClass @ {:p}", self)) + f.debug_struct(&format!("GstAudioVisualizerClass @ {self:p}")) .field("setup", &self.setup) .field("render", &self.render) .field("decide_allocation", &self.decide_allocation) @@ -155,7 +155,7 @@ pub struct GstDiscovererClass { impl ::std::fmt::Debug for GstDiscovererClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDiscovererClass @ {:p}", self)) + f.debug_struct(&format!("GstDiscovererClass @ {self:p}")) .field("parentclass", &self.parentclass) .field("finished", &self.finished) .field("starting", &self.starting) @@ -214,7 +214,7 @@ pub struct GstInstallPluginsContext { impl ::std::fmt::Debug for GstInstallPluginsContext { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstInstallPluginsContext @ {:p}", self)) + f.debug_struct(&format!("GstInstallPluginsContext @ {self:p}")) .finish() } } @@ -232,7 +232,7 @@ pub struct GstAudioVisualizer { impl ::std::fmt::Debug for GstAudioVisualizer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAudioVisualizer @ {:p}", self)) + f.debug_struct(&format!("GstAudioVisualizer @ {self:p}")) .field("parent", &self.parent) .field("req_spf", &self.req_spf) .field("vinfo", &self.vinfo) @@ -251,7 +251,7 @@ pub struct GstDiscoverer { impl ::std::fmt::Debug for GstDiscoverer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDiscoverer @ {:p}", self)) + f.debug_struct(&format!("GstDiscoverer @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -265,7 +265,7 @@ pub struct GstDiscovererAudioInfo { impl ::std::fmt::Debug for GstDiscovererAudioInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDiscovererAudioInfo @ {:p}", self)) + f.debug_struct(&format!("GstDiscovererAudioInfo @ {self:p}")) .finish() } } @@ -278,7 +278,7 @@ pub struct GstDiscovererContainerInfo { impl ::std::fmt::Debug for GstDiscovererContainerInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDiscovererContainerInfo @ {:p}", self)) + f.debug_struct(&format!("GstDiscovererContainerInfo @ {self:p}")) .finish() } } @@ -291,7 +291,7 @@ pub struct GstDiscovererInfo { impl ::std::fmt::Debug for GstDiscovererInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDiscovererInfo @ {:p}", self)) + f.debug_struct(&format!("GstDiscovererInfo @ {self:p}")) .finish() } } @@ -304,7 +304,7 @@ pub struct GstDiscovererStreamInfo { impl ::std::fmt::Debug for GstDiscovererStreamInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDiscovererStreamInfo @ {:p}", self)) + f.debug_struct(&format!("GstDiscovererStreamInfo @ {self:p}")) .finish() } } @@ -317,7 +317,7 @@ pub struct GstDiscovererSubtitleInfo { impl ::std::fmt::Debug for GstDiscovererSubtitleInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDiscovererSubtitleInfo @ {:p}", self)) + f.debug_struct(&format!("GstDiscovererSubtitleInfo @ {self:p}")) .finish() } } @@ -330,7 +330,7 @@ pub struct GstDiscovererVideoInfo { impl ::std::fmt::Debug for GstDiscovererVideoInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDiscovererVideoInfo @ {:p}", self)) + f.debug_struct(&format!("GstDiscovererVideoInfo @ {self:p}")) .finish() } } @@ -343,7 +343,7 @@ pub struct GstEncodingAudioProfile { impl ::std::fmt::Debug for GstEncodingAudioProfile { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstEncodingAudioProfile @ {:p}", self)) + f.debug_struct(&format!("GstEncodingAudioProfile @ {self:p}")) .finish() } } @@ -356,7 +356,7 @@ pub struct GstEncodingContainerProfile { impl ::std::fmt::Debug for GstEncodingContainerProfile { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstEncodingContainerProfile @ {:p}", self)) + f.debug_struct(&format!("GstEncodingContainerProfile @ {self:p}")) .finish() } } @@ -369,7 +369,7 @@ pub struct GstEncodingProfile { impl ::std::fmt::Debug for GstEncodingProfile { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstEncodingProfile @ {:p}", self)) + f.debug_struct(&format!("GstEncodingProfile @ {self:p}")) .finish() } } @@ -382,7 +382,7 @@ pub struct GstEncodingTarget { impl ::std::fmt::Debug for GstEncodingTarget { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstEncodingTarget @ {:p}", self)) + f.debug_struct(&format!("GstEncodingTarget @ {self:p}")) .finish() } } @@ -395,7 +395,7 @@ pub struct GstEncodingVideoProfile { impl ::std::fmt::Debug for GstEncodingVideoProfile { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstEncodingVideoProfile @ {:p}", self)) + f.debug_struct(&format!("GstEncodingVideoProfile @ {self:p}")) .finish() } } diff --git a/gstreamer-pbutils/sys/tests/abi.rs b/gstreamer-pbutils/sys/tests/abi.rs index 2da9d75d3..762e8ac95 100644 --- a/gstreamer-pbutils/sys/tests/abi.rs +++ b/gstreamer-pbutils/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-play/src/auto/versions.txt b/gstreamer-play/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-play/src/auto/versions.txt +++ b/gstreamer-play/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-play/sys/build.rs b/gstreamer-play/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-play/sys/build.rs +++ b/gstreamer-play/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-play/sys/src/auto/versions.txt b/gstreamer-play/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-play/sys/src/auto/versions.txt +++ b/gstreamer-play/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-play/sys/src/lib.rs b/gstreamer-play/sys/src/lib.rs index 5557586f9..3ac4165b8 100644 --- a/gstreamer-play/sys/src/lib.rs +++ b/gstreamer-play/sys/src/lib.rs @@ -135,7 +135,7 @@ pub struct GstPlayVideoRendererInterface { impl ::std::fmt::Debug for GstPlayVideoRendererInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayVideoRendererInterface @ {:p}", self)) + f.debug_struct(&format!("GstPlayVideoRendererInterface @ {self:p}")) .field("parent_iface", &self.parent_iface) .field("create_video_sink", &self.create_video_sink) .finish() @@ -151,7 +151,7 @@ pub struct GstPlayVisualization { impl ::std::fmt::Debug for GstPlayVisualization { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayVisualization @ {:p}", self)) + f.debug_struct(&format!("GstPlayVisualization @ {self:p}")) .field("name", &self.name) .field("description", &self.description) .finish() @@ -167,7 +167,7 @@ pub struct GstPlay { impl ::std::fmt::Debug for GstPlay { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlay @ {:p}", self)).finish() + f.debug_struct(&format!("GstPlay @ {self:p}")).finish() } } @@ -179,7 +179,7 @@ pub struct GstPlayAudioInfo { impl ::std::fmt::Debug for GstPlayAudioInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayAudioInfo @ {:p}", self)) + f.debug_struct(&format!("GstPlayAudioInfo @ {self:p}")) .finish() } } @@ -192,7 +192,7 @@ pub struct GstPlayMediaInfo { impl ::std::fmt::Debug for GstPlayMediaInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayMediaInfo @ {:p}", self)) + f.debug_struct(&format!("GstPlayMediaInfo @ {self:p}")) .finish() } } @@ -205,7 +205,7 @@ pub struct GstPlaySignalAdapter { impl ::std::fmt::Debug for GstPlaySignalAdapter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlaySignalAdapter @ {:p}", self)) + f.debug_struct(&format!("GstPlaySignalAdapter @ {self:p}")) .finish() } } @@ -218,7 +218,7 @@ pub struct GstPlayStreamInfo { impl ::std::fmt::Debug for GstPlayStreamInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayStreamInfo @ {:p}", self)) + f.debug_struct(&format!("GstPlayStreamInfo @ {self:p}")) .finish() } } @@ -231,7 +231,7 @@ pub struct GstPlaySubtitleInfo { impl ::std::fmt::Debug for GstPlaySubtitleInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlaySubtitleInfo @ {:p}", self)) + f.debug_struct(&format!("GstPlaySubtitleInfo @ {self:p}")) .finish() } } @@ -244,7 +244,7 @@ pub struct GstPlayVideoInfo { impl ::std::fmt::Debug for GstPlayVideoInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayVideoInfo @ {:p}", self)) + f.debug_struct(&format!("GstPlayVideoInfo @ {self:p}")) .finish() } } @@ -257,7 +257,7 @@ pub struct GstPlayVideoOverlayVideoRenderer { impl ::std::fmt::Debug for GstPlayVideoOverlayVideoRenderer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayVideoOverlayVideoRenderer @ {:p}", self)) + f.debug_struct(&format!("GstPlayVideoOverlayVideoRenderer @ {self:p}")) .finish() } } @@ -271,7 +271,7 @@ pub struct GstPlayVideoRenderer { impl ::std::fmt::Debug for GstPlayVideoRenderer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstPlayVideoRenderer @ {:p}", self) + write!(f, "GstPlayVideoRenderer @ {self:p}") } } diff --git a/gstreamer-play/sys/tests/abi.rs b/gstreamer-play/sys/tests/abi.rs index 4ab8136c5..150ceecf4 100644 --- a/gstreamer-play/sys/tests/abi.rs +++ b/gstreamer-play/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-player/src/auto/versions.txt b/gstreamer-player/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-player/src/auto/versions.txt +++ b/gstreamer-player/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-player/sys/build.rs b/gstreamer-player/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-player/sys/build.rs +++ b/gstreamer-player/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-player/sys/src/auto/versions.txt b/gstreamer-player/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-player/sys/src/auto/versions.txt +++ b/gstreamer-player/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-player/sys/src/lib.rs b/gstreamer-player/sys/src/lib.rs index 0548f50c8..9b0408631 100644 --- a/gstreamer-player/sys/src/lib.rs +++ b/gstreamer-player/sys/src/lib.rs @@ -98,7 +98,7 @@ pub struct GstPlayerSignalDispatcherInterface { impl ::std::fmt::Debug for GstPlayerSignalDispatcherInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayerSignalDispatcherInterface @ {:p}", self)) + f.debug_struct(&format!("GstPlayerSignalDispatcherInterface @ {self:p}")) .field("parent_iface", &self.parent_iface) .field("dispatch", &self.dispatch) .finish() @@ -148,7 +148,7 @@ pub struct GstPlayerVideoRendererInterface { impl ::std::fmt::Debug for GstPlayerVideoRendererInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayerVideoRendererInterface @ {:p}", self)) + f.debug_struct(&format!("GstPlayerVideoRendererInterface @ {self:p}")) .field("parent_iface", &self.parent_iface) .field("create_video_sink", &self.create_video_sink) .finish() @@ -164,7 +164,7 @@ pub struct GstPlayerVisualization { impl ::std::fmt::Debug for GstPlayerVisualization { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayerVisualization @ {:p}", self)) + f.debug_struct(&format!("GstPlayerVisualization @ {self:p}")) .field("name", &self.name) .field("description", &self.description) .finish() @@ -180,7 +180,7 @@ pub struct GstPlayer { impl ::std::fmt::Debug for GstPlayer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayer @ {:p}", self)).finish() + f.debug_struct(&format!("GstPlayer @ {self:p}")).finish() } } @@ -192,7 +192,7 @@ pub struct GstPlayerAudioInfo { impl ::std::fmt::Debug for GstPlayerAudioInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayerAudioInfo @ {:p}", self)) + f.debug_struct(&format!("GstPlayerAudioInfo @ {self:p}")) .finish() } } @@ -205,11 +205,8 @@ pub struct GstPlayerGMainContextSignalDispatcher { impl ::std::fmt::Debug for GstPlayerGMainContextSignalDispatcher { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!( - "GstPlayerGMainContextSignalDispatcher @ {:p}", - self - )) - .finish() + f.debug_struct(&format!("GstPlayerGMainContextSignalDispatcher @ {self:p}")) + .finish() } } @@ -221,7 +218,7 @@ pub struct GstPlayerMediaInfo { impl ::std::fmt::Debug for GstPlayerMediaInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayerMediaInfo @ {:p}", self)) + f.debug_struct(&format!("GstPlayerMediaInfo @ {self:p}")) .finish() } } @@ -234,7 +231,7 @@ pub struct GstPlayerStreamInfo { impl ::std::fmt::Debug for GstPlayerStreamInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayerStreamInfo @ {:p}", self)) + f.debug_struct(&format!("GstPlayerStreamInfo @ {self:p}")) .finish() } } @@ -247,7 +244,7 @@ pub struct GstPlayerSubtitleInfo { impl ::std::fmt::Debug for GstPlayerSubtitleInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayerSubtitleInfo @ {:p}", self)) + f.debug_struct(&format!("GstPlayerSubtitleInfo @ {self:p}")) .finish() } } @@ -260,7 +257,7 @@ pub struct GstPlayerVideoInfo { impl ::std::fmt::Debug for GstPlayerVideoInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayerVideoInfo @ {:p}", self)) + f.debug_struct(&format!("GstPlayerVideoInfo @ {self:p}")) .finish() } } @@ -273,7 +270,7 @@ pub struct GstPlayerVideoOverlayVideoRenderer { impl ::std::fmt::Debug for GstPlayerVideoOverlayVideoRenderer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlayerVideoOverlayVideoRenderer @ {:p}", self)) + f.debug_struct(&format!("GstPlayerVideoOverlayVideoRenderer @ {self:p}")) .finish() } } @@ -287,7 +284,7 @@ pub struct GstPlayerSignalDispatcher { impl ::std::fmt::Debug for GstPlayerSignalDispatcher { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstPlayerSignalDispatcher @ {:p}", self) + write!(f, "GstPlayerSignalDispatcher @ {self:p}") } } @@ -299,7 +296,7 @@ pub struct GstPlayerVideoRenderer { impl ::std::fmt::Debug for GstPlayerVideoRenderer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstPlayerVideoRenderer @ {:p}", self) + write!(f, "GstPlayerVideoRenderer @ {self:p}") } } diff --git a/gstreamer-player/sys/tests/abi.rs b/gstreamer-player/sys/tests/abi.rs index 7e7bdafc7..e37f60ae5 100644 --- a/gstreamer-player/sys/tests/abi.rs +++ b/gstreamer-player/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-rtp/src/auto/flags.rs b/gstreamer-rtp/src/auto/flags.rs index a63dde577..93b2b44b3 100644 --- a/gstreamer-rtp/src/auto/flags.rs +++ b/gstreamer-rtp/src/auto/flags.rs @@ -14,9 +14,9 @@ bitflags! { #[doc(alias = "GstRTPBufferFlags")] pub struct RTPBufferFlags: u32 { #[doc(alias = "GST_RTP_BUFFER_FLAG_RETRANSMISSION")] - const RETRANSMISSION = ffi::GST_RTP_BUFFER_FLAG_RETRANSMISSION as u32; + const RETRANSMISSION = ffi::GST_RTP_BUFFER_FLAG_RETRANSMISSION as _; #[doc(alias = "GST_RTP_BUFFER_FLAG_REDUNDANT")] - const REDUNDANT = ffi::GST_RTP_BUFFER_FLAG_REDUNDANT as u32; + const REDUNDANT = ffi::GST_RTP_BUFFER_FLAG_REDUNDANT as _; } } @@ -74,7 +74,7 @@ bitflags! { #[doc(alias = "GstRTPBufferMapFlags")] pub struct RTPBufferMapFlags: u32 { #[doc(alias = "GST_RTP_BUFFER_MAP_FLAG_SKIP_PADDING")] - const SKIP_PADDING = ffi::GST_RTP_BUFFER_MAP_FLAG_SKIP_PADDING as u32; + const SKIP_PADDING = ffi::GST_RTP_BUFFER_MAP_FLAG_SKIP_PADDING as _; } } @@ -134,15 +134,15 @@ bitflags! { #[doc(alias = "GstRTPHeaderExtensionDirection")] pub struct RTPHeaderExtensionDirection: u32 { #[doc(alias = "GST_RTP_HEADER_EXTENSION_DIRECTION_INACTIVE")] - const INACTIVE = ffi::GST_RTP_HEADER_EXTENSION_DIRECTION_INACTIVE as u32; + const INACTIVE = ffi::GST_RTP_HEADER_EXTENSION_DIRECTION_INACTIVE as _; #[doc(alias = "GST_RTP_HEADER_EXTENSION_DIRECTION_SENDONLY")] - const SENDONLY = ffi::GST_RTP_HEADER_EXTENSION_DIRECTION_SENDONLY as u32; + const SENDONLY = ffi::GST_RTP_HEADER_EXTENSION_DIRECTION_SENDONLY as _; #[doc(alias = "GST_RTP_HEADER_EXTENSION_DIRECTION_RECVONLY")] - const RECVONLY = ffi::GST_RTP_HEADER_EXTENSION_DIRECTION_RECVONLY as u32; + const RECVONLY = ffi::GST_RTP_HEADER_EXTENSION_DIRECTION_RECVONLY as _; #[doc(alias = "GST_RTP_HEADER_EXTENSION_DIRECTION_SENDRECV")] - const SENDRECV = ffi::GST_RTP_HEADER_EXTENSION_DIRECTION_SENDRECV as u32; + const SENDRECV = ffi::GST_RTP_HEADER_EXTENSION_DIRECTION_SENDRECV as _; #[doc(alias = "GST_RTP_HEADER_EXTENSION_DIRECTION_INHERITED")] - const INHERITED = ffi::GST_RTP_HEADER_EXTENSION_DIRECTION_INHERITED as u32; + const INHERITED = ffi::GST_RTP_HEADER_EXTENSION_DIRECTION_INHERITED as _; } } @@ -214,9 +214,9 @@ bitflags! { #[doc(alias = "GstRTPHeaderExtensionFlags")] pub struct RTPHeaderExtensionFlags: u32 { #[doc(alias = "GST_RTP_HEADER_EXTENSION_ONE_BYTE")] - const ONE_BYTE = ffi::GST_RTP_HEADER_EXTENSION_ONE_BYTE as u32; + const ONE_BYTE = ffi::GST_RTP_HEADER_EXTENSION_ONE_BYTE as _; #[doc(alias = "GST_RTP_HEADER_EXTENSION_TWO_BYTE")] - const TWO_BYTE = ffi::GST_RTP_HEADER_EXTENSION_TWO_BYTE as u32; + const TWO_BYTE = ffi::GST_RTP_HEADER_EXTENSION_TWO_BYTE as _; } } diff --git a/gstreamer-rtp/src/auto/versions.txt b/gstreamer-rtp/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-rtp/src/auto/versions.txt +++ b/gstreamer-rtp/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-rtp/sys/build.rs b/gstreamer-rtp/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-rtp/sys/build.rs +++ b/gstreamer-rtp/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-rtp/sys/src/auto/versions.txt b/gstreamer-rtp/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-rtp/sys/src/auto/versions.txt +++ b/gstreamer-rtp/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-rtp/sys/src/lib.rs b/gstreamer-rtp/sys/src/lib.rs index 113f421df..86a8f8ffa 100644 --- a/gstreamer-rtp/sys/src/lib.rs +++ b/gstreamer-rtp/sys/src/lib.rs @@ -216,7 +216,7 @@ pub struct GstRTCPBuffer { impl ::std::fmt::Debug for GstRTCPBuffer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTCPBuffer @ {:p}", self)) + f.debug_struct(&format!("GstRTCPBuffer @ {self:p}")) .field("buffer", &self.buffer) .field("map", &self.map) .finish() @@ -239,7 +239,7 @@ pub struct GstRTCPPacket { impl ::std::fmt::Debug for GstRTCPPacket { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTCPPacket @ {:p}", self)) + f.debug_struct(&format!("GstRTCPPacket @ {self:p}")) .field("rtcp", &self.rtcp) .field("offset", &self.offset) .finish() @@ -255,7 +255,7 @@ pub struct GstRTPBaseAudioPayloadClass { impl ::std::fmt::Debug for GstRTPBaseAudioPayloadClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTPBaseAudioPayloadClass @ {:p}", self)) + f.debug_struct(&format!("GstRTPBaseAudioPayloadClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -290,7 +290,7 @@ pub struct GstRTPBaseDepayloadClass { impl ::std::fmt::Debug for GstRTPBaseDepayloadClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTPBaseDepayloadClass @ {:p}", self)) + f.debug_struct(&format!("GstRTPBaseDepayloadClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("set_caps", &self.set_caps) .field("process", &self.process) @@ -341,7 +341,7 @@ pub struct GstRTPBasePayloadClass { impl ::std::fmt::Debug for GstRTPBasePayloadClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTPBasePayloadClass @ {:p}", self)) + f.debug_struct(&format!("GstRTPBasePayloadClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("get_caps", &self.get_caps) .field("set_caps", &self.set_caps) @@ -373,7 +373,7 @@ pub struct GstRTPBuffer { impl ::std::fmt::Debug for GstRTPBuffer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTPBuffer @ {:p}", self)) + f.debug_struct(&format!("GstRTPBuffer @ {self:p}")) .field("buffer", &self.buffer) .field("state", &self.state) .field("data", &self.data) @@ -428,7 +428,7 @@ pub struct GstRTPHeaderExtensionClass { impl ::std::fmt::Debug for GstRTPHeaderExtensionClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTPHeaderExtensionClass @ {:p}", self)) + f.debug_struct(&format!("GstRTPHeaderExtensionClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("get_supported_flags", &self.get_supported_flags) .field("get_max_size", &self.get_max_size) @@ -456,7 +456,7 @@ pub struct GstRTPPayloadInfo { impl ::std::fmt::Debug for GstRTPPayloadInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTPPayloadInfo @ {:p}", self)) + f.debug_struct(&format!("GstRTPPayloadInfo @ {self:p}")) .field("payload_type", &self.payload_type) .field("media", &self.media) .field("encoding_name", &self.encoding_name) @@ -479,7 +479,7 @@ pub struct GstRTPSourceMeta { impl ::std::fmt::Debug for GstRTPSourceMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTPSourceMeta @ {:p}", self)) + f.debug_struct(&format!("GstRTPSourceMeta @ {self:p}")) .field("meta", &self.meta) .field("ssrc", &self.ssrc) .field("ssrc_valid", &self.ssrc_valid) @@ -504,7 +504,7 @@ pub struct GstRTPBaseAudioPayload { impl ::std::fmt::Debug for GstRTPBaseAudioPayload { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTPBaseAudioPayload @ {:p}", self)) + f.debug_struct(&format!("GstRTPBaseAudioPayload @ {self:p}")) .field("payload", &self.payload) .field("priv_", &self.priv_) .field("base_ts", &self.base_ts) @@ -530,7 +530,7 @@ pub struct GstRTPBaseDepayload { impl ::std::fmt::Debug for GstRTPBaseDepayload { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTPBaseDepayload @ {:p}", self)) + f.debug_struct(&format!("GstRTPBaseDepayload @ {self:p}")) .field("parent", &self.parent) .field("sinkpad", &self.sinkpad) .field("srcpad", &self.srcpad) @@ -572,7 +572,7 @@ pub struct GstRTPBasePayload { impl ::std::fmt::Debug for GstRTPBasePayload { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTPBasePayload @ {:p}", self)) + f.debug_struct(&format!("GstRTPBasePayload @ {self:p}")) .field("element", &self.element) .finish() } @@ -587,7 +587,7 @@ pub struct GstRTPHeaderExtension { impl ::std::fmt::Debug for GstRTPHeaderExtension { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTPHeaderExtension @ {:p}", self)) + f.debug_struct(&format!("GstRTPHeaderExtension @ {self:p}")) .field("parent", &self.parent) .finish() } diff --git a/gstreamer-rtp/sys/tests/abi.rs b/gstreamer-rtp/sys/tests/abi.rs index 9c05677ab..8e1d8bc89 100644 --- a/gstreamer-rtp/sys/tests/abi.rs +++ b/gstreamer-rtp/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-rtsp-server/src/auto/flags.rs b/gstreamer-rtsp-server/src/auto/flags.rs index 0d192f1ff..907d0f655 100644 --- a/gstreamer-rtsp-server/src/auto/flags.rs +++ b/gstreamer-rtsp-server/src/auto/flags.rs @@ -14,15 +14,15 @@ bitflags! { #[doc(alias = "GstRTSPAddressFlags")] pub struct RTSPAddressFlags: u32 { #[doc(alias = "GST_RTSP_ADDRESS_FLAG_IPV4")] - const IPV4 = ffi::GST_RTSP_ADDRESS_FLAG_IPV4 as u32; + const IPV4 = ffi::GST_RTSP_ADDRESS_FLAG_IPV4 as _; #[doc(alias = "GST_RTSP_ADDRESS_FLAG_IPV6")] - const IPV6 = ffi::GST_RTSP_ADDRESS_FLAG_IPV6 as u32; + const IPV6 = ffi::GST_RTSP_ADDRESS_FLAG_IPV6 as _; #[doc(alias = "GST_RTSP_ADDRESS_FLAG_EVEN_PORT")] - const EVEN_PORT = ffi::GST_RTSP_ADDRESS_FLAG_EVEN_PORT as u32; + const EVEN_PORT = ffi::GST_RTSP_ADDRESS_FLAG_EVEN_PORT as _; #[doc(alias = "GST_RTSP_ADDRESS_FLAG_MULTICAST")] - const MULTICAST = ffi::GST_RTSP_ADDRESS_FLAG_MULTICAST as u32; + const MULTICAST = ffi::GST_RTSP_ADDRESS_FLAG_MULTICAST as _; #[doc(alias = "GST_RTSP_ADDRESS_FLAG_UNICAST")] - const UNICAST = ffi::GST_RTSP_ADDRESS_FLAG_UNICAST as u32; + const UNICAST = ffi::GST_RTSP_ADDRESS_FLAG_UNICAST as _; } } @@ -47,9 +47,9 @@ bitflags! { #[doc(alias = "GstRTSPTransportMode")] pub struct RTSPTransportMode: u32 { #[doc(alias = "GST_RTSP_TRANSPORT_MODE_PLAY")] - const PLAY = ffi::GST_RTSP_TRANSPORT_MODE_PLAY as u32; + const PLAY = ffi::GST_RTSP_TRANSPORT_MODE_PLAY as _; #[doc(alias = "GST_RTSP_TRANSPORT_MODE_RECORD")] - const RECORD = ffi::GST_RTSP_TRANSPORT_MODE_RECORD as u32; + const RECORD = ffi::GST_RTSP_TRANSPORT_MODE_RECORD as _; } } diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media.rs b/gstreamer-rtsp-server/src/auto/rtsp_media.rs index bbd520e5d..d784fd7b2 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_media.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_media.rs @@ -1094,7 +1094,7 @@ impl> RTSPMediaExt for O { } unsafe { let f: Box_ = Box_::new(f); - let detailed_signal_name = detail.map(|name| format!("handle-message::{}\0", name)); + let detailed_signal_name = detail.map(|name| format!("handle-message::{name}\0")); let signal_name: &[u8] = detailed_signal_name .as_ref() .map_or(&b"handle-message\0"[..], |n| n.as_bytes()); diff --git a/gstreamer-rtsp-server/src/auto/versions.txt b/gstreamer-rtsp-server/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-rtsp-server/src/auto/versions.txt +++ b/gstreamer-rtsp-server/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-rtsp-server/sys/build.rs b/gstreamer-rtsp-server/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-rtsp-server/sys/build.rs +++ b/gstreamer-rtsp-server/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-rtsp-server/sys/src/auto/versions.txt b/gstreamer-rtsp-server/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-rtsp-server/sys/src/auto/versions.txt +++ b/gstreamer-rtsp-server/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-rtsp-server/sys/src/lib.rs b/gstreamer-rtsp-server/sys/src/lib.rs index 76d005f62..c28c5f3bb 100644 --- a/gstreamer-rtsp-server/sys/src/lib.rs +++ b/gstreamer-rtsp-server/sys/src/lib.rs @@ -166,7 +166,7 @@ pub struct GstRTSPAddress { impl ::std::fmt::Debug for GstRTSPAddress { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPAddress @ {:p}", self)) + f.debug_struct(&format!("GstRTSPAddress @ {self:p}")) .field("pool", &self.pool) .field("address", &self.address) .field("port", &self.port) @@ -185,7 +185,7 @@ pub struct GstRTSPAddressPoolClass { impl ::std::fmt::Debug for GstRTSPAddressPoolClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPAddressPoolClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPAddressPoolClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -223,7 +223,7 @@ pub struct GstRTSPAuthClass { impl ::std::fmt::Debug for GstRTSPAuthClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPAuthClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPAuthClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("authenticate", &self.authenticate) .field("check", &self.check) @@ -408,7 +408,7 @@ pub struct GstRTSPClientClass { impl ::std::fmt::Debug for GstRTSPClientClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPClientClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPClientClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("create_sdp", &self.create_sdp) .field("configure_client_media", &self.configure_client_media) @@ -484,7 +484,7 @@ pub struct GstRTSPContext { impl ::std::fmt::Debug for GstRTSPContext { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPContext @ {:p}", self)) + f.debug_struct(&format!("GstRTSPContext @ {self:p}")) .field("server", &self.server) .field("conn", &self.conn) .field("client", &self.client) @@ -546,7 +546,7 @@ pub struct GstRTSPMediaClass { impl ::std::fmt::Debug for GstRTSPMediaClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPMediaClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPMediaClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("handle_message", &self.handle_message) .field("prepare", &self.prepare) @@ -601,7 +601,7 @@ pub struct GstRTSPMediaFactoryClass { impl ::std::fmt::Debug for GstRTSPMediaFactoryClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPMediaFactoryClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPMediaFactoryClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("gen_key", &self.gen_key) .field("create_element", &self.create_element) @@ -631,7 +631,7 @@ pub struct GstRTSPMediaFactoryURIClass { impl ::std::fmt::Debug for GstRTSPMediaFactoryURIClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPMediaFactoryURIClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPMediaFactoryURIClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -665,7 +665,7 @@ pub struct GstRTSPMountPointsClass { impl ::std::fmt::Debug for GstRTSPMountPointsClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPMountPointsClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPMountPointsClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("make_path", &self.make_path) .finish() @@ -689,7 +689,7 @@ pub struct GstRTSPOnvifClientClass { impl ::std::fmt::Debug for GstRTSPOnvifClientClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPOnvifClientClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPOnvifClientClass @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -704,7 +704,7 @@ pub struct GstRTSPOnvifMediaClass { impl ::std::fmt::Debug for GstRTSPOnvifMediaClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPOnvifMediaClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPOnvifMediaClass @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -721,7 +721,7 @@ pub struct GstRTSPOnvifMediaFactoryClass { impl ::std::fmt::Debug for GstRTSPOnvifMediaFactoryClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPOnvifMediaFactoryClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPOnvifMediaFactoryClass @ {self:p}")) .field("parent", &self.parent) .field("has_backchannel_support", &self.has_backchannel_support) .finish() @@ -753,7 +753,7 @@ pub struct GstRTSPOnvifServerClass { impl ::std::fmt::Debug for GstRTSPOnvifServerClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPOnvifServerClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPOnvifServerClass @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -767,7 +767,7 @@ pub struct GstRTSPPermissions { impl ::std::fmt::Debug for GstRTSPPermissions { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPPermissions @ {:p}", self)) + f.debug_struct(&format!("GstRTSPPermissions @ {self:p}")) .field("mini_object", &self.mini_object) .finish() } @@ -784,7 +784,7 @@ pub struct GstRTSPServerClass { impl ::std::fmt::Debug for GstRTSPServerClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPServerClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPServerClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("create_client", &self.create_client) .field("client_connected", &self.client_connected) @@ -809,7 +809,7 @@ pub struct GstRTSPSessionClass { impl ::std::fmt::Debug for GstRTSPSessionClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPSessionClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPSessionClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -824,7 +824,7 @@ pub struct GstRTSPSessionMediaClass { impl ::std::fmt::Debug for GstRTSPSessionMediaClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPSessionMediaClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPSessionMediaClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -851,7 +851,7 @@ pub struct GstRTSPSessionPoolClass { impl ::std::fmt::Debug for GstRTSPSessionPoolClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPSessionPoolClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPSessionPoolClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("create_session_id", &self.create_session_id) .field("create_session", &self.create_session) @@ -885,7 +885,7 @@ pub struct GstRTSPStreamClass { impl ::std::fmt::Debug for GstRTSPStreamClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPStreamClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPStreamClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -908,7 +908,7 @@ pub struct GstRTSPStreamTransportClass { impl ::std::fmt::Debug for GstRTSPStreamTransportClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPStreamTransportClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPStreamTransportClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -933,7 +933,7 @@ pub struct GstRTSPThread { impl ::std::fmt::Debug for GstRTSPThread { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPThread @ {:p}", self)) + f.debug_struct(&format!("GstRTSPThread @ {self:p}")) .field("mini_object", &self.mini_object) .field("type_", &self.type_) .field("context", &self.context) @@ -964,7 +964,7 @@ pub struct GstRTSPThreadPoolClass { impl ::std::fmt::Debug for GstRTSPThreadPoolClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPThreadPoolClass @ {:p}", self)) + f.debug_struct(&format!("GstRTSPThreadPoolClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("pool", &self.pool) .field("get_thread", &self.get_thread) @@ -991,7 +991,7 @@ pub struct GstRTSPToken { impl ::std::fmt::Debug for GstRTSPToken { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPToken @ {:p}", self)) + f.debug_struct(&format!("GstRTSPToken @ {self:p}")) .field("mini_object", &self.mini_object) .finish() } @@ -1006,7 +1006,7 @@ pub struct GstSDPInfo { impl ::std::fmt::Debug for GstSDPInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSDPInfo @ {:p}", self)) + f.debug_struct(&format!("GstSDPInfo @ {self:p}")) .field("is_ipv6", &self.is_ipv6) .field("server_ip", &self.server_ip) .finish() @@ -1024,7 +1024,7 @@ pub struct GstRTSPAddressPool { impl ::std::fmt::Debug for GstRTSPAddressPool { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPAddressPool @ {:p}", self)) + f.debug_struct(&format!("GstRTSPAddressPool @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1040,7 +1040,7 @@ pub struct GstRTSPAuth { impl ::std::fmt::Debug for GstRTSPAuth { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPAuth @ {:p}", self)) + f.debug_struct(&format!("GstRTSPAuth @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1056,7 +1056,7 @@ pub struct GstRTSPClient { impl ::std::fmt::Debug for GstRTSPClient { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPClient @ {:p}", self)) + f.debug_struct(&format!("GstRTSPClient @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1072,7 +1072,7 @@ pub struct GstRTSPMedia { impl ::std::fmt::Debug for GstRTSPMedia { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPMedia @ {:p}", self)) + f.debug_struct(&format!("GstRTSPMedia @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1088,7 +1088,7 @@ pub struct GstRTSPMediaFactory { impl ::std::fmt::Debug for GstRTSPMediaFactory { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPMediaFactory @ {:p}", self)) + f.debug_struct(&format!("GstRTSPMediaFactory @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1104,7 +1104,7 @@ pub struct GstRTSPMediaFactoryURI { impl ::std::fmt::Debug for GstRTSPMediaFactoryURI { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPMediaFactoryURI @ {:p}", self)) + f.debug_struct(&format!("GstRTSPMediaFactoryURI @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1120,7 +1120,7 @@ pub struct GstRTSPMountPoints { impl ::std::fmt::Debug for GstRTSPMountPoints { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPMountPoints @ {:p}", self)) + f.debug_struct(&format!("GstRTSPMountPoints @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1135,7 +1135,7 @@ pub struct GstRTSPOnvifClient { impl ::std::fmt::Debug for GstRTSPOnvifClient { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPOnvifClient @ {:p}", self)) + f.debug_struct(&format!("GstRTSPOnvifClient @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1151,7 +1151,7 @@ pub struct GstRTSPOnvifMedia { impl ::std::fmt::Debug for GstRTSPOnvifMedia { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPOnvifMedia @ {:p}", self)) + f.debug_struct(&format!("GstRTSPOnvifMedia @ {self:p}")) .field("parent", &self.parent) .field("priv_", &self.priv_) .finish() @@ -1168,7 +1168,7 @@ pub struct GstRTSPOnvifMediaFactory { impl ::std::fmt::Debug for GstRTSPOnvifMediaFactory { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPOnvifMediaFactory @ {:p}", self)) + f.debug_struct(&format!("GstRTSPOnvifMediaFactory @ {self:p}")) .field("parent", &self.parent) .field("priv_", &self.priv_) .finish() @@ -1184,7 +1184,7 @@ pub struct GstRTSPOnvifServer { impl ::std::fmt::Debug for GstRTSPOnvifServer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPOnvifServer @ {:p}", self)) + f.debug_struct(&format!("GstRTSPOnvifServer @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1200,7 +1200,7 @@ pub struct GstRTSPServer { impl ::std::fmt::Debug for GstRTSPServer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPServer @ {:p}", self)) + f.debug_struct(&format!("GstRTSPServer @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1216,7 +1216,7 @@ pub struct GstRTSPSession { impl ::std::fmt::Debug for GstRTSPSession { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPSession @ {:p}", self)) + f.debug_struct(&format!("GstRTSPSession @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1232,7 +1232,7 @@ pub struct GstRTSPSessionMedia { impl ::std::fmt::Debug for GstRTSPSessionMedia { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPSessionMedia @ {:p}", self)) + f.debug_struct(&format!("GstRTSPSessionMedia @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1248,7 +1248,7 @@ pub struct GstRTSPSessionPool { impl ::std::fmt::Debug for GstRTSPSessionPool { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPSessionPool @ {:p}", self)) + f.debug_struct(&format!("GstRTSPSessionPool @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1264,7 +1264,7 @@ pub struct GstRTSPStream { impl ::std::fmt::Debug for GstRTSPStream { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPStream @ {:p}", self)) + f.debug_struct(&format!("GstRTSPStream @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1280,7 +1280,7 @@ pub struct GstRTSPStreamTransport { impl ::std::fmt::Debug for GstRTSPStreamTransport { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPStreamTransport @ {:p}", self)) + f.debug_struct(&format!("GstRTSPStreamTransport @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -1296,7 +1296,7 @@ pub struct GstRTSPThreadPool { impl ::std::fmt::Debug for GstRTSPThreadPool { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPThreadPool @ {:p}", self)) + f.debug_struct(&format!("GstRTSPThreadPool @ {self:p}")) .field("parent", &self.parent) .finish() } diff --git a/gstreamer-rtsp-server/sys/tests/abi.rs b/gstreamer-rtsp-server/sys/tests/abi.rs index b12aacf67..157f8952a 100644 --- a/gstreamer-rtsp-server/sys/tests/abi.rs +++ b/gstreamer-rtsp-server/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-rtsp/src/auto/flags.rs b/gstreamer-rtsp/src/auto/flags.rs index f65d6227d..0c247c144 100644 --- a/gstreamer-rtsp/src/auto/flags.rs +++ b/gstreamer-rtsp/src/auto/flags.rs @@ -14,9 +14,9 @@ bitflags! { #[doc(alias = "GstRTSPEvent")] pub struct RTSPEvent: u32 { #[doc(alias = "GST_RTSP_EV_READ")] - const READ = ffi::GST_RTSP_EV_READ as u32; + const READ = ffi::GST_RTSP_EV_READ as _; #[doc(alias = "GST_RTSP_EV_WRITE")] - const WRITE = ffi::GST_RTSP_EV_WRITE as u32; + const WRITE = ffi::GST_RTSP_EV_WRITE as _; } } @@ -74,15 +74,15 @@ bitflags! { #[doc(alias = "GstRTSPLowerTrans")] pub struct RTSPLowerTrans: u32 { #[doc(alias = "GST_RTSP_LOWER_TRANS_UDP")] - const UDP = ffi::GST_RTSP_LOWER_TRANS_UDP as u32; + const UDP = ffi::GST_RTSP_LOWER_TRANS_UDP as _; #[doc(alias = "GST_RTSP_LOWER_TRANS_UDP_MCAST")] - const UDP_MCAST = ffi::GST_RTSP_LOWER_TRANS_UDP_MCAST as u32; + const UDP_MCAST = ffi::GST_RTSP_LOWER_TRANS_UDP_MCAST as _; #[doc(alias = "GST_RTSP_LOWER_TRANS_TCP")] - const TCP = ffi::GST_RTSP_LOWER_TRANS_TCP as u32; + const TCP = ffi::GST_RTSP_LOWER_TRANS_TCP as _; #[doc(alias = "GST_RTSP_LOWER_TRANS_HTTP")] - const HTTP = ffi::GST_RTSP_LOWER_TRANS_HTTP as u32; + const HTTP = ffi::GST_RTSP_LOWER_TRANS_HTTP as _; #[doc(alias = "GST_RTSP_LOWER_TRANS_TLS")] - const TLS = ffi::GST_RTSP_LOWER_TRANS_TLS as u32; + const TLS = ffi::GST_RTSP_LOWER_TRANS_TLS as _; } } @@ -140,31 +140,31 @@ bitflags! { #[doc(alias = "GstRTSPMethod")] pub struct RTSPMethod: u32 { #[doc(alias = "GST_RTSP_DESCRIBE")] - const DESCRIBE = ffi::GST_RTSP_DESCRIBE as u32; + const DESCRIBE = ffi::GST_RTSP_DESCRIBE as _; #[doc(alias = "GST_RTSP_ANNOUNCE")] - const ANNOUNCE = ffi::GST_RTSP_ANNOUNCE as u32; + const ANNOUNCE = ffi::GST_RTSP_ANNOUNCE as _; #[doc(alias = "GST_RTSP_GET_PARAMETER")] - const GET_PARAMETER = ffi::GST_RTSP_GET_PARAMETER as u32; + const GET_PARAMETER = ffi::GST_RTSP_GET_PARAMETER as _; #[doc(alias = "GST_RTSP_OPTIONS")] - const OPTIONS = ffi::GST_RTSP_OPTIONS as u32; + const OPTIONS = ffi::GST_RTSP_OPTIONS as _; #[doc(alias = "GST_RTSP_PAUSE")] - const PAUSE = ffi::GST_RTSP_PAUSE as u32; + const PAUSE = ffi::GST_RTSP_PAUSE as _; #[doc(alias = "GST_RTSP_PLAY")] - const PLAY = ffi::GST_RTSP_PLAY as u32; + const PLAY = ffi::GST_RTSP_PLAY as _; #[doc(alias = "GST_RTSP_RECORD")] - const RECORD = ffi::GST_RTSP_RECORD as u32; + const RECORD = ffi::GST_RTSP_RECORD as _; #[doc(alias = "GST_RTSP_REDIRECT")] - const REDIRECT = ffi::GST_RTSP_REDIRECT as u32; + const REDIRECT = ffi::GST_RTSP_REDIRECT as _; #[doc(alias = "GST_RTSP_SETUP")] - const SETUP = ffi::GST_RTSP_SETUP as u32; + const SETUP = ffi::GST_RTSP_SETUP as _; #[doc(alias = "GST_RTSP_SET_PARAMETER")] - const SET_PARAMETER = ffi::GST_RTSP_SET_PARAMETER as u32; + const SET_PARAMETER = ffi::GST_RTSP_SET_PARAMETER as _; #[doc(alias = "GST_RTSP_TEARDOWN")] - const TEARDOWN = ffi::GST_RTSP_TEARDOWN as u32; + const TEARDOWN = ffi::GST_RTSP_TEARDOWN as _; #[doc(alias = "GST_RTSP_GET")] - const GET = ffi::GST_RTSP_GET as u32; + const GET = ffi::GST_RTSP_GET as _; #[doc(alias = "GST_RTSP_POST")] - const POST = ffi::GST_RTSP_POST as u32; + const POST = ffi::GST_RTSP_POST as _; } } @@ -230,13 +230,13 @@ bitflags! { #[doc(alias = "GstRTSPProfile")] pub struct RTSPProfile: u32 { #[doc(alias = "GST_RTSP_PROFILE_AVP")] - const AVP = ffi::GST_RTSP_PROFILE_AVP as u32; + const AVP = ffi::GST_RTSP_PROFILE_AVP as _; #[doc(alias = "GST_RTSP_PROFILE_SAVP")] - const SAVP = ffi::GST_RTSP_PROFILE_SAVP as u32; + const SAVP = ffi::GST_RTSP_PROFILE_SAVP as _; #[doc(alias = "GST_RTSP_PROFILE_AVPF")] - const AVPF = ffi::GST_RTSP_PROFILE_AVPF as u32; + const AVPF = ffi::GST_RTSP_PROFILE_AVPF as _; #[doc(alias = "GST_RTSP_PROFILE_SAVPF")] - const SAVPF = ffi::GST_RTSP_PROFILE_SAVPF as u32; + const SAVPF = ffi::GST_RTSP_PROFILE_SAVPF as _; } } @@ -294,9 +294,9 @@ bitflags! { #[doc(alias = "GstRTSPTransMode")] pub struct RTSPTransMode: u32 { #[doc(alias = "GST_RTSP_TRANS_RTP")] - const RTP = ffi::GST_RTSP_TRANS_RTP as u32; + const RTP = ffi::GST_RTSP_TRANS_RTP as _; #[doc(alias = "GST_RTSP_TRANS_RDT")] - const RDT = ffi::GST_RTSP_TRANS_RDT as u32; + const RDT = ffi::GST_RTSP_TRANS_RDT as _; } } diff --git a/gstreamer-rtsp/src/auto/versions.txt b/gstreamer-rtsp/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-rtsp/src/auto/versions.txt +++ b/gstreamer-rtsp/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-rtsp/sys/build.rs b/gstreamer-rtsp/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-rtsp/sys/build.rs +++ b/gstreamer-rtsp/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-rtsp/sys/src/auto/versions.txt b/gstreamer-rtsp/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-rtsp/sys/src/auto/versions.txt +++ b/gstreamer-rtsp/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-rtsp/sys/src/lib.rs b/gstreamer-rtsp/sys/src/lib.rs index 4d312384a..566fbdd95 100644 --- a/gstreamer-rtsp/sys/src/lib.rs +++ b/gstreamer-rtsp/sys/src/lib.rs @@ -283,7 +283,7 @@ pub union GstRTSPMessage_type_data { impl ::std::fmt::Debug for GstRTSPMessage_type_data { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPMessage_type_data @ {:p}", self)) + f.debug_struct(&format!("GstRTSPMessage_type_data @ {self:p}")) .field("request", unsafe { &self.request }) .field("response", unsafe { &self.response }) .field("data", unsafe { &self.data }) @@ -312,7 +312,7 @@ pub struct GstRTSPAuthCredential { impl ::std::fmt::Debug for GstRTSPAuthCredential { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPAuthCredential @ {:p}", self)) + f.debug_struct(&format!("GstRTSPAuthCredential @ {self:p}")) .field("scheme", &self.scheme) .field("params", &self.params) .field("authorization", &self.authorization) @@ -329,7 +329,7 @@ pub struct GstRTSPAuthParam { impl ::std::fmt::Debug for GstRTSPAuthParam { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPAuthParam @ {:p}", self)) + f.debug_struct(&format!("GstRTSPAuthParam @ {self:p}")) .field("name", &self.name) .field("value", &self.value) .finish() @@ -394,7 +394,7 @@ pub struct GstRTSPExtensionInterface { impl ::std::fmt::Debug for GstRTSPExtensionInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPExtensionInterface @ {:p}", self)) + f.debug_struct(&format!("GstRTSPExtensionInterface @ {self:p}")) .field("parent", &self.parent) .field("detect_server", &self.detect_server) .field("before_send", &self.before_send) @@ -424,7 +424,7 @@ pub struct GstRTSPMessage { impl ::std::fmt::Debug for GstRTSPMessage { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPMessage @ {:p}", self)) + f.debug_struct(&format!("GstRTSPMessage @ {self:p}")) .field("type_", &self.type_) .field("type_data", &self.type_data) .finish() @@ -439,7 +439,7 @@ pub struct GstRTSPMessage_type_data_data { impl ::std::fmt::Debug for GstRTSPMessage_type_data_data { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPMessage_type_data_data @ {:p}", self)) + f.debug_struct(&format!("GstRTSPMessage_type_data_data @ {self:p}")) .field("channel", &self.channel) .finish() } @@ -455,7 +455,7 @@ pub struct GstRTSPMessage_type_data_request { impl ::std::fmt::Debug for GstRTSPMessage_type_data_request { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPMessage_type_data_request @ {:p}", self)) + f.debug_struct(&format!("GstRTSPMessage_type_data_request @ {self:p}")) .field("method", &self.method) .field("uri", &self.uri) .field("version", &self.version) @@ -473,7 +473,7 @@ pub struct GstRTSPMessage_type_data_response { impl ::std::fmt::Debug for GstRTSPMessage_type_data_response { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPMessage_type_data_response @ {:p}", self)) + f.debug_struct(&format!("GstRTSPMessage_type_data_response @ {self:p}")) .field("code", &self.code) .field("reason", &self.reason) .field("version", &self.version) @@ -490,7 +490,7 @@ pub struct GstRTSPRange { impl ::std::fmt::Debug for GstRTSPRange { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPRange @ {:p}", self)) + f.debug_struct(&format!("GstRTSPRange @ {self:p}")) .field("min", &self.min) .field("max", &self.max) .finish() @@ -506,7 +506,7 @@ pub struct GstRTSPTime { impl ::std::fmt::Debug for GstRTSPTime { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPTime @ {:p}", self)) + f.debug_struct(&format!("GstRTSPTime @ {self:p}")) .field("type_", &self.type_) .field("seconds", &self.seconds) .finish() @@ -524,7 +524,7 @@ pub struct GstRTSPTime2 { impl ::std::fmt::Debug for GstRTSPTime2 { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPTime2 @ {:p}", self)) + f.debug_struct(&format!("GstRTSPTime2 @ {self:p}")) .field("frames", &self.frames) .field("year", &self.year) .field("month", &self.month) @@ -545,7 +545,7 @@ pub struct GstRTSPTimeRange { impl ::std::fmt::Debug for GstRTSPTimeRange { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPTimeRange @ {:p}", self)) + f.debug_struct(&format!("GstRTSPTimeRange @ {self:p}")) .field("unit", &self.unit) .field("min", &self.min) .field("max", &self.max) @@ -578,7 +578,7 @@ pub struct GstRTSPTransport { impl ::std::fmt::Debug for GstRTSPTransport { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPTransport @ {:p}", self)) + f.debug_struct(&format!("GstRTSPTransport @ {self:p}")) .field("trans", &self.trans) .field("profile", &self.profile) .field("lower_transport", &self.lower_transport) @@ -613,7 +613,7 @@ pub struct GstRTSPUrl { impl ::std::fmt::Debug for GstRTSPUrl { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPUrl @ {:p}", self)) + f.debug_struct(&format!("GstRTSPUrl @ {self:p}")) .field("transports", &self.transports) .field("family", &self.family) .field("user", &self.user) @@ -671,7 +671,7 @@ pub struct GstRTSPWatchFuncs { impl ::std::fmt::Debug for GstRTSPWatchFuncs { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRTSPWatchFuncs @ {:p}", self)) + f.debug_struct(&format!("GstRTSPWatchFuncs @ {self:p}")) .field("message_received", &self.message_received) .field("message_sent", &self.message_sent) .field("closed", &self.closed) @@ -694,7 +694,7 @@ pub struct GstRTSPExtension { impl ::std::fmt::Debug for GstRTSPExtension { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstRTSPExtension @ {:p}", self) + write!(f, "GstRTSPExtension @ {self:p}") } } diff --git a/gstreamer-rtsp/sys/tests/abi.rs b/gstreamer-rtsp/sys/tests/abi.rs index 0458aa1c7..8142ff5c3 100644 --- a/gstreamer-rtsp/sys/tests/abi.rs +++ b/gstreamer-rtsp/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-sdp/src/auto/versions.txt b/gstreamer-sdp/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-sdp/src/auto/versions.txt +++ b/gstreamer-sdp/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-sdp/sys/build.rs b/gstreamer-sdp/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-sdp/sys/build.rs +++ b/gstreamer-sdp/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-sdp/sys/src/auto/versions.txt b/gstreamer-sdp/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-sdp/sys/src/auto/versions.txt +++ b/gstreamer-sdp/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-sdp/sys/src/lib.rs b/gstreamer-sdp/sys/src/lib.rs index 595926233..b1d9119d6 100644 --- a/gstreamer-sdp/sys/src/lib.rs +++ b/gstreamer-sdp/sys/src/lib.rs @@ -143,7 +143,7 @@ pub struct GstMIKEYMapSRTP { impl ::std::fmt::Debug for GstMIKEYMapSRTP { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMIKEYMapSRTP @ {:p}", self)) + f.debug_struct(&format!("GstMIKEYMapSRTP @ {self:p}")) .field("policy", &self.policy) .field("ssrc", &self.ssrc) .field("roc", &self.roc) @@ -167,7 +167,7 @@ pub struct GstMIKEYMessage { impl ::std::fmt::Debug for GstMIKEYMessage { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMIKEYMessage @ {:p}", self)) + f.debug_struct(&format!("GstMIKEYMessage @ {self:p}")) .field("version", &self.version) .field("type_", &self.type_) .field("V", &self.V) @@ -190,7 +190,7 @@ pub struct GstMIKEYPayload { impl ::std::fmt::Debug for GstMIKEYPayload { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMIKEYPayload @ {:p}", self)) + f.debug_struct(&format!("GstMIKEYPayload @ {self:p}")) .field("type_", &self.type_) .field("len", &self.len) .finish() @@ -208,7 +208,7 @@ pub struct GstMIKEYPayloadKEMAC { impl ::std::fmt::Debug for GstMIKEYPayloadKEMAC { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMIKEYPayloadKEMAC @ {:p}", self)) + f.debug_struct(&format!("GstMIKEYPayloadKEMAC @ {self:p}")) .field("pt", &self.pt) .field("enc_alg", &self.enc_alg) .field("mac_alg", &self.mac_alg) @@ -233,7 +233,7 @@ pub struct GstMIKEYPayloadKeyData { impl ::std::fmt::Debug for GstMIKEYPayloadKeyData { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMIKEYPayloadKeyData @ {:p}", self)) + f.debug_struct(&format!("GstMIKEYPayloadKeyData @ {self:p}")) .field("pt", &self.pt) .field("key_type", &self.key_type) .field("key_len", &self.key_len) @@ -258,7 +258,7 @@ pub struct GstMIKEYPayloadPKE { impl ::std::fmt::Debug for GstMIKEYPayloadPKE { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMIKEYPayloadPKE @ {:p}", self)) + f.debug_struct(&format!("GstMIKEYPayloadPKE @ {self:p}")) .field("pt", &self.pt) .field("C", &self.C) .field("data_len", &self.data_len) @@ -277,7 +277,7 @@ pub struct GstMIKEYPayloadRAND { impl ::std::fmt::Debug for GstMIKEYPayloadRAND { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMIKEYPayloadRAND @ {:p}", self)) + f.debug_struct(&format!("GstMIKEYPayloadRAND @ {self:p}")) .field("pt", &self.pt) .field("len", &self.len) .field("rand", &self.rand) @@ -296,7 +296,7 @@ pub struct GstMIKEYPayloadSP { impl ::std::fmt::Debug for GstMIKEYPayloadSP { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMIKEYPayloadSP @ {:p}", self)) + f.debug_struct(&format!("GstMIKEYPayloadSP @ {self:p}")) .field("pt", &self.pt) .field("policy", &self.policy) .field("proto", &self.proto) @@ -315,7 +315,7 @@ pub struct GstMIKEYPayloadSPParam { impl ::std::fmt::Debug for GstMIKEYPayloadSPParam { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMIKEYPayloadSPParam @ {:p}", self)) + f.debug_struct(&format!("GstMIKEYPayloadSPParam @ {self:p}")) .field("type_", &self.type_) .field("len", &self.len) .field("val", &self.val) @@ -333,7 +333,7 @@ pub struct GstMIKEYPayloadT { impl ::std::fmt::Debug for GstMIKEYPayloadT { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMIKEYPayloadT @ {:p}", self)) + f.debug_struct(&format!("GstMIKEYPayloadT @ {self:p}")) .field("pt", &self.pt) .field("type_", &self.type_) .field("ts_value", &self.ts_value) @@ -350,7 +350,7 @@ pub struct GstSDPAttribute { impl ::std::fmt::Debug for GstSDPAttribute { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSDPAttribute @ {:p}", self)) + f.debug_struct(&format!("GstSDPAttribute @ {self:p}")) .field("key", &self.key) .field("value", &self.value) .finish() @@ -366,7 +366,7 @@ pub struct GstSDPBandwidth { impl ::std::fmt::Debug for GstSDPBandwidth { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSDPBandwidth @ {:p}", self)) + f.debug_struct(&format!("GstSDPBandwidth @ {self:p}")) .field("bwtype", &self.bwtype) .field("bandwidth", &self.bandwidth) .finish() @@ -385,7 +385,7 @@ pub struct GstSDPConnection { impl ::std::fmt::Debug for GstSDPConnection { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSDPConnection @ {:p}", self)) + f.debug_struct(&format!("GstSDPConnection @ {self:p}")) .field("nettype", &self.nettype) .field("addrtype", &self.addrtype) .field("address", &self.address) @@ -404,7 +404,7 @@ pub struct GstSDPKey { impl ::std::fmt::Debug for GstSDPKey { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSDPKey @ {:p}", self)) + f.debug_struct(&format!("GstSDPKey @ {self:p}")) .field("type_", &self.type_) .field("data", &self.data) .finish() @@ -428,7 +428,7 @@ pub struct GstSDPMedia { impl ::std::fmt::Debug for GstSDPMedia { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSDPMedia @ {:p}", self)) + f.debug_struct(&format!("GstSDPMedia @ {self:p}")) .field("media", &self.media) .field("port", &self.port) .field("num_ports", &self.num_ports) @@ -464,7 +464,7 @@ pub struct GstSDPMessage { impl ::std::fmt::Debug for GstSDPMessage { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSDPMessage @ {:p}", self)) + f.debug_struct(&format!("GstSDPMessage @ {self:p}")) .field("version", &self.version) .field("origin", &self.origin) .field("session_name", &self.session_name) @@ -496,7 +496,7 @@ pub struct GstSDPOrigin { impl ::std::fmt::Debug for GstSDPOrigin { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSDPOrigin @ {:p}", self)) + f.debug_struct(&format!("GstSDPOrigin @ {self:p}")) .field("username", &self.username) .field("sess_id", &self.sess_id) .field("sess_version", &self.sess_version) @@ -517,7 +517,7 @@ pub struct GstSDPTime { impl ::std::fmt::Debug for GstSDPTime { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSDPTime @ {:p}", self)) + f.debug_struct(&format!("GstSDPTime @ {self:p}")) .field("start", &self.start) .field("stop", &self.stop) .field("repeat", &self.repeat) @@ -534,7 +534,7 @@ pub struct GstSDPZone { impl ::std::fmt::Debug for GstSDPZone { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSDPZone @ {:p}", self)) + f.debug_struct(&format!("GstSDPZone @ {self:p}")) .field("time", &self.time) .field("typed_time", &self.typed_time) .finish() diff --git a/gstreamer-sdp/sys/tests/abi.rs b/gstreamer-sdp/sys/tests/abi.rs index 46a35adbd..7fe0800ea 100644 --- a/gstreamer-sdp/sys/tests/abi.rs +++ b/gstreamer-sdp/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-tag/sys/build.rs b/gstreamer-tag/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-tag/sys/build.rs +++ b/gstreamer-tag/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-tag/sys/src/auto/versions.txt b/gstreamer-tag/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-tag/sys/src/auto/versions.txt +++ b/gstreamer-tag/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-tag/sys/src/lib.rs b/gstreamer-tag/sys/src/lib.rs index 4635bb1e4..0eec7ff43 100644 --- a/gstreamer-tag/sys/src/lib.rs +++ b/gstreamer-tag/sys/src/lib.rs @@ -175,7 +175,7 @@ pub struct GstTagDemuxClass { impl ::std::fmt::Debug for GstTagDemuxClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTagDemuxClass @ {:p}", self)) + f.debug_struct(&format!("GstTagDemuxClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("min_start_size", &self.min_start_size) .field("min_end_size", &self.min_end_size) @@ -207,7 +207,7 @@ pub struct GstTagMuxClass { impl ::std::fmt::Debug for GstTagMuxClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTagMuxClass @ {:p}", self)) + f.debug_struct(&format!("GstTagMuxClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("render_start_tag", &self.render_start_tag) .field("render_end_tag", &self.render_end_tag) @@ -231,7 +231,7 @@ pub struct GstTagXmpWriterInterface { impl ::std::fmt::Debug for GstTagXmpWriterInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTagXmpWriterInterface @ {:p}", self)) + f.debug_struct(&format!("GstTagXmpWriterInterface @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -248,7 +248,7 @@ pub struct GstTagDemux { impl ::std::fmt::Debug for GstTagDemux { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTagDemux @ {:p}", self)) + f.debug_struct(&format!("GstTagDemux @ {self:p}")) .field("element", &self.element) .finish() } @@ -264,7 +264,7 @@ pub struct GstTagMux { impl ::std::fmt::Debug for GstTagMux { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTagMux @ {:p}", self)) + f.debug_struct(&format!("GstTagMux @ {self:p}")) .field("element", &self.element) .finish() } @@ -279,7 +279,7 @@ pub struct GstTagXmpWriter { impl ::std::fmt::Debug for GstTagXmpWriter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstTagXmpWriter @ {:p}", self) + write!(f, "GstTagXmpWriter @ {self:p}") } } diff --git a/gstreamer-tag/sys/tests/abi.rs b/gstreamer-tag/sys/tests/abi.rs index 57b12c70a..772e3d86e 100644 --- a/gstreamer-tag/sys/tests/abi.rs +++ b/gstreamer-tag/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-validate/src/auto/flags.rs b/gstreamer-validate/src/auto/flags.rs index 882824c47..4f6f66d39 100644 --- a/gstreamer-validate/src/auto/flags.rs +++ b/gstreamer-validate/src/auto/flags.rs @@ -14,13 +14,13 @@ bitflags! { #[doc(alias = "GstValidateIssueFlags")] pub struct IssueFlags: u32 { #[doc(alias = "GST_VALIDATE_ISSUE_FLAGS_NONE")] - const NONE = ffi::GST_VALIDATE_ISSUE_FLAGS_NONE as u32; + const NONE = ffi::GST_VALIDATE_ISSUE_FLAGS_NONE as _; #[doc(alias = "GST_VALIDATE_ISSUE_FLAGS_FULL_DETAILS")] - const FULL_DETAILS = ffi::GST_VALIDATE_ISSUE_FLAGS_FULL_DETAILS as u32; + const FULL_DETAILS = ffi::GST_VALIDATE_ISSUE_FLAGS_FULL_DETAILS as _; #[doc(alias = "GST_VALIDATE_ISSUE_FLAGS_NO_BACKTRACE")] - const NO_BACKTRACE = ffi::GST_VALIDATE_ISSUE_FLAGS_NO_BACKTRACE as u32; + const NO_BACKTRACE = ffi::GST_VALIDATE_ISSUE_FLAGS_NO_BACKTRACE as _; #[doc(alias = "GST_VALIDATE_ISSUE_FLAGS_FORCE_BACKTRACE")] - const FORCE_BACKTRACE = ffi::GST_VALIDATE_ISSUE_FLAGS_FORCE_BACKTRACE as u32; + const FORCE_BACKTRACE = ffi::GST_VALIDATE_ISSUE_FLAGS_FORCE_BACKTRACE as _; } } diff --git a/gstreamer-validate/src/auto/versions.txt b/gstreamer-validate/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-validate/src/auto/versions.txt +++ b/gstreamer-validate/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-validate/sys/build.rs b/gstreamer-validate/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-validate/sys/build.rs +++ b/gstreamer-validate/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-validate/sys/src/auto/versions.txt b/gstreamer-validate/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-validate/sys/src/auto/versions.txt +++ b/gstreamer-validate/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-validate/sys/src/lib.rs b/gstreamer-validate/sys/src/lib.rs index 3911e57ba..2b2c42c9e 100644 --- a/gstreamer-validate/sys/src/lib.rs +++ b/gstreamer-validate/sys/src/lib.rs @@ -171,7 +171,7 @@ pub struct GstValidateAction { impl ::std::fmt::Debug for GstValidateAction { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateAction @ {:p}", self)) + f.debug_struct(&format!("GstValidateAction @ {self:p}")) .field("mini_object", &self.mini_object) .field("type_", &self.type_) .field("name", &self.name) @@ -194,7 +194,7 @@ pub struct GstValidateActionParameter { impl ::std::fmt::Debug for GstValidateActionParameter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateActionParameter @ {:p}", self)) + f.debug_struct(&format!("GstValidateActionParameter @ {self:p}")) .field("name", &self.name) .field("description", &self.description) .field("mandatory", &self.mandatory) @@ -232,7 +232,7 @@ pub struct GstValidateActionType { impl ::std::fmt::Debug for GstValidateActionType { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateActionType @ {:p}", self)) + f.debug_struct(&format!("GstValidateActionType @ {self:p}")) .field("mini_object", &self.mini_object) .field("name", &self.name) .field("implementer_namespace", &self.implementer_namespace) @@ -265,7 +265,7 @@ pub struct GstValidateBinMonitorClass { impl ::std::fmt::Debug for GstValidateBinMonitorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateBinMonitorClass @ {:p}", self)) + f.debug_struct(&format!("GstValidateBinMonitorClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -280,7 +280,7 @@ pub struct GstValidateElementMonitorClass { impl ::std::fmt::Debug for GstValidateElementMonitorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateElementMonitorClass @ {:p}", self)) + f.debug_struct(&format!("GstValidateElementMonitorClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -302,7 +302,7 @@ pub struct GstValidateIssue { impl ::std::fmt::Debug for GstValidateIssue { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateIssue @ {:p}", self)) + f.debug_struct(&format!("GstValidateIssue @ {self:p}")) .field("issue_id", &self.issue_id) .field("summary", &self.summary) .field("description", &self.description) @@ -325,7 +325,7 @@ pub struct GstValidateMediaDescriptorClass { impl ::std::fmt::Debug for GstValidateMediaDescriptorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateMediaDescriptorClass @ {:p}", self)) + f.debug_struct(&format!("GstValidateMediaDescriptorClass @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -340,12 +340,9 @@ pub struct GstValidateMediaDescriptorParserClass { impl ::std::fmt::Debug for GstValidateMediaDescriptorParserClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!( - "GstValidateMediaDescriptorParserClass @ {:p}", - self - )) - .field("parent", &self.parent) - .finish() + f.debug_struct(&format!("GstValidateMediaDescriptorParserClass @ {self:p}")) + .field("parent", &self.parent) + .finish() } } @@ -374,12 +371,9 @@ pub struct GstValidateMediaDescriptorWriterClass { impl ::std::fmt::Debug for GstValidateMediaDescriptorWriterClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!( - "GstValidateMediaDescriptorWriterClass @ {:p}", - self - )) - .field("parent", &self.parent) - .finish() + f.debug_struct(&format!("GstValidateMediaDescriptorWriterClass @ {self:p}")) + .field("parent", &self.parent) + .finish() } } @@ -409,7 +403,7 @@ pub struct GstValidateMediaInfo { impl ::std::fmt::Debug for GstValidateMediaInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateMediaInfo @ {:p}", self)) + f.debug_struct(&format!("GstValidateMediaInfo @ {self:p}")) .field("duration", &self.duration) .field("is_image", &self.is_image) .field("file_size", &self.file_size) @@ -437,7 +431,7 @@ pub struct GstValidateMonitorClass { impl ::std::fmt::Debug for GstValidateMonitorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateMonitorClass @ {:p}", self)) + f.debug_struct(&format!("GstValidateMonitorClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("setup", &self.setup) .field("get_element", &self.get_element) @@ -458,7 +452,7 @@ pub struct GstValidateOverrideClass { impl ::std::fmt::Debug for GstValidateOverrideClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateOverrideClass @ {:p}", self)) + f.debug_struct(&format!("GstValidateOverrideClass @ {self:p}")) .field("can_attach", &self.can_attach) .field("attached", &self.attached) .finish() @@ -485,7 +479,7 @@ pub struct GstValidateOverrideRegistry { impl ::std::fmt::Debug for GstValidateOverrideRegistry { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateOverrideRegistry @ {:p}", self)) + f.debug_struct(&format!("GstValidateOverrideRegistry @ {self:p}")) .field("mutex", &self.mutex) .field("name_overrides", &self.name_overrides) .field("gtype_overrides", &self.gtype_overrides) @@ -503,7 +497,7 @@ pub struct GstValidatePadMonitorClass { impl ::std::fmt::Debug for GstValidatePadMonitorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidatePadMonitorClass @ {:p}", self)) + f.debug_struct(&format!("GstValidatePadMonitorClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -526,7 +520,7 @@ pub struct GstValidatePipelineMonitorClass { impl ::std::fmt::Debug for GstValidatePipelineMonitorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidatePipelineMonitorClass @ {:p}", self)) + f.debug_struct(&format!("GstValidatePipelineMonitorClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -554,7 +548,7 @@ pub struct GstValidateReport { impl ::std::fmt::Debug for GstValidateReport { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateReport @ {:p}", self)) + f.debug_struct(&format!("GstValidateReport @ {self:p}")) .field("mini_object", &self.mini_object) .field("issue", &self.issue) .field("level", &self.level) @@ -593,7 +587,7 @@ pub struct GstValidateReporterInterface { impl ::std::fmt::Debug for GstValidateReporterInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateReporterInterface @ {:p}", self)) + f.debug_struct(&format!("GstValidateReporterInterface @ {self:p}")) .field("parent", &self.parent) .field("intercept_report", &self.intercept_report) .field("get_reporting_level", &self.get_reporting_level) @@ -611,7 +605,7 @@ pub struct GstValidateRunnerClass { impl ::std::fmt::Debug for GstValidateRunnerClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateRunnerClass @ {:p}", self)) + f.debug_struct(&format!("GstValidateRunnerClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -634,7 +628,7 @@ pub struct GstValidateScenarioClass { impl ::std::fmt::Debug for GstValidateScenarioClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateScenarioClass @ {:p}", self)) + f.debug_struct(&format!("GstValidateScenarioClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -670,7 +664,7 @@ pub struct GstValidateBinMonitor { impl ::std::fmt::Debug for GstValidateBinMonitor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateBinMonitor @ {:p}", self)) + f.debug_struct(&format!("GstValidateBinMonitor @ {self:p}")) .field("parent", &self.parent) .field("element_monitors", &self.element_monitors) .field("scenario", &self.scenario) @@ -694,7 +688,7 @@ pub struct GstValidateElementMonitor { impl ::std::fmt::Debug for GstValidateElementMonitor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateElementMonitor @ {:p}", self)) + f.debug_struct(&format!("GstValidateElementMonitor @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -711,7 +705,7 @@ pub struct GstValidateMediaDescriptor { impl ::std::fmt::Debug for GstValidateMediaDescriptor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateMediaDescriptor @ {:p}", self)) + f.debug_struct(&format!("GstValidateMediaDescriptor @ {self:p}")) .field("parent", &self.parent) .field("lock", &self.lock) .finish() @@ -728,7 +722,7 @@ pub struct GstValidateMediaDescriptorParser { impl ::std::fmt::Debug for GstValidateMediaDescriptorParser { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateMediaDescriptorParser @ {:p}", self)) + f.debug_struct(&format!("GstValidateMediaDescriptorParser @ {self:p}")) .field("parent", &self.parent) .field("priv_", &self.priv_) .finish() @@ -745,7 +739,7 @@ pub struct GstValidateMediaDescriptorWriter { impl ::std::fmt::Debug for GstValidateMediaDescriptorWriter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateMediaDescriptorWriter @ {:p}", self)) + f.debug_struct(&format!("GstValidateMediaDescriptorWriter @ {self:p}")) .field("parent", &self.parent) .field("priv_", &self.priv_) .finish() @@ -772,7 +766,7 @@ pub struct GstValidateMonitor { impl ::std::fmt::Debug for GstValidateMonitor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateMonitor @ {:p}", self)) + f.debug_struct(&format!("GstValidateMonitor @ {self:p}")) .field("object", &self.object) .field("target", &self.target) .field("pipeline", &self.pipeline) @@ -804,7 +798,7 @@ pub struct GstValidateOverride { impl ::std::fmt::Debug for GstValidateOverride { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateOverride @ {:p}", self)) + f.debug_struct(&format!("GstValidateOverride @ {self:p}")) .field("parent", &self.parent) .field("buffer_handler", &self.buffer_handler) .field("event_handler", &self.event_handler) @@ -868,7 +862,7 @@ pub struct GstValidatePadMonitor { impl ::std::fmt::Debug for GstValidatePadMonitor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidatePadMonitor @ {:p}", self)) + f.debug_struct(&format!("GstValidatePadMonitor @ {self:p}")) .field("parent", &self.parent) .field("setup", &self.setup) .field("chain_func", &self.chain_func) @@ -900,7 +894,7 @@ pub struct GstValidatePipelineMonitor { impl ::std::fmt::Debug for GstValidatePipelineMonitor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidatePipelineMonitor @ {:p}", self)) + f.debug_struct(&format!("GstValidatePipelineMonitor @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -916,7 +910,7 @@ pub struct GstValidateRunner { impl ::std::fmt::Debug for GstValidateRunner { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateRunner @ {:p}", self)) + f.debug_struct(&format!("GstValidateRunner @ {self:p}")) .field("object", &self.object) .finish() } @@ -934,7 +928,7 @@ pub struct GstValidateScenario { impl ::std::fmt::Debug for GstValidateScenario { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValidateScenario @ {:p}", self)) + f.debug_struct(&format!("GstValidateScenario @ {self:p}")) .field("parent", &self.parent) .field("description", &self.description) .finish() @@ -950,7 +944,7 @@ pub struct GstValidateReporter { impl ::std::fmt::Debug for GstValidateReporter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstValidateReporter @ {:p}", self) + write!(f, "GstValidateReporter @ {self:p}") } } diff --git a/gstreamer-validate/sys/tests/abi.rs b/gstreamer-validate/sys/tests/abi.rs index 2dbd527d9..f847b5afb 100644 --- a/gstreamer-validate/sys/tests/abi.rs +++ b/gstreamer-validate/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-video/src/auto/flags.rs b/gstreamer-video/src/auto/flags.rs index 9d4e92d3c..922a48899 100644 --- a/gstreamer-video/src/auto/flags.rs +++ b/gstreamer-video/src/auto/flags.rs @@ -17,29 +17,29 @@ bitflags! { #[doc(alias = "GstNavigationModifierType")] pub struct NavigationModifierType: u32 { #[doc(alias = "GST_NAVIGATION_MODIFIER_SHIFT_MASK")] - const SHIFT_MASK = ffi::GST_NAVIGATION_MODIFIER_SHIFT_MASK as u32; + const SHIFT_MASK = ffi::GST_NAVIGATION_MODIFIER_SHIFT_MASK as _; #[doc(alias = "GST_NAVIGATION_MODIFIER_LOCK_MASK")] - const LOCK_MASK = ffi::GST_NAVIGATION_MODIFIER_LOCK_MASK as u32; + const LOCK_MASK = ffi::GST_NAVIGATION_MODIFIER_LOCK_MASK as _; #[doc(alias = "GST_NAVIGATION_MODIFIER_CONTROL_MASK")] - const CONTROL_MASK = ffi::GST_NAVIGATION_MODIFIER_CONTROL_MASK as u32; + const CONTROL_MASK = ffi::GST_NAVIGATION_MODIFIER_CONTROL_MASK as _; #[doc(alias = "GST_NAVIGATION_MODIFIER_ALT_MASK")] - const ALT_MASK = ffi::GST_NAVIGATION_MODIFIER_ALT_MASK as u32; + const ALT_MASK = ffi::GST_NAVIGATION_MODIFIER_ALT_MASK as _; #[doc(alias = "GST_NAVIGATION_MODIFIER_BUTTON1_MASK")] - const BUTTON1_MASK = ffi::GST_NAVIGATION_MODIFIER_BUTTON1_MASK as u32; + const BUTTON1_MASK = ffi::GST_NAVIGATION_MODIFIER_BUTTON1_MASK as _; #[doc(alias = "GST_NAVIGATION_MODIFIER_BUTTON2_MASK")] - const BUTTON2_MASK = ffi::GST_NAVIGATION_MODIFIER_BUTTON2_MASK as u32; + const BUTTON2_MASK = ffi::GST_NAVIGATION_MODIFIER_BUTTON2_MASK as _; #[doc(alias = "GST_NAVIGATION_MODIFIER_BUTTON3_MASK")] - const BUTTON3_MASK = ffi::GST_NAVIGATION_MODIFIER_BUTTON3_MASK as u32; + const BUTTON3_MASK = ffi::GST_NAVIGATION_MODIFIER_BUTTON3_MASK as _; #[doc(alias = "GST_NAVIGATION_MODIFIER_BUTTON4_MASK")] - const BUTTON4_MASK = ffi::GST_NAVIGATION_MODIFIER_BUTTON4_MASK as u32; + const BUTTON4_MASK = ffi::GST_NAVIGATION_MODIFIER_BUTTON4_MASK as _; #[doc(alias = "GST_NAVIGATION_MODIFIER_BUTTON5_MASK")] - const BUTTON5_MASK = ffi::GST_NAVIGATION_MODIFIER_BUTTON5_MASK as u32; + const BUTTON5_MASK = ffi::GST_NAVIGATION_MODIFIER_BUTTON5_MASK as _; #[doc(alias = "GST_NAVIGATION_MODIFIER_SUPER_MASK")] - const SUPER_MASK = ffi::GST_NAVIGATION_MODIFIER_SUPER_MASK as u32; + const SUPER_MASK = ffi::GST_NAVIGATION_MODIFIER_SUPER_MASK as _; #[doc(alias = "GST_NAVIGATION_MODIFIER_HYPER_MASK")] - const HYPER_MASK = ffi::GST_NAVIGATION_MODIFIER_HYPER_MASK as u32; + const HYPER_MASK = ffi::GST_NAVIGATION_MODIFIER_HYPER_MASK as _; #[doc(alias = "GST_NAVIGATION_MODIFIER_META_MASK")] - const META_MASK = ffi::GST_NAVIGATION_MODIFIER_META_MASK as u32; + const META_MASK = ffi::GST_NAVIGATION_MODIFIER_META_MASK as _; } } @@ -109,29 +109,29 @@ bitflags! { #[doc(alias = "GstVideoBufferFlags")] pub struct VideoBufferFlags: u32 { #[doc(alias = "GST_VIDEO_BUFFER_FLAG_INTERLACED")] - const INTERLACED = ffi::GST_VIDEO_BUFFER_FLAG_INTERLACED as u32; + const INTERLACED = ffi::GST_VIDEO_BUFFER_FLAG_INTERLACED as _; #[doc(alias = "GST_VIDEO_BUFFER_FLAG_TFF")] - const TFF = ffi::GST_VIDEO_BUFFER_FLAG_TFF as u32; + const TFF = ffi::GST_VIDEO_BUFFER_FLAG_TFF as _; #[doc(alias = "GST_VIDEO_BUFFER_FLAG_RFF")] - const RFF = ffi::GST_VIDEO_BUFFER_FLAG_RFF as u32; + const RFF = ffi::GST_VIDEO_BUFFER_FLAG_RFF as _; #[doc(alias = "GST_VIDEO_BUFFER_FLAG_ONEFIELD")] - const ONEFIELD = ffi::GST_VIDEO_BUFFER_FLAG_ONEFIELD as u32; + const ONEFIELD = ffi::GST_VIDEO_BUFFER_FLAG_ONEFIELD as _; #[doc(alias = "GST_VIDEO_BUFFER_FLAG_MULTIPLE_VIEW")] - const MULTIPLE_VIEW = ffi::GST_VIDEO_BUFFER_FLAG_MULTIPLE_VIEW as u32; + const MULTIPLE_VIEW = ffi::GST_VIDEO_BUFFER_FLAG_MULTIPLE_VIEW as _; #[doc(alias = "GST_VIDEO_BUFFER_FLAG_FIRST_IN_BUNDLE")] - const FIRST_IN_BUNDLE = ffi::GST_VIDEO_BUFFER_FLAG_FIRST_IN_BUNDLE as u32; + const FIRST_IN_BUNDLE = ffi::GST_VIDEO_BUFFER_FLAG_FIRST_IN_BUNDLE as _; #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] #[doc(alias = "GST_VIDEO_BUFFER_FLAG_TOP_FIELD")] - const TOP_FIELD = ffi::GST_VIDEO_BUFFER_FLAG_TOP_FIELD as u32; + const TOP_FIELD = ffi::GST_VIDEO_BUFFER_FLAG_TOP_FIELD as _; #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] #[doc(alias = "GST_VIDEO_BUFFER_FLAG_BOTTOM_FIELD")] - const BOTTOM_FIELD = ffi::GST_VIDEO_BUFFER_FLAG_BOTTOM_FIELD as u32; + const BOTTOM_FIELD = ffi::GST_VIDEO_BUFFER_FLAG_BOTTOM_FIELD as _; #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] #[doc(alias = "GST_VIDEO_BUFFER_FLAG_MARKER")] - const MARKER = ffi::GST_VIDEO_BUFFER_FLAG_MARKER as u32; + const MARKER = ffi::GST_VIDEO_BUFFER_FLAG_MARKER as _; } } @@ -189,21 +189,21 @@ bitflags! { #[doc(alias = "GstVideoChromaSite")] pub struct VideoChromaSite: u32 { #[doc(alias = "GST_VIDEO_CHROMA_SITE_NONE")] - const NONE = ffi::GST_VIDEO_CHROMA_SITE_NONE as u32; + const NONE = ffi::GST_VIDEO_CHROMA_SITE_NONE as _; #[doc(alias = "GST_VIDEO_CHROMA_SITE_H_COSITED")] - const H_COSITED = ffi::GST_VIDEO_CHROMA_SITE_H_COSITED as u32; + const H_COSITED = ffi::GST_VIDEO_CHROMA_SITE_H_COSITED as _; #[doc(alias = "GST_VIDEO_CHROMA_SITE_V_COSITED")] - const V_COSITED = ffi::GST_VIDEO_CHROMA_SITE_V_COSITED as u32; + const V_COSITED = ffi::GST_VIDEO_CHROMA_SITE_V_COSITED as _; #[doc(alias = "GST_VIDEO_CHROMA_SITE_ALT_LINE")] - const ALT_LINE = ffi::GST_VIDEO_CHROMA_SITE_ALT_LINE as u32; + const ALT_LINE = ffi::GST_VIDEO_CHROMA_SITE_ALT_LINE as _; #[doc(alias = "GST_VIDEO_CHROMA_SITE_COSITED")] - const COSITED = ffi::GST_VIDEO_CHROMA_SITE_COSITED as u32; + const COSITED = ffi::GST_VIDEO_CHROMA_SITE_COSITED as _; #[doc(alias = "GST_VIDEO_CHROMA_SITE_JPEG")] - const JPEG = ffi::GST_VIDEO_CHROMA_SITE_JPEG as u32; + const JPEG = ffi::GST_VIDEO_CHROMA_SITE_JPEG as _; #[doc(alias = "GST_VIDEO_CHROMA_SITE_MPEG2")] - const MPEG2 = ffi::GST_VIDEO_CHROMA_SITE_MPEG2 as u32; + const MPEG2 = ffi::GST_VIDEO_CHROMA_SITE_MPEG2 as _; #[doc(alias = "GST_VIDEO_CHROMA_SITE_DV")] - const DV = ffi::GST_VIDEO_CHROMA_SITE_DV as u32; + const DV = ffi::GST_VIDEO_CHROMA_SITE_DV as _; } } @@ -278,17 +278,17 @@ bitflags! { #[doc(alias = "GstVideoCodecFrameFlags")] pub struct VideoCodecFrameFlags: u32 { #[doc(alias = "GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY")] - const DECODE_ONLY = ffi::GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY as u32; + const DECODE_ONLY = ffi::GST_VIDEO_CODEC_FRAME_FLAG_DECODE_ONLY as _; #[doc(alias = "GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT")] - const SYNC_POINT = ffi::GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT as u32; + const SYNC_POINT = ffi::GST_VIDEO_CODEC_FRAME_FLAG_SYNC_POINT as _; #[doc(alias = "GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME")] - const FORCE_KEYFRAME = ffi::GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME as u32; + const FORCE_KEYFRAME = ffi::GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME as _; #[doc(alias = "GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS")] - const FORCE_KEYFRAME_HEADERS = ffi::GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS as u32; + const FORCE_KEYFRAME_HEADERS = ffi::GST_VIDEO_CODEC_FRAME_FLAG_FORCE_KEYFRAME_HEADERS as _; #[cfg(any(feature = "v1_20", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_20")))] #[doc(alias = "GST_VIDEO_CODEC_FRAME_FLAG_CORRUPTED")] - const CORRUPTED = ffi::GST_VIDEO_CODEC_FRAME_FLAG_CORRUPTED as u32; + const CORRUPTED = ffi::GST_VIDEO_CODEC_FRAME_FLAG_CORRUPTED as _; } } @@ -356,9 +356,9 @@ bitflags! { #[doc(alias = "GstVideoDecoderRequestSyncPointFlags")] pub struct VideoDecoderRequestSyncPointFlags: u32 { #[doc(alias = "GST_VIDEO_DECODER_REQUEST_SYNC_POINT_DISCARD_INPUT")] - const DISCARD_INPUT = ffi::GST_VIDEO_DECODER_REQUEST_SYNC_POINT_DISCARD_INPUT as u32; + const DISCARD_INPUT = ffi::GST_VIDEO_DECODER_REQUEST_SYNC_POINT_DISCARD_INPUT as _; #[doc(alias = "GST_VIDEO_DECODER_REQUEST_SYNC_POINT_CORRUPT_OUTPUT")] - const CORRUPT_OUTPUT = ffi::GST_VIDEO_DECODER_REQUEST_SYNC_POINT_CORRUPT_OUTPUT as u32; + const CORRUPT_OUTPUT = ffi::GST_VIDEO_DECODER_REQUEST_SYNC_POINT_CORRUPT_OUTPUT as _; } } @@ -428,9 +428,9 @@ bitflags! { #[doc(alias = "GstVideoFlags")] pub struct VideoFlags: u32 { #[doc(alias = "GST_VIDEO_FLAG_VARIABLE_FPS")] - const VARIABLE_FPS = ffi::GST_VIDEO_FLAG_VARIABLE_FPS as u32; + const VARIABLE_FPS = ffi::GST_VIDEO_FLAG_VARIABLE_FPS as _; #[doc(alias = "GST_VIDEO_FLAG_PREMULTIPLIED_ALPHA")] - const PREMULTIPLIED_ALPHA = ffi::GST_VIDEO_FLAG_PREMULTIPLIED_ALPHA as u32; + const PREMULTIPLIED_ALPHA = ffi::GST_VIDEO_FLAG_PREMULTIPLIED_ALPHA as _; } } @@ -488,27 +488,27 @@ bitflags! { #[doc(alias = "GstVideoFormatFlags")] pub struct VideoFormatFlags: u32 { #[doc(alias = "GST_VIDEO_FORMAT_FLAG_YUV")] - const YUV = ffi::GST_VIDEO_FORMAT_FLAG_YUV as u32; + const YUV = ffi::GST_VIDEO_FORMAT_FLAG_YUV as _; #[doc(alias = "GST_VIDEO_FORMAT_FLAG_RGB")] - const RGB = ffi::GST_VIDEO_FORMAT_FLAG_RGB as u32; + const RGB = ffi::GST_VIDEO_FORMAT_FLAG_RGB as _; #[doc(alias = "GST_VIDEO_FORMAT_FLAG_GRAY")] - const GRAY = ffi::GST_VIDEO_FORMAT_FLAG_GRAY as u32; + const GRAY = ffi::GST_VIDEO_FORMAT_FLAG_GRAY as _; #[doc(alias = "GST_VIDEO_FORMAT_FLAG_ALPHA")] - const ALPHA = ffi::GST_VIDEO_FORMAT_FLAG_ALPHA as u32; + const ALPHA = ffi::GST_VIDEO_FORMAT_FLAG_ALPHA as _; #[doc(alias = "GST_VIDEO_FORMAT_FLAG_LE")] - const LE = ffi::GST_VIDEO_FORMAT_FLAG_LE as u32; + const LE = ffi::GST_VIDEO_FORMAT_FLAG_LE as _; #[doc(alias = "GST_VIDEO_FORMAT_FLAG_PALETTE")] - const PALETTE = ffi::GST_VIDEO_FORMAT_FLAG_PALETTE as u32; + const PALETTE = ffi::GST_VIDEO_FORMAT_FLAG_PALETTE as _; #[doc(alias = "GST_VIDEO_FORMAT_FLAG_COMPLEX")] - const COMPLEX = ffi::GST_VIDEO_FORMAT_FLAG_COMPLEX as u32; + const COMPLEX = ffi::GST_VIDEO_FORMAT_FLAG_COMPLEX as _; #[doc(alias = "GST_VIDEO_FORMAT_FLAG_UNPACK")] - const UNPACK = ffi::GST_VIDEO_FORMAT_FLAG_UNPACK as u32; + const UNPACK = ffi::GST_VIDEO_FORMAT_FLAG_UNPACK as _; #[doc(alias = "GST_VIDEO_FORMAT_FLAG_TILED")] - const TILED = ffi::GST_VIDEO_FORMAT_FLAG_TILED as u32; + const TILED = ffi::GST_VIDEO_FORMAT_FLAG_TILED as _; #[cfg(any(feature = "v1_22", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_22")))] #[doc(alias = "GST_VIDEO_FORMAT_FLAG_SUBTILES")] - const SUBTILES = ffi::GST_VIDEO_FORMAT_FLAG_SUBTILES as u32; + const SUBTILES = ffi::GST_VIDEO_FORMAT_FLAG_SUBTILES as _; } } @@ -566,25 +566,25 @@ bitflags! { #[doc(alias = "GstVideoFrameFlags")] pub struct VideoFrameFlags: u32 { #[doc(alias = "GST_VIDEO_FRAME_FLAG_INTERLACED")] - const INTERLACED = ffi::GST_VIDEO_FRAME_FLAG_INTERLACED as u32; + const INTERLACED = ffi::GST_VIDEO_FRAME_FLAG_INTERLACED as _; #[doc(alias = "GST_VIDEO_FRAME_FLAG_TFF")] - const TFF = ffi::GST_VIDEO_FRAME_FLAG_TFF as u32; + const TFF = ffi::GST_VIDEO_FRAME_FLAG_TFF as _; #[doc(alias = "GST_VIDEO_FRAME_FLAG_RFF")] - const RFF = ffi::GST_VIDEO_FRAME_FLAG_RFF as u32; + const RFF = ffi::GST_VIDEO_FRAME_FLAG_RFF as _; #[doc(alias = "GST_VIDEO_FRAME_FLAG_ONEFIELD")] - const ONEFIELD = ffi::GST_VIDEO_FRAME_FLAG_ONEFIELD as u32; + const ONEFIELD = ffi::GST_VIDEO_FRAME_FLAG_ONEFIELD as _; #[doc(alias = "GST_VIDEO_FRAME_FLAG_MULTIPLE_VIEW")] - const MULTIPLE_VIEW = ffi::GST_VIDEO_FRAME_FLAG_MULTIPLE_VIEW as u32; + const MULTIPLE_VIEW = ffi::GST_VIDEO_FRAME_FLAG_MULTIPLE_VIEW as _; #[doc(alias = "GST_VIDEO_FRAME_FLAG_FIRST_IN_BUNDLE")] - const FIRST_IN_BUNDLE = ffi::GST_VIDEO_FRAME_FLAG_FIRST_IN_BUNDLE as u32; + const FIRST_IN_BUNDLE = ffi::GST_VIDEO_FRAME_FLAG_FIRST_IN_BUNDLE as _; #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] #[doc(alias = "GST_VIDEO_FRAME_FLAG_TOP_FIELD")] - const TOP_FIELD = ffi::GST_VIDEO_FRAME_FLAG_TOP_FIELD as u32; + const TOP_FIELD = ffi::GST_VIDEO_FRAME_FLAG_TOP_FIELD as _; #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] #[doc(alias = "GST_VIDEO_FRAME_FLAG_BOTTOM_FIELD")] - const BOTTOM_FIELD = ffi::GST_VIDEO_FRAME_FLAG_BOTTOM_FIELD as u32; + const BOTTOM_FIELD = ffi::GST_VIDEO_FRAME_FLAG_BOTTOM_FIELD as _; } } @@ -642,19 +642,19 @@ bitflags! { #[doc(alias = "GstVideoMultiviewFlags")] pub struct VideoMultiviewFlags: u32 { #[doc(alias = "GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST")] - const RIGHT_VIEW_FIRST = ffi::GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST as u32; + const RIGHT_VIEW_FIRST = ffi::GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_VIEW_FIRST as _; #[doc(alias = "GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLIPPED")] - const LEFT_FLIPPED = ffi::GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLIPPED as u32; + const LEFT_FLIPPED = ffi::GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLIPPED as _; #[doc(alias = "GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLOPPED")] - const LEFT_FLOPPED = ffi::GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLOPPED as u32; + const LEFT_FLOPPED = ffi::GST_VIDEO_MULTIVIEW_FLAGS_LEFT_FLOPPED as _; #[doc(alias = "GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLIPPED")] - const RIGHT_FLIPPED = ffi::GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLIPPED as u32; + const RIGHT_FLIPPED = ffi::GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLIPPED as _; #[doc(alias = "GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLOPPED")] - const RIGHT_FLOPPED = ffi::GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLOPPED as u32; + const RIGHT_FLOPPED = ffi::GST_VIDEO_MULTIVIEW_FLAGS_RIGHT_FLOPPED as _; #[doc(alias = "GST_VIDEO_MULTIVIEW_FLAGS_HALF_ASPECT")] - const HALF_ASPECT = ffi::GST_VIDEO_MULTIVIEW_FLAGS_HALF_ASPECT as u32; + const HALF_ASPECT = ffi::GST_VIDEO_MULTIVIEW_FLAGS_HALF_ASPECT as _; #[doc(alias = "GST_VIDEO_MULTIVIEW_FLAGS_MIXED_MONO")] - const MIXED_MONO = ffi::GST_VIDEO_MULTIVIEW_FLAGS_MIXED_MONO as u32; + const MIXED_MONO = ffi::GST_VIDEO_MULTIVIEW_FLAGS_MIXED_MONO as _; } } @@ -712,9 +712,9 @@ bitflags! { #[doc(alias = "GstVideoOverlayFormatFlags")] pub struct VideoOverlayFormatFlags: u32 { #[doc(alias = "GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA")] - const PREMULTIPLIED_ALPHA = ffi::GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA as u32; + const PREMULTIPLIED_ALPHA = ffi::GST_VIDEO_OVERLAY_FORMAT_FLAG_PREMULTIPLIED_ALPHA as _; #[doc(alias = "GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA")] - const GLOBAL_ALPHA = ffi::GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA as u32; + const GLOBAL_ALPHA = ffi::GST_VIDEO_OVERLAY_FORMAT_FLAG_GLOBAL_ALPHA as _; } } @@ -780,9 +780,9 @@ bitflags! { #[doc(alias = "GstVideoPackFlags")] pub struct VideoPackFlags: u32 { #[doc(alias = "GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE")] - const TRUNCATE_RANGE = ffi::GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE as u32; + const TRUNCATE_RANGE = ffi::GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE as _; #[doc(alias = "GST_VIDEO_PACK_FLAG_INTERLACED")] - const INTERLACED = ffi::GST_VIDEO_PACK_FLAG_INTERLACED as u32; + const INTERLACED = ffi::GST_VIDEO_PACK_FLAG_INTERLACED as _; } } @@ -840,9 +840,9 @@ bitflags! { #[doc(alias = "GstVideoTimeCodeFlags")] pub struct VideoTimeCodeFlags: u32 { #[doc(alias = "GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME")] - const DROP_FRAME = ffi::GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME as u32; + const DROP_FRAME = ffi::GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME as _; #[doc(alias = "GST_VIDEO_TIME_CODE_FLAGS_INTERLACED")] - const INTERLACED = ffi::GST_VIDEO_TIME_CODE_FLAGS_INTERLACED as u32; + const INTERLACED = ffi::GST_VIDEO_TIME_CODE_FLAGS_INTERLACED as _; } } diff --git a/gstreamer-video/src/auto/versions.txt b/gstreamer-video/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-video/src/auto/versions.txt +++ b/gstreamer-video/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-video/sys/build.rs b/gstreamer-video/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-video/sys/build.rs +++ b/gstreamer-video/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-video/sys/src/auto/versions.txt b/gstreamer-video/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-video/sys/src/auto/versions.txt +++ b/gstreamer-video/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-video/sys/src/lib.rs b/gstreamer-video/sys/src/lib.rs index 9f5ab62ef..420cada68 100644 --- a/gstreamer-video/sys/src/lib.rs +++ b/gstreamer-video/sys/src/lib.rs @@ -711,7 +711,7 @@ pub union GstVideoCodecFrame_abidata { impl ::std::fmt::Debug for GstVideoCodecFrame_abidata { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoCodecFrame_abidata @ {:p}", self)) + f.debug_struct(&format!("GstVideoCodecFrame_abidata @ {self:p}")) .field("ABI", unsafe { &self.ABI }) .finish() } @@ -726,7 +726,7 @@ pub union GstVideoInfo_ABI { impl ::std::fmt::Debug for GstVideoInfo_ABI { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoInfo_ABI @ {:p}", self)) + f.debug_struct(&format!("GstVideoInfo_ABI @ {self:p}")) .field("abi", unsafe { &self.abi }) .finish() } @@ -776,7 +776,7 @@ pub struct GstColorBalanceChannelClass { impl ::std::fmt::Debug for GstColorBalanceChannelClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstColorBalanceChannelClass @ {:p}", self)) + f.debug_struct(&format!("GstColorBalanceChannelClass @ {self:p}")) .field("parent", &self.parent) .field("value_changed", &self.value_changed) .finish() @@ -800,7 +800,7 @@ pub struct GstColorBalanceInterface { impl ::std::fmt::Debug for GstColorBalanceInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstColorBalanceInterface @ {:p}", self)) + f.debug_struct(&format!("GstColorBalanceInterface @ {self:p}")) .field("iface", &self.iface) .field("list_channels", &self.list_channels) .field("set_value", &self.set_value) @@ -821,7 +821,7 @@ pub struct GstNavigationInterface { impl ::std::fmt::Debug for GstNavigationInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstNavigationInterface @ {:p}", self)) + f.debug_struct(&format!("GstNavigationInterface @ {self:p}")) .field("iface", &self.iface) .field("send_event", &self.send_event) .field("send_event_simple", &self.send_event_simple) @@ -840,7 +840,7 @@ pub struct GstVideoAFDMeta { impl ::std::fmt::Debug for GstVideoAFDMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoAFDMeta @ {:p}", self)) + f.debug_struct(&format!("GstVideoAFDMeta @ {self:p}")) .field("meta", &self.meta) .field("field", &self.field) .field("spec", &self.spec) @@ -858,7 +858,7 @@ pub struct GstVideoAffineTransformationMeta { impl ::std::fmt::Debug for GstVideoAffineTransformationMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoAffineTransformationMeta @ {:p}", self)) + f.debug_struct(&format!("GstVideoAffineTransformationMeta @ {self:p}")) .field("meta", &self.meta) .field("matrix", &self.matrix) .finish() @@ -897,7 +897,7 @@ pub struct GstVideoAggregatorClass { impl ::std::fmt::Debug for GstVideoAggregatorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoAggregatorClass @ {:p}", self)) + f.debug_struct(&format!("GstVideoAggregatorClass @ {self:p}")) .field("update_caps", &self.update_caps) .field("aggregate_frames", &self.aggregate_frames) .field("create_output_buffer", &self.create_output_buffer) @@ -922,7 +922,7 @@ pub struct GstVideoAggregatorConvertPadClass { impl ::std::fmt::Debug for GstVideoAggregatorConvertPadClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoAggregatorConvertPadClass @ {:p}", self)) + f.debug_struct(&format!("GstVideoAggregatorConvertPadClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("create_conversion_info", &self.create_conversion_info) .finish() @@ -977,7 +977,7 @@ pub struct GstVideoAggregatorPadClass { impl ::std::fmt::Debug for GstVideoAggregatorPadClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoAggregatorPadClass @ {:p}", self)) + f.debug_struct(&format!("GstVideoAggregatorPadClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("update_conversion_info", &self.update_conversion_info) .field("prepare_frame", &self.prepare_frame) @@ -1007,8 +1007,7 @@ pub struct GstVideoAggregatorParallelConvertPadClass { impl ::std::fmt::Debug for GstVideoAggregatorParallelConvertPadClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { f.debug_struct(&format!( - "GstVideoAggregatorParallelConvertPadClass @ {:p}", - self + "GstVideoAggregatorParallelConvertPadClass @ {self:p}" )) .field("parent_class", &self.parent_class) .finish() @@ -1035,7 +1034,7 @@ pub struct GstVideoAlignment { impl ::std::fmt::Debug for GstVideoAlignment { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoAlignment @ {:p}", self)) + f.debug_struct(&format!("GstVideoAlignment @ {self:p}")) .field("padding_top", &self.padding_top) .field("padding_bottom", &self.padding_bottom) .field("padding_left", &self.padding_left) @@ -1057,7 +1056,7 @@ pub struct GstVideoAncillary { impl ::std::fmt::Debug for GstVideoAncillary { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoAncillary @ {:p}", self)) + f.debug_struct(&format!("GstVideoAncillary @ {self:p}")) .field("DID", &self.DID) .field("SDID_block_number", &self.SDID_block_number) .field("data_count", &self.data_count) @@ -1077,7 +1076,7 @@ pub struct GstVideoBarMeta { impl ::std::fmt::Debug for GstVideoBarMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoBarMeta @ {:p}", self)) + f.debug_struct(&format!("GstVideoBarMeta @ {self:p}")) .field("meta", &self.meta) .field("field", &self.field) .field("is_letterbox", &self.is_letterbox) @@ -1095,7 +1094,7 @@ pub struct GstVideoBufferPoolClass { impl ::std::fmt::Debug for GstVideoBufferPoolClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoBufferPoolClass @ {:p}", self)) + f.debug_struct(&format!("GstVideoBufferPoolClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -1120,7 +1119,7 @@ pub struct GstVideoCaptionMeta { impl ::std::fmt::Debug for GstVideoCaptionMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoCaptionMeta @ {:p}", self)) + f.debug_struct(&format!("GstVideoCaptionMeta @ {self:p}")) .field("meta", &self.meta) .field("caption_type", &self.caption_type) .field("data", &self.data) @@ -1146,7 +1145,7 @@ pub struct GstVideoCodecAlphaMeta { impl ::std::fmt::Debug for GstVideoCodecAlphaMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoCodecAlphaMeta @ {:p}", self)) + f.debug_struct(&format!("GstVideoCodecAlphaMeta @ {self:p}")) .field("meta", &self.meta) .field("buffer", &self.buffer) .finish() @@ -1176,7 +1175,7 @@ pub struct GstVideoCodecFrame { impl ::std::fmt::Debug for GstVideoCodecFrame { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoCodecFrame @ {:p}", self)) + f.debug_struct(&format!("GstVideoCodecFrame @ {self:p}")) .field("system_frame_number", &self.system_frame_number) .field("dts", &self.dts) .field("pts", &self.pts) @@ -1201,7 +1200,7 @@ pub struct GstVideoCodecFrame_abidata_ABI { impl ::std::fmt::Debug for GstVideoCodecFrame_abidata_ABI { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoCodecFrame_abidata_ABI @ {:p}", self)) + f.debug_struct(&format!("GstVideoCodecFrame_abidata_ABI @ {self:p}")) .finish() } } @@ -1221,7 +1220,7 @@ pub struct GstVideoCodecState { impl ::std::fmt::Debug for GstVideoCodecState { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoCodecState @ {:p}", self)) + f.debug_struct(&format!("GstVideoCodecState @ {self:p}")) .field("info", &self.info) .field("caps", &self.caps) .field("codec_data", &self.codec_data) @@ -1248,7 +1247,7 @@ pub struct GstVideoColorPrimariesInfo { impl ::std::fmt::Debug for GstVideoColorPrimariesInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoColorPrimariesInfo @ {:p}", self)) + f.debug_struct(&format!("GstVideoColorPrimariesInfo @ {self:p}")) .field("primaries", &self.primaries) .field("Wx", &self.Wx) .field("Wy", &self.Wy) @@ -1273,7 +1272,7 @@ pub struct GstVideoColorimetry { impl ::std::fmt::Debug for GstVideoColorimetry { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoColorimetry @ {:p}", self)) + f.debug_struct(&format!("GstVideoColorimetry @ {self:p}")) .field("range", &self.range) .field("matrix", &self.matrix) .field("transfer", &self.transfer) @@ -1292,7 +1291,7 @@ pub struct GstVideoContentLightLevel { impl ::std::fmt::Debug for GstVideoContentLightLevel { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoContentLightLevel @ {:p}", self)) + f.debug_struct(&format!("GstVideoContentLightLevel @ {self:p}")) .field("max_content_light_level", &self.max_content_light_level) .field( "max_frame_average_light_level", @@ -1322,7 +1321,7 @@ pub struct GstVideoCropMeta { impl ::std::fmt::Debug for GstVideoCropMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoCropMeta @ {:p}", self)) + f.debug_struct(&format!("GstVideoCropMeta @ {self:p}")) .field("meta", &self.meta) .field("x", &self.x) .field("y", &self.y) @@ -1391,7 +1390,7 @@ pub struct GstVideoDecoderClass { impl ::std::fmt::Debug for GstVideoDecoderClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoDecoderClass @ {:p}", self)) + f.debug_struct(&format!("GstVideoDecoderClass @ {self:p}")) .field("open", &self.open) .field("close", &self.close) .field("start", &self.start) @@ -1433,7 +1432,7 @@ pub struct GstVideoDirectionInterface { impl ::std::fmt::Debug for GstVideoDirectionInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoDirectionInterface @ {:p}", self)) + f.debug_struct(&format!("GstVideoDirectionInterface @ {self:p}")) .field("iface", &self.iface) .finish() } @@ -1493,7 +1492,7 @@ pub struct GstVideoEncoderClass { impl ::std::fmt::Debug for GstVideoEncoderClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoEncoderClass @ {:p}", self)) + f.debug_struct(&format!("GstVideoEncoderClass @ {self:p}")) .field("open", &self.open) .field("close", &self.close) .field("start", &self.start) @@ -1552,7 +1551,7 @@ pub struct GstVideoFilterClass { impl ::std::fmt::Debug for GstVideoFilterClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoFilterClass @ {:p}", self)) + f.debug_struct(&format!("GstVideoFilterClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("set_info", &self.set_info) .field("transform_frame", &self.transform_frame) @@ -1590,7 +1589,7 @@ pub struct GstVideoFormatInfo { impl ::std::fmt::Debug for GstVideoFormatInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoFormatInfo @ {:p}", self)) + f.debug_struct(&format!("GstVideoFormatInfo @ {self:p}")) .field("format", &self.format) .field("name", &self.name) .field("description", &self.description) @@ -1631,7 +1630,7 @@ pub struct GstVideoFrame { impl ::std::fmt::Debug for GstVideoFrame { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoFrame @ {:p}", self)) + f.debug_struct(&format!("GstVideoFrame @ {self:p}")) .field("info", &self.info) .field("flags", &self.flags) .field("buffer", &self.buffer) @@ -1659,7 +1658,7 @@ pub struct GstVideoGLTextureUploadMeta { impl ::std::fmt::Debug for GstVideoGLTextureUploadMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoGLTextureUploadMeta @ {:p}", self)) + f.debug_struct(&format!("GstVideoGLTextureUploadMeta @ {self:p}")) .field("meta", &self.meta) .field("texture_orientation", &self.texture_orientation) .field("n_textures", &self.n_textures) @@ -1691,7 +1690,7 @@ pub struct GstVideoInfo { impl ::std::fmt::Debug for GstVideoInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoInfo @ {:p}", self)) + f.debug_struct(&format!("GstVideoInfo @ {self:p}")) .field("finfo", &self.finfo) .field("interlace_mode", &self.interlace_mode) .field("flags", &self.flags) @@ -1722,7 +1721,7 @@ pub struct GstVideoInfo_ABI_abi { impl ::std::fmt::Debug for GstVideoInfo_ABI_abi { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoInfo_ABI_abi @ {:p}", self)) + f.debug_struct(&format!("GstVideoInfo_ABI_abi @ {self:p}")) .field("multiview_mode", &self.multiview_mode) .field("multiview_flags", &self.multiview_flags) .field("field_order", &self.field_order) @@ -1742,7 +1741,7 @@ pub struct GstVideoMasteringDisplayInfo { impl ::std::fmt::Debug for GstVideoMasteringDisplayInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoMasteringDisplayInfo @ {:p}", self)) + f.debug_struct(&format!("GstVideoMasteringDisplayInfo @ {self:p}")) .field("display_primaries", &self.display_primaries) .field("white_point", &self.white_point) .field( @@ -1767,8 +1766,7 @@ pub struct GstVideoMasteringDisplayInfoCoordinates { impl ::std::fmt::Debug for GstVideoMasteringDisplayInfoCoordinates { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { f.debug_struct(&format!( - "GstVideoMasteringDisplayInfoCoordinates @ {:p}", - self + "GstVideoMasteringDisplayInfoCoordinates @ {self:p}" )) .field("x", &self.x) .field("y", &self.y) @@ -1806,7 +1804,7 @@ pub struct GstVideoMeta { impl ::std::fmt::Debug for GstVideoMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoMeta @ {:p}", self)) + f.debug_struct(&format!("GstVideoMeta @ {self:p}")) .field("meta", &self.meta) .field("buffer", &self.buffer) .field("flags", &self.flags) @@ -1833,7 +1831,7 @@ pub struct GstVideoMetaTransform { impl ::std::fmt::Debug for GstVideoMetaTransform { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoMetaTransform @ {:p}", self)) + f.debug_struct(&format!("GstVideoMetaTransform @ {self:p}")) .field("in_info", &self.in_info) .field("out_info", &self.out_info) .finish() @@ -1856,7 +1854,7 @@ pub struct GstVideoOrientationInterface { impl ::std::fmt::Debug for GstVideoOrientationInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoOrientationInterface @ {:p}", self)) + f.debug_struct(&format!("GstVideoOrientationInterface @ {self:p}")) .field("iface", &self.iface) .field("get_hflip", &self.get_hflip) .field("get_vflip", &self.get_vflip) @@ -1878,7 +1876,7 @@ pub struct GstVideoOverlayComposition { impl ::std::fmt::Debug for GstVideoOverlayComposition { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoOverlayComposition @ {:p}", self)) + f.debug_struct(&format!("GstVideoOverlayComposition @ {self:p}")) .finish() } } @@ -1892,7 +1890,7 @@ pub struct GstVideoOverlayCompositionMeta { impl ::std::fmt::Debug for GstVideoOverlayCompositionMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoOverlayCompositionMeta @ {:p}", self)) + f.debug_struct(&format!("GstVideoOverlayCompositionMeta @ {self:p}")) .field("meta", &self.meta) .field("overlay", &self.overlay) .finish() @@ -1912,7 +1910,7 @@ pub struct GstVideoOverlayInterface { impl ::std::fmt::Debug for GstVideoOverlayInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoOverlayInterface @ {:p}", self)) + f.debug_struct(&format!("GstVideoOverlayInterface @ {self:p}")) .field("iface", &self.iface) .field("expose", &self.expose) .field("handle_events", &self.handle_events) @@ -1930,7 +1928,7 @@ pub struct GstVideoOverlayRectangle { impl ::std::fmt::Debug for GstVideoOverlayRectangle { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoOverlayRectangle @ {:p}", self)) + f.debug_struct(&format!("GstVideoOverlayRectangle @ {self:p}")) .finish() } } @@ -1946,7 +1944,7 @@ pub struct GstVideoRectangle { impl ::std::fmt::Debug for GstVideoRectangle { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoRectangle @ {:p}", self)) + f.debug_struct(&format!("GstVideoRectangle @ {self:p}")) .field("x", &self.x) .field("y", &self.y) .field("w", &self.w) @@ -1971,7 +1969,7 @@ pub struct GstVideoRegionOfInterestMeta { impl ::std::fmt::Debug for GstVideoRegionOfInterestMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoRegionOfInterestMeta @ {:p}", self)) + f.debug_struct(&format!("GstVideoRegionOfInterestMeta @ {self:p}")) .field("meta", &self.meta) .field("roi_type", &self.roi_type) .field("id", &self.id) @@ -2001,7 +1999,7 @@ pub struct GstVideoResampler { impl ::std::fmt::Debug for GstVideoResampler { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoResampler @ {:p}", self)) + f.debug_struct(&format!("GstVideoResampler @ {self:p}")) .field("in_size", &self.in_size) .field("out_size", &self.out_size) .field("max_taps", &self.max_taps) @@ -2025,7 +2023,7 @@ pub struct GstVideoSEIUserDataUnregisteredMeta { impl ::std::fmt::Debug for GstVideoSEIUserDataUnregisteredMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoSEIUserDataUnregisteredMeta @ {:p}", self)) + f.debug_struct(&format!("GstVideoSEIUserDataUnregisteredMeta @ {self:p}")) .field("meta", &self.meta) .field("uuid", &self.uuid) .field("data", &self.data) @@ -2056,7 +2054,7 @@ pub struct GstVideoSinkClass { impl ::std::fmt::Debug for GstVideoSinkClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoSinkClass @ {:p}", self)) + f.debug_struct(&format!("GstVideoSinkClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("show_frame", &self.show_frame) .field("set_info", &self.set_info) @@ -2085,7 +2083,7 @@ pub struct GstVideoTimeCode { impl ::std::fmt::Debug for GstVideoTimeCode { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoTimeCode @ {:p}", self)) + f.debug_struct(&format!("GstVideoTimeCode @ {self:p}")) .field("config", &self.config) .field("hours", &self.hours) .field("minutes", &self.minutes) @@ -2107,7 +2105,7 @@ pub struct GstVideoTimeCodeConfig { impl ::std::fmt::Debug for GstVideoTimeCodeConfig { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoTimeCodeConfig @ {:p}", self)) + f.debug_struct(&format!("GstVideoTimeCodeConfig @ {self:p}")) .field("fps_n", &self.fps_n) .field("fps_d", &self.fps_d) .field("flags", &self.flags) @@ -2127,7 +2125,7 @@ pub struct GstVideoTimeCodeInterval { impl ::std::fmt::Debug for GstVideoTimeCodeInterval { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoTimeCodeInterval @ {:p}", self)) + f.debug_struct(&format!("GstVideoTimeCodeInterval @ {self:p}")) .field("hours", &self.hours) .field("minutes", &self.minutes) .field("seconds", &self.seconds) @@ -2145,7 +2143,7 @@ pub struct GstVideoTimeCodeMeta { impl ::std::fmt::Debug for GstVideoTimeCodeMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoTimeCodeMeta @ {:p}", self)) + f.debug_struct(&format!("GstVideoTimeCodeMeta @ {self:p}")) .field("meta", &self.meta) .field("tc", &self.tc) .finish() @@ -2160,7 +2158,7 @@ pub struct GstVideoVBIEncoder { impl ::std::fmt::Debug for GstVideoVBIEncoder { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoVBIEncoder @ {:p}", self)) + f.debug_struct(&format!("GstVideoVBIEncoder @ {self:p}")) .finish() } } @@ -2173,7 +2171,7 @@ pub struct GstVideoVBIParser { impl ::std::fmt::Debug for GstVideoVBIParser { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoVBIParser @ {:p}", self)) + f.debug_struct(&format!("GstVideoVBIParser @ {self:p}")) .finish() } } @@ -2191,7 +2189,7 @@ pub struct GstColorBalanceChannel { impl ::std::fmt::Debug for GstColorBalanceChannel { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstColorBalanceChannel @ {:p}", self)) + f.debug_struct(&format!("GstColorBalanceChannel @ {self:p}")) .field("parent", &self.parent) .field("label", &self.label) .field("min_value", &self.min_value) @@ -2211,7 +2209,7 @@ pub struct GstVideoAggregator { impl ::std::fmt::Debug for GstVideoAggregator { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoAggregator @ {:p}", self)) + f.debug_struct(&format!("GstVideoAggregator @ {self:p}")) .field("aggregator", &self.aggregator) .field("info", &self.info) .finish() @@ -2228,7 +2226,7 @@ pub struct GstVideoAggregatorConvertPad { impl ::std::fmt::Debug for GstVideoAggregatorConvertPad { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoAggregatorConvertPad @ {:p}", self)) + f.debug_struct(&format!("GstVideoAggregatorConvertPad @ {self:p}")) .finish() } } @@ -2244,7 +2242,7 @@ pub struct GstVideoAggregatorPad { impl ::std::fmt::Debug for GstVideoAggregatorPad { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoAggregatorPad @ {:p}", self)) + f.debug_struct(&format!("GstVideoAggregatorPad @ {self:p}")) .field("parent", &self.parent) .field("info", &self.info) .finish() @@ -2259,12 +2257,9 @@ pub struct GstVideoAggregatorParallelConvertPad { impl ::std::fmt::Debug for GstVideoAggregatorParallelConvertPad { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!( - "GstVideoAggregatorParallelConvertPad @ {:p}", - self - )) - .field("parent_instance", &self.parent_instance) - .finish() + f.debug_struct(&format!("GstVideoAggregatorParallelConvertPad @ {self:p}")) + .field("parent_instance", &self.parent_instance) + .finish() } } @@ -2277,7 +2272,7 @@ pub struct GstVideoBufferPool { impl ::std::fmt::Debug for GstVideoBufferPool { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoBufferPool @ {:p}", self)) + f.debug_struct(&format!("GstVideoBufferPool @ {self:p}")) .field("bufferpool", &self.bufferpool) .field("priv_", &self.priv_) .finish() @@ -2299,7 +2294,7 @@ pub struct GstVideoDecoder { impl ::std::fmt::Debug for GstVideoDecoder { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoDecoder @ {:p}", self)) + f.debug_struct(&format!("GstVideoDecoder @ {self:p}")) .finish() } } @@ -2319,7 +2314,7 @@ pub struct GstVideoEncoder { impl ::std::fmt::Debug for GstVideoEncoder { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoEncoder @ {:p}", self)) + f.debug_struct(&format!("GstVideoEncoder @ {self:p}")) .finish() } } @@ -2336,7 +2331,7 @@ pub struct GstVideoFilter { impl ::std::fmt::Debug for GstVideoFilter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoFilter @ {:p}", self)) + f.debug_struct(&format!("GstVideoFilter @ {self:p}")) .field("element", &self.element) .field("negotiated", &self.negotiated) .field("in_info", &self.in_info) @@ -2353,7 +2348,7 @@ pub struct GstVideoMultiviewFlagsSet { impl ::std::fmt::Debug for GstVideoMultiviewFlagsSet { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoMultiviewFlagsSet @ {:p}", self)) + f.debug_struct(&format!("GstVideoMultiviewFlagsSet @ {self:p}")) .finish() } } @@ -2370,7 +2365,7 @@ pub struct GstVideoSink { impl ::std::fmt::Debug for GstVideoSink { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstVideoSink @ {:p}", self)) + f.debug_struct(&format!("GstVideoSink @ {self:p}")) .field("element", &self.element) .field("width", &self.width) .field("height", &self.height) @@ -2387,7 +2382,7 @@ pub struct GstColorBalance { impl ::std::fmt::Debug for GstColorBalance { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstColorBalance @ {:p}", self) + write!(f, "GstColorBalance @ {self:p}") } } @@ -2399,7 +2394,7 @@ pub struct GstNavigation { impl ::std::fmt::Debug for GstNavigation { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstNavigation @ {:p}", self) + write!(f, "GstNavigation @ {self:p}") } } @@ -2411,7 +2406,7 @@ pub struct GstVideoDirection { impl ::std::fmt::Debug for GstVideoDirection { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstVideoDirection @ {:p}", self) + write!(f, "GstVideoDirection @ {self:p}") } } @@ -2423,7 +2418,7 @@ pub struct GstVideoOrientation { impl ::std::fmt::Debug for GstVideoOrientation { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstVideoOrientation @ {:p}", self) + write!(f, "GstVideoOrientation @ {self:p}") } } @@ -2435,7 +2430,7 @@ pub struct GstVideoOverlay { impl ::std::fmt::Debug for GstVideoOverlay { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstVideoOverlay @ {:p}", self) + write!(f, "GstVideoOverlay @ {self:p}") } } diff --git a/gstreamer-video/sys/tests/abi.rs b/gstreamer-video/sys/tests/abi.rs index c8adacc4a..6e40c95d6 100644 --- a/gstreamer-video/sys/tests/abi.rs +++ b/gstreamer-video/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer-webrtc/src/auto/versions.txt b/gstreamer-webrtc/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-webrtc/src/auto/versions.txt +++ b/gstreamer-webrtc/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-webrtc/sys/build.rs b/gstreamer-webrtc/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer-webrtc/sys/build.rs +++ b/gstreamer-webrtc/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer-webrtc/sys/src/auto/versions.txt b/gstreamer-webrtc/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer-webrtc/sys/src/auto/versions.txt +++ b/gstreamer-webrtc/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer-webrtc/sys/src/lib.rs b/gstreamer-webrtc/sys/src/lib.rs index 4f6672583..d00cdaf83 100644 --- a/gstreamer-webrtc/sys/src/lib.rs +++ b/gstreamer-webrtc/sys/src/lib.rs @@ -193,7 +193,7 @@ pub struct GstWebRTCICECandidateStats { impl ::std::fmt::Debug for GstWebRTCICECandidateStats { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstWebRTCICECandidateStats @ {:p}", self)) + f.debug_struct(&format!("GstWebRTCICECandidateStats @ {self:p}")) .field("ipaddr", &self.ipaddr) .field("port", &self.port) .field("stream_id", &self.stream_id) @@ -282,7 +282,7 @@ pub struct GstWebRTCICEClass { impl ::std::fmt::Debug for GstWebRTCICEClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstWebRTCICEClass @ {:p}", self)) + f.debug_struct(&format!("GstWebRTCICEClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("add_stream", &self.add_stream) .field("find_transport", &self.find_transport) @@ -323,7 +323,7 @@ pub struct GstWebRTCICEStreamClass { impl ::std::fmt::Debug for GstWebRTCICEStreamClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstWebRTCICEStreamClass @ {:p}", self)) + f.debug_struct(&format!("GstWebRTCICEStreamClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("find_transport", &self.find_transport) .field("gather_candidates", &self.gather_candidates) @@ -341,7 +341,7 @@ pub struct GstWebRTCICETransportClass { impl ::std::fmt::Debug for GstWebRTCICETransportClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstWebRTCICETransportClass @ {:p}", self)) + f.debug_struct(&format!("GstWebRTCICETransportClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("gather_candidates", &self.gather_candidates) .field("_padding", &self._padding) @@ -390,7 +390,7 @@ pub struct GstWebRTCSessionDescription { impl ::std::fmt::Debug for GstWebRTCSessionDescription { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstWebRTCSessionDescription @ {:p}", self)) + f.debug_struct(&format!("GstWebRTCSessionDescription @ {self:p}")) .field("type_", &self.type_) .field("sdp", &self.sdp) .finish() @@ -406,7 +406,7 @@ pub struct GstWebRTCDTLSTransport { impl ::std::fmt::Debug for GstWebRTCDTLSTransport { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstWebRTCDTLSTransport @ {:p}", self)) + f.debug_struct(&format!("GstWebRTCDTLSTransport @ {self:p}")) .finish() } } @@ -419,7 +419,7 @@ pub struct GstWebRTCDataChannel { impl ::std::fmt::Debug for GstWebRTCDataChannel { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstWebRTCDataChannel @ {:p}", self)) + f.debug_struct(&format!("GstWebRTCDataChannel @ {self:p}")) .finish() } } @@ -437,7 +437,7 @@ pub struct GstWebRTCICE { impl ::std::fmt::Debug for GstWebRTCICE { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstWebRTCICE @ {:p}", self)) + f.debug_struct(&format!("GstWebRTCICE @ {self:p}")) .field("parent", &self.parent) .field("ice_gathering_state", &self.ice_gathering_state) .field("ice_connection_state", &self.ice_connection_state) @@ -457,7 +457,7 @@ pub struct GstWebRTCICEStream { impl ::std::fmt::Debug for GstWebRTCICEStream { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstWebRTCICEStream @ {:p}", self)) + f.debug_struct(&format!("GstWebRTCICEStream @ {self:p}")) .field("parent", &self.parent) .field("stream_id", &self.stream_id) .finish() @@ -479,7 +479,7 @@ pub struct GstWebRTCICETransport { impl ::std::fmt::Debug for GstWebRTCICETransport { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstWebRTCICETransport @ {:p}", self)) + f.debug_struct(&format!("GstWebRTCICETransport @ {self:p}")) .field("parent", &self.parent) .field("role", &self.role) .field("component", &self.component) @@ -500,7 +500,7 @@ pub struct GstWebRTCRTPReceiver { impl ::std::fmt::Debug for GstWebRTCRTPReceiver { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstWebRTCRTPReceiver @ {:p}", self)) + f.debug_struct(&format!("GstWebRTCRTPReceiver @ {self:p}")) .finish() } } @@ -513,7 +513,7 @@ pub struct GstWebRTCRTPSender { impl ::std::fmt::Debug for GstWebRTCRTPSender { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstWebRTCRTPSender @ {:p}", self)) + f.debug_struct(&format!("GstWebRTCRTPSender @ {self:p}")) .finish() } } @@ -526,7 +526,7 @@ pub struct GstWebRTCRTPTransceiver { impl ::std::fmt::Debug for GstWebRTCRTPTransceiver { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstWebRTCRTPTransceiver @ {:p}", self)) + f.debug_struct(&format!("GstWebRTCRTPTransceiver @ {self:p}")) .finish() } } @@ -539,7 +539,7 @@ pub struct GstWebRTCSCTPTransport { impl ::std::fmt::Debug for GstWebRTCSCTPTransport { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstWebRTCSCTPTransport @ {:p}", self)) + f.debug_struct(&format!("GstWebRTCSCTPTransport @ {self:p}")) .finish() } } diff --git a/gstreamer-webrtc/sys/tests/abi.rs b/gstreamer-webrtc/sys/tests/abi.rs index 83a86970b..03b655634 100644 --- a/gstreamer-webrtc/sys/tests/abi.rs +++ b/gstreamer-webrtc/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?) diff --git a/gstreamer/src/auto/bus.rs b/gstreamer/src/auto/bus.rs index 9fdf2848c..da72ff913 100644 --- a/gstreamer/src/auto/bus.rs +++ b/gstreamer/src/auto/bus.rs @@ -131,7 +131,7 @@ impl Bus { } unsafe { let f: Box_ = Box_::new(f); - let detailed_signal_name = detail.map(|name| format!("message::{}\0", name)); + let detailed_signal_name = detail.map(|name| format!("message::{name}\0")); let signal_name: &[u8] = detailed_signal_name .as_ref() .map_or(&b"message\0"[..], |n| n.as_bytes()); @@ -164,7 +164,7 @@ impl Bus { } unsafe { let f: Box_ = Box_::new(f); - let detailed_signal_name = detail.map(|name| format!("sync-message::{}\0", name)); + let detailed_signal_name = detail.map(|name| format!("sync-message::{name}\0")); let signal_name: &[u8] = detailed_signal_name .as_ref() .map_or(&b"sync-message\0"[..], |n| n.as_bytes()); diff --git a/gstreamer/src/auto/flags.rs b/gstreamer/src/auto/flags.rs index 04f4e785e..b21504715 100644 --- a/gstreamer/src/auto/flags.rs +++ b/gstreamer/src/auto/flags.rs @@ -16,9 +16,9 @@ bitflags! { #[doc(alias = "GstBinFlags")] pub struct BinFlags: u32 { #[doc(alias = "GST_BIN_FLAG_NO_RESYNC")] - const NO_RESYNC = ffi::GST_BIN_FLAG_NO_RESYNC as u32; + const NO_RESYNC = ffi::GST_BIN_FLAG_NO_RESYNC as _; #[doc(alias = "GST_BIN_FLAG_STREAMS_AWARE")] - const STREAMS_AWARE = ffi::GST_BIN_FLAG_STREAMS_AWARE as u32; + const STREAMS_AWARE = ffi::GST_BIN_FLAG_STREAMS_AWARE as _; } } @@ -76,17 +76,17 @@ bitflags! { #[doc(alias = "GstBufferCopyFlags")] pub struct BufferCopyFlags: u32 { #[doc(alias = "GST_BUFFER_COPY_FLAGS")] - const FLAGS = ffi::GST_BUFFER_COPY_FLAGS as u32; + const FLAGS = ffi::GST_BUFFER_COPY_FLAGS as _; #[doc(alias = "GST_BUFFER_COPY_TIMESTAMPS")] - const TIMESTAMPS = ffi::GST_BUFFER_COPY_TIMESTAMPS as u32; + const TIMESTAMPS = ffi::GST_BUFFER_COPY_TIMESTAMPS as _; #[doc(alias = "GST_BUFFER_COPY_META")] - const META = ffi::GST_BUFFER_COPY_META as u32; + const META = ffi::GST_BUFFER_COPY_META as _; #[doc(alias = "GST_BUFFER_COPY_MEMORY")] - const MEMORY = ffi::GST_BUFFER_COPY_MEMORY as u32; + const MEMORY = ffi::GST_BUFFER_COPY_MEMORY as _; #[doc(alias = "GST_BUFFER_COPY_MERGE")] - const MERGE = ffi::GST_BUFFER_COPY_MERGE as u32; + const MERGE = ffi::GST_BUFFER_COPY_MERGE as _; #[doc(alias = "GST_BUFFER_COPY_DEEP")] - const DEEP = ffi::GST_BUFFER_COPY_DEEP as u32; + const DEEP = ffi::GST_BUFFER_COPY_DEEP as _; } } @@ -144,31 +144,31 @@ bitflags! { #[doc(alias = "GstBufferFlags")] pub struct BufferFlags: u32 { #[doc(alias = "GST_BUFFER_FLAG_LIVE")] - const LIVE = ffi::GST_BUFFER_FLAG_LIVE as u32; + const LIVE = ffi::GST_BUFFER_FLAG_LIVE as _; #[doc(alias = "GST_BUFFER_FLAG_DECODE_ONLY")] - const DECODE_ONLY = ffi::GST_BUFFER_FLAG_DECODE_ONLY as u32; + const DECODE_ONLY = ffi::GST_BUFFER_FLAG_DECODE_ONLY as _; #[doc(alias = "GST_BUFFER_FLAG_DISCONT")] - const DISCONT = ffi::GST_BUFFER_FLAG_DISCONT as u32; + const DISCONT = ffi::GST_BUFFER_FLAG_DISCONT as _; #[doc(alias = "GST_BUFFER_FLAG_RESYNC")] - const RESYNC = ffi::GST_BUFFER_FLAG_RESYNC as u32; + const RESYNC = ffi::GST_BUFFER_FLAG_RESYNC as _; #[doc(alias = "GST_BUFFER_FLAG_CORRUPTED")] - const CORRUPTED = ffi::GST_BUFFER_FLAG_CORRUPTED as u32; + const CORRUPTED = ffi::GST_BUFFER_FLAG_CORRUPTED as _; #[doc(alias = "GST_BUFFER_FLAG_MARKER")] - const MARKER = ffi::GST_BUFFER_FLAG_MARKER as u32; + const MARKER = ffi::GST_BUFFER_FLAG_MARKER as _; #[doc(alias = "GST_BUFFER_FLAG_HEADER")] - const HEADER = ffi::GST_BUFFER_FLAG_HEADER as u32; + const HEADER = ffi::GST_BUFFER_FLAG_HEADER as _; #[doc(alias = "GST_BUFFER_FLAG_GAP")] - const GAP = ffi::GST_BUFFER_FLAG_GAP as u32; + const GAP = ffi::GST_BUFFER_FLAG_GAP as _; #[doc(alias = "GST_BUFFER_FLAG_DROPPABLE")] - const DROPPABLE = ffi::GST_BUFFER_FLAG_DROPPABLE as u32; + const DROPPABLE = ffi::GST_BUFFER_FLAG_DROPPABLE as _; #[doc(alias = "GST_BUFFER_FLAG_DELTA_UNIT")] - const DELTA_UNIT = ffi::GST_BUFFER_FLAG_DELTA_UNIT as u32; + const DELTA_UNIT = ffi::GST_BUFFER_FLAG_DELTA_UNIT as _; #[doc(alias = "GST_BUFFER_FLAG_TAG_MEMORY")] - const TAG_MEMORY = ffi::GST_BUFFER_FLAG_TAG_MEMORY as u32; + const TAG_MEMORY = ffi::GST_BUFFER_FLAG_TAG_MEMORY as _; #[doc(alias = "GST_BUFFER_FLAG_SYNC_AFTER")] - const SYNC_AFTER = ffi::GST_BUFFER_FLAG_SYNC_AFTER as u32; + const SYNC_AFTER = ffi::GST_BUFFER_FLAG_SYNC_AFTER as _; #[doc(alias = "GST_BUFFER_FLAG_NON_DROPPABLE")] - const NON_DROPPABLE = ffi::GST_BUFFER_FLAG_NON_DROPPABLE as u32; + const NON_DROPPABLE = ffi::GST_BUFFER_FLAG_NON_DROPPABLE as _; } } @@ -226,11 +226,11 @@ bitflags! { #[doc(alias = "GstBufferPoolAcquireFlags")] pub struct BufferPoolAcquireFlags: u32 { #[doc(alias = "GST_BUFFER_POOL_ACQUIRE_FLAG_KEY_UNIT")] - const KEY_UNIT = ffi::GST_BUFFER_POOL_ACQUIRE_FLAG_KEY_UNIT as u32; + const KEY_UNIT = ffi::GST_BUFFER_POOL_ACQUIRE_FLAG_KEY_UNIT as _; #[doc(alias = "GST_BUFFER_POOL_ACQUIRE_FLAG_DONTWAIT")] - const DONTWAIT = ffi::GST_BUFFER_POOL_ACQUIRE_FLAG_DONTWAIT as u32; + const DONTWAIT = ffi::GST_BUFFER_POOL_ACQUIRE_FLAG_DONTWAIT as _; #[doc(alias = "GST_BUFFER_POOL_ACQUIRE_FLAG_DISCONT")] - const DISCONT = ffi::GST_BUFFER_POOL_ACQUIRE_FLAG_DISCONT as u32; + const DISCONT = ffi::GST_BUFFER_POOL_ACQUIRE_FLAG_DISCONT as _; } } @@ -288,19 +288,19 @@ bitflags! { #[doc(alias = "GstClockFlags")] pub struct ClockFlags: u32 { #[doc(alias = "GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC")] - const CAN_DO_SINGLE_SYNC = ffi::GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC as u32; + const CAN_DO_SINGLE_SYNC = ffi::GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC as _; #[doc(alias = "GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC")] - const CAN_DO_SINGLE_ASYNC = ffi::GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC as u32; + const CAN_DO_SINGLE_ASYNC = ffi::GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC as _; #[doc(alias = "GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC")] - const CAN_DO_PERIODIC_SYNC = ffi::GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC as u32; + const CAN_DO_PERIODIC_SYNC = ffi::GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC as _; #[doc(alias = "GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC")] - const CAN_DO_PERIODIC_ASYNC = ffi::GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC as u32; + const CAN_DO_PERIODIC_ASYNC = ffi::GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC as _; #[doc(alias = "GST_CLOCK_FLAG_CAN_SET_RESOLUTION")] - const CAN_SET_RESOLUTION = ffi::GST_CLOCK_FLAG_CAN_SET_RESOLUTION as u32; + const CAN_SET_RESOLUTION = ffi::GST_CLOCK_FLAG_CAN_SET_RESOLUTION as _; #[doc(alias = "GST_CLOCK_FLAG_CAN_SET_MASTER")] - const CAN_SET_MASTER = ffi::GST_CLOCK_FLAG_CAN_SET_MASTER as u32; + const CAN_SET_MASTER = ffi::GST_CLOCK_FLAG_CAN_SET_MASTER as _; #[doc(alias = "GST_CLOCK_FLAG_NEEDS_STARTUP_SYNC")] - const NEEDS_STARTUP_SYNC = ffi::GST_CLOCK_FLAG_NEEDS_STARTUP_SYNC as u32; + const NEEDS_STARTUP_SYNC = ffi::GST_CLOCK_FLAG_NEEDS_STARTUP_SYNC as _; } } @@ -358,41 +358,41 @@ bitflags! { #[doc(alias = "GstDebugColorFlags")] pub struct DebugColorFlags: u32 { #[doc(alias = "GST_DEBUG_FG_BLACK")] - const FG_BLACK = ffi::GST_DEBUG_FG_BLACK as u32; + const FG_BLACK = ffi::GST_DEBUG_FG_BLACK as _; #[doc(alias = "GST_DEBUG_FG_RED")] - const FG_RED = ffi::GST_DEBUG_FG_RED as u32; + const FG_RED = ffi::GST_DEBUG_FG_RED as _; #[doc(alias = "GST_DEBUG_FG_GREEN")] - const FG_GREEN = ffi::GST_DEBUG_FG_GREEN as u32; + const FG_GREEN = ffi::GST_DEBUG_FG_GREEN as _; #[doc(alias = "GST_DEBUG_FG_YELLOW")] - const FG_YELLOW = ffi::GST_DEBUG_FG_YELLOW as u32; + const FG_YELLOW = ffi::GST_DEBUG_FG_YELLOW as _; #[doc(alias = "GST_DEBUG_FG_BLUE")] - const FG_BLUE = ffi::GST_DEBUG_FG_BLUE as u32; + const FG_BLUE = ffi::GST_DEBUG_FG_BLUE as _; #[doc(alias = "GST_DEBUG_FG_MAGENTA")] - const FG_MAGENTA = ffi::GST_DEBUG_FG_MAGENTA as u32; + const FG_MAGENTA = ffi::GST_DEBUG_FG_MAGENTA as _; #[doc(alias = "GST_DEBUG_FG_CYAN")] - const FG_CYAN = ffi::GST_DEBUG_FG_CYAN as u32; + const FG_CYAN = ffi::GST_DEBUG_FG_CYAN as _; #[doc(alias = "GST_DEBUG_FG_WHITE")] - const FG_WHITE = ffi::GST_DEBUG_FG_WHITE as u32; + const FG_WHITE = ffi::GST_DEBUG_FG_WHITE as _; #[doc(alias = "GST_DEBUG_BG_BLACK")] - const BG_BLACK = ffi::GST_DEBUG_BG_BLACK as u32; + const BG_BLACK = ffi::GST_DEBUG_BG_BLACK as _; #[doc(alias = "GST_DEBUG_BG_RED")] - const BG_RED = ffi::GST_DEBUG_BG_RED as u32; + const BG_RED = ffi::GST_DEBUG_BG_RED as _; #[doc(alias = "GST_DEBUG_BG_GREEN")] - const BG_GREEN = ffi::GST_DEBUG_BG_GREEN as u32; + const BG_GREEN = ffi::GST_DEBUG_BG_GREEN as _; #[doc(alias = "GST_DEBUG_BG_YELLOW")] - const BG_YELLOW = ffi::GST_DEBUG_BG_YELLOW as u32; + const BG_YELLOW = ffi::GST_DEBUG_BG_YELLOW as _; #[doc(alias = "GST_DEBUG_BG_BLUE")] - const BG_BLUE = ffi::GST_DEBUG_BG_BLUE as u32; + const BG_BLUE = ffi::GST_DEBUG_BG_BLUE as _; #[doc(alias = "GST_DEBUG_BG_MAGENTA")] - const BG_MAGENTA = ffi::GST_DEBUG_BG_MAGENTA as u32; + const BG_MAGENTA = ffi::GST_DEBUG_BG_MAGENTA as _; #[doc(alias = "GST_DEBUG_BG_CYAN")] - const BG_CYAN = ffi::GST_DEBUG_BG_CYAN as u32; + const BG_CYAN = ffi::GST_DEBUG_BG_CYAN as _; #[doc(alias = "GST_DEBUG_BG_WHITE")] - const BG_WHITE = ffi::GST_DEBUG_BG_WHITE as u32; + const BG_WHITE = ffi::GST_DEBUG_BG_WHITE as _; #[doc(alias = "GST_DEBUG_BOLD")] - const BOLD = ffi::GST_DEBUG_BOLD as u32; + const BOLD = ffi::GST_DEBUG_BOLD as _; #[doc(alias = "GST_DEBUG_UNDERLINE")] - const UNDERLINE = ffi::GST_DEBUG_UNDERLINE as u32; + const UNDERLINE = ffi::GST_DEBUG_UNDERLINE as _; } } @@ -450,19 +450,19 @@ bitflags! { #[doc(alias = "GstDebugGraphDetails")] pub struct DebugGraphDetails: u32 { #[doc(alias = "GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE")] - const MEDIA_TYPE = ffi::GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE as u32; + const MEDIA_TYPE = ffi::GST_DEBUG_GRAPH_SHOW_MEDIA_TYPE as _; #[doc(alias = "GST_DEBUG_GRAPH_SHOW_CAPS_DETAILS")] - const CAPS_DETAILS = ffi::GST_DEBUG_GRAPH_SHOW_CAPS_DETAILS as u32; + const CAPS_DETAILS = ffi::GST_DEBUG_GRAPH_SHOW_CAPS_DETAILS as _; #[doc(alias = "GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS")] - const NON_DEFAULT_PARAMS = ffi::GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS as u32; + const NON_DEFAULT_PARAMS = ffi::GST_DEBUG_GRAPH_SHOW_NON_DEFAULT_PARAMS as _; #[doc(alias = "GST_DEBUG_GRAPH_SHOW_STATES")] - const STATES = ffi::GST_DEBUG_GRAPH_SHOW_STATES as u32; + const STATES = ffi::GST_DEBUG_GRAPH_SHOW_STATES as _; #[doc(alias = "GST_DEBUG_GRAPH_SHOW_FULL_PARAMS")] - const FULL_PARAMS = ffi::GST_DEBUG_GRAPH_SHOW_FULL_PARAMS as u32; + const FULL_PARAMS = ffi::GST_DEBUG_GRAPH_SHOW_FULL_PARAMS as _; #[doc(alias = "GST_DEBUG_GRAPH_SHOW_ALL")] - const ALL = ffi::GST_DEBUG_GRAPH_SHOW_ALL as u32; + const ALL = ffi::GST_DEBUG_GRAPH_SHOW_ALL as _; #[doc(alias = "GST_DEBUG_GRAPH_SHOW_VERBOSE")] - const VERBOSE = ffi::GST_DEBUG_GRAPH_SHOW_VERBOSE as u32; + const VERBOSE = ffi::GST_DEBUG_GRAPH_SHOW_VERBOSE as _; } } @@ -520,17 +520,17 @@ bitflags! { #[doc(alias = "GstElementFlags")] pub struct ElementFlags: u32 { #[doc(alias = "GST_ELEMENT_FLAG_LOCKED_STATE")] - const LOCKED_STATE = ffi::GST_ELEMENT_FLAG_LOCKED_STATE as u32; + const LOCKED_STATE = ffi::GST_ELEMENT_FLAG_LOCKED_STATE as _; #[doc(alias = "GST_ELEMENT_FLAG_SINK")] - const SINK = ffi::GST_ELEMENT_FLAG_SINK as u32; + const SINK = ffi::GST_ELEMENT_FLAG_SINK as _; #[doc(alias = "GST_ELEMENT_FLAG_SOURCE")] - const SOURCE = ffi::GST_ELEMENT_FLAG_SOURCE as u32; + const SOURCE = ffi::GST_ELEMENT_FLAG_SOURCE as _; #[doc(alias = "GST_ELEMENT_FLAG_PROVIDE_CLOCK")] - const PROVIDE_CLOCK = ffi::GST_ELEMENT_FLAG_PROVIDE_CLOCK as u32; + const PROVIDE_CLOCK = ffi::GST_ELEMENT_FLAG_PROVIDE_CLOCK as _; #[doc(alias = "GST_ELEMENT_FLAG_REQUIRE_CLOCK")] - const REQUIRE_CLOCK = ffi::GST_ELEMENT_FLAG_REQUIRE_CLOCK as u32; + const REQUIRE_CLOCK = ffi::GST_ELEMENT_FLAG_REQUIRE_CLOCK as _; #[doc(alias = "GST_ELEMENT_FLAG_INDEXABLE")] - const INDEXABLE = ffi::GST_ELEMENT_FLAG_INDEXABLE as u32; + const INDEXABLE = ffi::GST_ELEMENT_FLAG_INDEXABLE as _; } } @@ -588,15 +588,15 @@ bitflags! { #[doc(alias = "GstEventTypeFlags")] pub struct EventTypeFlags: u32 { #[doc(alias = "GST_EVENT_TYPE_UPSTREAM")] - const UPSTREAM = ffi::GST_EVENT_TYPE_UPSTREAM as u32; + const UPSTREAM = ffi::GST_EVENT_TYPE_UPSTREAM as _; #[doc(alias = "GST_EVENT_TYPE_DOWNSTREAM")] - const DOWNSTREAM = ffi::GST_EVENT_TYPE_DOWNSTREAM as u32; + const DOWNSTREAM = ffi::GST_EVENT_TYPE_DOWNSTREAM as _; #[doc(alias = "GST_EVENT_TYPE_SERIALIZED")] - const SERIALIZED = ffi::GST_EVENT_TYPE_SERIALIZED as u32; + const SERIALIZED = ffi::GST_EVENT_TYPE_SERIALIZED as _; #[doc(alias = "GST_EVENT_TYPE_STICKY")] - const STICKY = ffi::GST_EVENT_TYPE_STICKY as u32; + const STICKY = ffi::GST_EVENT_TYPE_STICKY as _; #[doc(alias = "GST_EVENT_TYPE_STICKY_MULTI")] - const STICKY_MULTI = ffi::GST_EVENT_TYPE_STICKY_MULTI as u32; + const STICKY_MULTI = ffi::GST_EVENT_TYPE_STICKY_MULTI as _; } } @@ -656,7 +656,7 @@ bitflags! { #[doc(alias = "GstGapFlags")] pub struct GapFlags: u32 { #[doc(alias = "GST_GAP_FLAG_MISSING_DATA")] - const DATA = ffi::GST_GAP_FLAG_MISSING_DATA as u32; + const DATA = ffi::GST_GAP_FLAG_MISSING_DATA as _; } } @@ -726,17 +726,17 @@ bitflags! { #[doc(alias = "GstMemoryFlags")] pub struct MemoryFlags: u32 { #[doc(alias = "GST_MEMORY_FLAG_READONLY")] - const READONLY = ffi::GST_MEMORY_FLAG_READONLY as u32; + const READONLY = ffi::GST_MEMORY_FLAG_READONLY as _; #[doc(alias = "GST_MEMORY_FLAG_NO_SHARE")] - const NO_SHARE = ffi::GST_MEMORY_FLAG_NO_SHARE as u32; + const NO_SHARE = ffi::GST_MEMORY_FLAG_NO_SHARE as _; #[doc(alias = "GST_MEMORY_FLAG_ZERO_PREFIXED")] - const ZERO_PREFIXED = ffi::GST_MEMORY_FLAG_ZERO_PREFIXED as u32; + const ZERO_PREFIXED = ffi::GST_MEMORY_FLAG_ZERO_PREFIXED as _; #[doc(alias = "GST_MEMORY_FLAG_ZERO_PADDED")] - const ZERO_PADDED = ffi::GST_MEMORY_FLAG_ZERO_PADDED as u32; + const ZERO_PADDED = ffi::GST_MEMORY_FLAG_ZERO_PADDED as _; #[doc(alias = "GST_MEMORY_FLAG_PHYSICALLY_CONTIGUOUS")] - const PHYSICALLY_CONTIGUOUS = ffi::GST_MEMORY_FLAG_PHYSICALLY_CONTIGUOUS as u32; + const PHYSICALLY_CONTIGUOUS = ffi::GST_MEMORY_FLAG_PHYSICALLY_CONTIGUOUS as _; #[doc(alias = "GST_MEMORY_FLAG_NOT_MAPPABLE")] - const NOT_MAPPABLE = ffi::GST_MEMORY_FLAG_NOT_MAPPABLE as u32; + const NOT_MAPPABLE = ffi::GST_MEMORY_FLAG_NOT_MAPPABLE as _; } } @@ -794,11 +794,11 @@ bitflags! { #[doc(alias = "GstMetaFlags")] pub struct MetaFlags: u32 { #[doc(alias = "GST_META_FLAG_READONLY")] - const READONLY = ffi::GST_META_FLAG_READONLY as u32; + const READONLY = ffi::GST_META_FLAG_READONLY as _; #[doc(alias = "GST_META_FLAG_POOLED")] - const POOLED = ffi::GST_META_FLAG_POOLED as u32; + const POOLED = ffi::GST_META_FLAG_POOLED as _; #[doc(alias = "GST_META_FLAG_LOCKED")] - const LOCKED = ffi::GST_META_FLAG_LOCKED as u32; + const LOCKED = ffi::GST_META_FLAG_LOCKED as _; } } @@ -856,7 +856,7 @@ bitflags! { #[doc(alias = "GstObjectFlags")] pub struct ObjectFlags: u32 { #[doc(alias = "GST_OBJECT_FLAG_MAY_BE_LEAKED")] - const MAY_BE_LEAKED = ffi::GST_OBJECT_FLAG_MAY_BE_LEAKED as u32; + const MAY_BE_LEAKED = ffi::GST_OBJECT_FLAG_MAY_BE_LEAKED as _; } } @@ -914,31 +914,31 @@ bitflags! { #[doc(alias = "GstPadFlags")] pub struct PadFlags: u32 { #[doc(alias = "GST_PAD_FLAG_BLOCKED")] - const BLOCKED = ffi::GST_PAD_FLAG_BLOCKED as u32; + const BLOCKED = ffi::GST_PAD_FLAG_BLOCKED as _; #[doc(alias = "GST_PAD_FLAG_FLUSHING")] - const FLUSHING = ffi::GST_PAD_FLAG_FLUSHING as u32; + const FLUSHING = ffi::GST_PAD_FLAG_FLUSHING as _; #[doc(alias = "GST_PAD_FLAG_EOS")] - const EOS = ffi::GST_PAD_FLAG_EOS as u32; + const EOS = ffi::GST_PAD_FLAG_EOS as _; #[doc(alias = "GST_PAD_FLAG_BLOCKING")] - const BLOCKING = ffi::GST_PAD_FLAG_BLOCKING as u32; + const BLOCKING = ffi::GST_PAD_FLAG_BLOCKING as _; #[doc(alias = "GST_PAD_FLAG_NEED_PARENT")] - const NEED_PARENT = ffi::GST_PAD_FLAG_NEED_PARENT as u32; + const NEED_PARENT = ffi::GST_PAD_FLAG_NEED_PARENT as _; #[doc(alias = "GST_PAD_FLAG_NEED_RECONFIGURE")] - const NEED_RECONFIGURE = ffi::GST_PAD_FLAG_NEED_RECONFIGURE as u32; + const NEED_RECONFIGURE = ffi::GST_PAD_FLAG_NEED_RECONFIGURE as _; #[doc(alias = "GST_PAD_FLAG_PENDING_EVENTS")] - const PENDING_EVENTS = ffi::GST_PAD_FLAG_PENDING_EVENTS as u32; + const PENDING_EVENTS = ffi::GST_PAD_FLAG_PENDING_EVENTS as _; #[doc(alias = "GST_PAD_FLAG_FIXED_CAPS")] - const FIXED_CAPS = ffi::GST_PAD_FLAG_FIXED_CAPS as u32; + const FIXED_CAPS = ffi::GST_PAD_FLAG_FIXED_CAPS as _; #[doc(alias = "GST_PAD_FLAG_PROXY_CAPS")] - const PROXY_CAPS = ffi::GST_PAD_FLAG_PROXY_CAPS as u32; + const PROXY_CAPS = ffi::GST_PAD_FLAG_PROXY_CAPS as _; #[doc(alias = "GST_PAD_FLAG_PROXY_ALLOCATION")] - const PROXY_ALLOCATION = ffi::GST_PAD_FLAG_PROXY_ALLOCATION as u32; + const PROXY_ALLOCATION = ffi::GST_PAD_FLAG_PROXY_ALLOCATION as _; #[doc(alias = "GST_PAD_FLAG_PROXY_SCHEDULING")] - const PROXY_SCHEDULING = ffi::GST_PAD_FLAG_PROXY_SCHEDULING as u32; + const PROXY_SCHEDULING = ffi::GST_PAD_FLAG_PROXY_SCHEDULING as _; #[doc(alias = "GST_PAD_FLAG_ACCEPT_INTERSECT")] - const ACCEPT_INTERSECT = ffi::GST_PAD_FLAG_ACCEPT_INTERSECT as u32; + const ACCEPT_INTERSECT = ffi::GST_PAD_FLAG_ACCEPT_INTERSECT as _; #[doc(alias = "GST_PAD_FLAG_ACCEPT_TEMPLATE")] - const ACCEPT_TEMPLATE = ffi::GST_PAD_FLAG_ACCEPT_TEMPLATE as u32; + const ACCEPT_TEMPLATE = ffi::GST_PAD_FLAG_ACCEPT_TEMPLATE as _; } } @@ -996,15 +996,15 @@ bitflags! { #[doc(alias = "GstPadLinkCheck")] pub struct PadLinkCheck: u32 { #[doc(alias = "GST_PAD_LINK_CHECK_HIERARCHY")] - const HIERARCHY = ffi::GST_PAD_LINK_CHECK_HIERARCHY as u32; + const HIERARCHY = ffi::GST_PAD_LINK_CHECK_HIERARCHY as _; #[doc(alias = "GST_PAD_LINK_CHECK_TEMPLATE_CAPS")] - const TEMPLATE_CAPS = ffi::GST_PAD_LINK_CHECK_TEMPLATE_CAPS as u32; + const TEMPLATE_CAPS = ffi::GST_PAD_LINK_CHECK_TEMPLATE_CAPS as _; #[doc(alias = "GST_PAD_LINK_CHECK_CAPS")] - const CAPS = ffi::GST_PAD_LINK_CHECK_CAPS as u32; + const CAPS = ffi::GST_PAD_LINK_CHECK_CAPS as _; #[doc(alias = "GST_PAD_LINK_CHECK_NO_RECONFIGURE")] - const NO_RECONFIGURE = ffi::GST_PAD_LINK_CHECK_NO_RECONFIGURE as u32; + const NO_RECONFIGURE = ffi::GST_PAD_LINK_CHECK_NO_RECONFIGURE as _; #[doc(alias = "GST_PAD_LINK_CHECK_DEFAULT")] - const DEFAULT = ffi::GST_PAD_LINK_CHECK_DEFAULT as u32; + const DEFAULT = ffi::GST_PAD_LINK_CHECK_DEFAULT as _; } } @@ -1062,47 +1062,47 @@ bitflags! { #[doc(alias = "GstPadProbeType")] pub struct PadProbeType: u32 { #[doc(alias = "GST_PAD_PROBE_TYPE_IDLE")] - const IDLE = ffi::GST_PAD_PROBE_TYPE_IDLE as u32; + const IDLE = ffi::GST_PAD_PROBE_TYPE_IDLE as _; #[doc(alias = "GST_PAD_PROBE_TYPE_BLOCK")] - const BLOCK = ffi::GST_PAD_PROBE_TYPE_BLOCK as u32; + const BLOCK = ffi::GST_PAD_PROBE_TYPE_BLOCK as _; #[doc(alias = "GST_PAD_PROBE_TYPE_BUFFER")] - const BUFFER = ffi::GST_PAD_PROBE_TYPE_BUFFER as u32; + const BUFFER = ffi::GST_PAD_PROBE_TYPE_BUFFER as _; #[doc(alias = "GST_PAD_PROBE_TYPE_BUFFER_LIST")] - const BUFFER_LIST = ffi::GST_PAD_PROBE_TYPE_BUFFER_LIST as u32; + const BUFFER_LIST = ffi::GST_PAD_PROBE_TYPE_BUFFER_LIST as _; #[doc(alias = "GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM")] - const EVENT_DOWNSTREAM = ffi::GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM as u32; + const EVENT_DOWNSTREAM = ffi::GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM as _; #[doc(alias = "GST_PAD_PROBE_TYPE_EVENT_UPSTREAM")] - const EVENT_UPSTREAM = ffi::GST_PAD_PROBE_TYPE_EVENT_UPSTREAM as u32; + const EVENT_UPSTREAM = ffi::GST_PAD_PROBE_TYPE_EVENT_UPSTREAM as _; #[doc(alias = "GST_PAD_PROBE_TYPE_EVENT_FLUSH")] - const EVENT_FLUSH = ffi::GST_PAD_PROBE_TYPE_EVENT_FLUSH as u32; + const EVENT_FLUSH = ffi::GST_PAD_PROBE_TYPE_EVENT_FLUSH as _; #[doc(alias = "GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM")] - const QUERY_DOWNSTREAM = ffi::GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM as u32; + const QUERY_DOWNSTREAM = ffi::GST_PAD_PROBE_TYPE_QUERY_DOWNSTREAM as _; #[doc(alias = "GST_PAD_PROBE_TYPE_QUERY_UPSTREAM")] - const QUERY_UPSTREAM = ffi::GST_PAD_PROBE_TYPE_QUERY_UPSTREAM as u32; + const QUERY_UPSTREAM = ffi::GST_PAD_PROBE_TYPE_QUERY_UPSTREAM as _; #[doc(alias = "GST_PAD_PROBE_TYPE_PUSH")] - const PUSH = ffi::GST_PAD_PROBE_TYPE_PUSH as u32; + const PUSH = ffi::GST_PAD_PROBE_TYPE_PUSH as _; #[doc(alias = "GST_PAD_PROBE_TYPE_PULL")] - const PULL = ffi::GST_PAD_PROBE_TYPE_PULL as u32; + const PULL = ffi::GST_PAD_PROBE_TYPE_PULL as _; #[doc(alias = "GST_PAD_PROBE_TYPE_BLOCKING")] - const BLOCKING = ffi::GST_PAD_PROBE_TYPE_BLOCKING as u32; + const BLOCKING = ffi::GST_PAD_PROBE_TYPE_BLOCKING as _; #[doc(alias = "GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM")] - const DATA_DOWNSTREAM = ffi::GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM as u32; + const DATA_DOWNSTREAM = ffi::GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM as _; #[doc(alias = "GST_PAD_PROBE_TYPE_DATA_UPSTREAM")] - const DATA_UPSTREAM = ffi::GST_PAD_PROBE_TYPE_DATA_UPSTREAM as u32; + const DATA_UPSTREAM = ffi::GST_PAD_PROBE_TYPE_DATA_UPSTREAM as _; #[doc(alias = "GST_PAD_PROBE_TYPE_DATA_BOTH")] - const DATA_BOTH = ffi::GST_PAD_PROBE_TYPE_DATA_BOTH as u32; + const DATA_BOTH = ffi::GST_PAD_PROBE_TYPE_DATA_BOTH as _; #[doc(alias = "GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM")] - const BLOCK_DOWNSTREAM = ffi::GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM as u32; + const BLOCK_DOWNSTREAM = ffi::GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM as _; #[doc(alias = "GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM")] - const BLOCK_UPSTREAM = ffi::GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM as u32; + const BLOCK_UPSTREAM = ffi::GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM as _; #[doc(alias = "GST_PAD_PROBE_TYPE_EVENT_BOTH")] - const EVENT_BOTH = ffi::GST_PAD_PROBE_TYPE_EVENT_BOTH as u32; + const EVENT_BOTH = ffi::GST_PAD_PROBE_TYPE_EVENT_BOTH as _; #[doc(alias = "GST_PAD_PROBE_TYPE_QUERY_BOTH")] - const QUERY_BOTH = ffi::GST_PAD_PROBE_TYPE_QUERY_BOTH as u32; + const QUERY_BOTH = ffi::GST_PAD_PROBE_TYPE_QUERY_BOTH as _; #[doc(alias = "GST_PAD_PROBE_TYPE_ALL_BOTH")] - const ALL_BOTH = ffi::GST_PAD_PROBE_TYPE_ALL_BOTH as u32; + const ALL_BOTH = ffi::GST_PAD_PROBE_TYPE_ALL_BOTH as _; #[doc(alias = "GST_PAD_PROBE_TYPE_SCHEDULING")] - const SCHEDULING = ffi::GST_PAD_PROBE_TYPE_SCHEDULING as u32; + const SCHEDULING = ffi::GST_PAD_PROBE_TYPE_SCHEDULING as _; } } @@ -1160,11 +1160,11 @@ bitflags! { #[doc(alias = "GstParseFlags")] pub struct ParseFlags: u32 { #[doc(alias = "GST_PARSE_FLAG_FATAL_ERRORS")] - const FATAL_ERRORS = ffi::GST_PARSE_FLAG_FATAL_ERRORS as u32; + const FATAL_ERRORS = ffi::GST_PARSE_FLAG_FATAL_ERRORS as _; #[doc(alias = "GST_PARSE_FLAG_NO_SINGLE_ELEMENT_BINS")] - const NO_SINGLE_ELEMENT_BINS = ffi::GST_PARSE_FLAG_NO_SINGLE_ELEMENT_BINS as u32; + const NO_SINGLE_ELEMENT_BINS = ffi::GST_PARSE_FLAG_NO_SINGLE_ELEMENT_BINS as _; #[doc(alias = "GST_PARSE_FLAG_PLACE_IN_BIN")] - const PLACE_IN_BIN = ffi::GST_PARSE_FLAG_PLACE_IN_BIN as u32; + const PLACE_IN_BIN = ffi::GST_PARSE_FLAG_PLACE_IN_BIN as _; } } @@ -1222,7 +1222,7 @@ bitflags! { #[doc(alias = "GstPipelineFlags")] pub struct PipelineFlags: u32 { #[doc(alias = "GST_PIPELINE_FLAG_FIXED_CLOCK")] - const FIXED_CLOCK = ffi::GST_PIPELINE_FLAG_FIXED_CLOCK as u32; + const FIXED_CLOCK = ffi::GST_PIPELINE_FLAG_FIXED_CLOCK as _; } } @@ -1282,7 +1282,7 @@ bitflags! { #[doc(alias = "GstPluginAPIFlags")] pub struct PluginAPIFlags: u32 { #[doc(alias = "GST_PLUGIN_API_FLAG_IGNORE_ENUM_MEMBERS")] - const MEMBERS = ffi::GST_PLUGIN_API_FLAG_IGNORE_ENUM_MEMBERS as u32; + const MEMBERS = ffi::GST_PLUGIN_API_FLAG_IGNORE_ENUM_MEMBERS as _; } } @@ -1352,15 +1352,15 @@ bitflags! { #[doc(alias = "GstPluginDependencyFlags")] pub struct PluginDependencyFlags: u32 { #[doc(alias = "GST_PLUGIN_DEPENDENCY_FLAG_RECURSE")] - const RECURSE = ffi::GST_PLUGIN_DEPENDENCY_FLAG_RECURSE as u32; + const RECURSE = ffi::GST_PLUGIN_DEPENDENCY_FLAG_RECURSE as _; #[doc(alias = "GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY")] - const PATHS_ARE_DEFAULT_ONLY = ffi::GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY as u32; + const PATHS_ARE_DEFAULT_ONLY = ffi::GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY as _; #[doc(alias = "GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX")] - const FILE_NAME_IS_SUFFIX = ffi::GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX as u32; + const FILE_NAME_IS_SUFFIX = ffi::GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX as _; #[doc(alias = "GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_PREFIX")] - const FILE_NAME_IS_PREFIX = ffi::GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_PREFIX as u32; + const FILE_NAME_IS_PREFIX = ffi::GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_PREFIX as _; #[doc(alias = "GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_RELATIVE_TO_EXE")] - const PATHS_ARE_RELATIVE_TO_EXE = ffi::GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_RELATIVE_TO_EXE as u32; + const PATHS_ARE_RELATIVE_TO_EXE = ffi::GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_RELATIVE_TO_EXE as _; } } @@ -1418,9 +1418,9 @@ bitflags! { #[doc(alias = "GstPluginFlags")] pub struct PluginFlags: u32 { #[doc(alias = "GST_PLUGIN_FLAG_CACHED")] - const CACHED = ffi::GST_PLUGIN_FLAG_CACHED as u32; + const CACHED = ffi::GST_PLUGIN_FLAG_CACHED as _; #[doc(alias = "GST_PLUGIN_FLAG_BLACKLISTED")] - const BLACKLISTED = ffi::GST_PLUGIN_FLAG_BLACKLISTED as u32; + const BLACKLISTED = ffi::GST_PLUGIN_FLAG_BLACKLISTED as _; } } @@ -1478,11 +1478,11 @@ bitflags! { #[doc(alias = "GstSchedulingFlags")] pub struct SchedulingFlags: u32 { #[doc(alias = "GST_SCHEDULING_FLAG_SEEKABLE")] - const SEEKABLE = ffi::GST_SCHEDULING_FLAG_SEEKABLE as u32; + const SEEKABLE = ffi::GST_SCHEDULING_FLAG_SEEKABLE as _; #[doc(alias = "GST_SCHEDULING_FLAG_SEQUENTIAL")] - const SEQUENTIAL = ffi::GST_SCHEDULING_FLAG_SEQUENTIAL as u32; + const SEQUENTIAL = ffi::GST_SCHEDULING_FLAG_SEQUENTIAL as _; #[doc(alias = "GST_SCHEDULING_FLAG_BANDWIDTH_LIMITED")] - const BANDWIDTH_LIMITED = ffi::GST_SCHEDULING_FLAG_BANDWIDTH_LIMITED as u32; + const BANDWIDTH_LIMITED = ffi::GST_SCHEDULING_FLAG_BANDWIDTH_LIMITED as _; } } @@ -1540,35 +1540,35 @@ bitflags! { #[doc(alias = "GstSeekFlags")] pub struct SeekFlags: u32 { #[doc(alias = "GST_SEEK_FLAG_FLUSH")] - const FLUSH = ffi::GST_SEEK_FLAG_FLUSH as u32; + const FLUSH = ffi::GST_SEEK_FLAG_FLUSH as _; #[doc(alias = "GST_SEEK_FLAG_ACCURATE")] - const ACCURATE = ffi::GST_SEEK_FLAG_ACCURATE as u32; + const ACCURATE = ffi::GST_SEEK_FLAG_ACCURATE as _; #[doc(alias = "GST_SEEK_FLAG_KEY_UNIT")] - const KEY_UNIT = ffi::GST_SEEK_FLAG_KEY_UNIT as u32; + const KEY_UNIT = ffi::GST_SEEK_FLAG_KEY_UNIT as _; #[doc(alias = "GST_SEEK_FLAG_SEGMENT")] - const SEGMENT = ffi::GST_SEEK_FLAG_SEGMENT as u32; + const SEGMENT = ffi::GST_SEEK_FLAG_SEGMENT as _; #[doc(alias = "GST_SEEK_FLAG_TRICKMODE")] - const TRICKMODE = ffi::GST_SEEK_FLAG_TRICKMODE as u32; + const TRICKMODE = ffi::GST_SEEK_FLAG_TRICKMODE as _; #[doc(alias = "GST_SEEK_FLAG_SKIP")] - const SKIP = ffi::GST_SEEK_FLAG_SKIP as u32; + const SKIP = ffi::GST_SEEK_FLAG_SKIP as _; #[doc(alias = "GST_SEEK_FLAG_SNAP_BEFORE")] - const SNAP_BEFORE = ffi::GST_SEEK_FLAG_SNAP_BEFORE as u32; + const SNAP_BEFORE = ffi::GST_SEEK_FLAG_SNAP_BEFORE as _; #[doc(alias = "GST_SEEK_FLAG_SNAP_AFTER")] - const SNAP_AFTER = ffi::GST_SEEK_FLAG_SNAP_AFTER as u32; + const SNAP_AFTER = ffi::GST_SEEK_FLAG_SNAP_AFTER as _; #[doc(alias = "GST_SEEK_FLAG_SNAP_NEAREST")] - const SNAP_NEAREST = ffi::GST_SEEK_FLAG_SNAP_NEAREST as u32; + const SNAP_NEAREST = ffi::GST_SEEK_FLAG_SNAP_NEAREST as _; #[doc(alias = "GST_SEEK_FLAG_TRICKMODE_KEY_UNITS")] - const TRICKMODE_KEY_UNITS = ffi::GST_SEEK_FLAG_TRICKMODE_KEY_UNITS as u32; + const TRICKMODE_KEY_UNITS = ffi::GST_SEEK_FLAG_TRICKMODE_KEY_UNITS as _; #[doc(alias = "GST_SEEK_FLAG_TRICKMODE_NO_AUDIO")] - const TRICKMODE_NO_AUDIO = ffi::GST_SEEK_FLAG_TRICKMODE_NO_AUDIO as u32; + const TRICKMODE_NO_AUDIO = ffi::GST_SEEK_FLAG_TRICKMODE_NO_AUDIO as _; #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] #[doc(alias = "GST_SEEK_FLAG_TRICKMODE_FORWARD_PREDICTED")] - const TRICKMODE_FORWARD_PREDICTED = ffi::GST_SEEK_FLAG_TRICKMODE_FORWARD_PREDICTED as u32; + const TRICKMODE_FORWARD_PREDICTED = ffi::GST_SEEK_FLAG_TRICKMODE_FORWARD_PREDICTED as _; #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] #[doc(alias = "GST_SEEK_FLAG_INSTANT_RATE_CHANGE")] - const INSTANT_RATE_CHANGE = ffi::GST_SEEK_FLAG_INSTANT_RATE_CHANGE as u32; + const INSTANT_RATE_CHANGE = ffi::GST_SEEK_FLAG_INSTANT_RATE_CHANGE as _; } } @@ -1626,21 +1626,21 @@ bitflags! { #[doc(alias = "GstSegmentFlags")] pub struct SegmentFlags: u32 { #[doc(alias = "GST_SEGMENT_FLAG_RESET")] - const RESET = ffi::GST_SEGMENT_FLAG_RESET as u32; + const RESET = ffi::GST_SEGMENT_FLAG_RESET as _; #[doc(alias = "GST_SEGMENT_FLAG_TRICKMODE")] - const TRICKMODE = ffi::GST_SEGMENT_FLAG_TRICKMODE as u32; + const TRICKMODE = ffi::GST_SEGMENT_FLAG_TRICKMODE as _; #[doc(alias = "GST_SEGMENT_FLAG_SKIP")] - const SKIP = ffi::GST_SEGMENT_FLAG_SKIP as u32; + const SKIP = ffi::GST_SEGMENT_FLAG_SKIP as _; #[doc(alias = "GST_SEGMENT_FLAG_SEGMENT")] - const SEGMENT = ffi::GST_SEGMENT_FLAG_SEGMENT as u32; + const SEGMENT = ffi::GST_SEGMENT_FLAG_SEGMENT as _; #[doc(alias = "GST_SEGMENT_FLAG_TRICKMODE_KEY_UNITS")] - const TRICKMODE_KEY_UNITS = ffi::GST_SEGMENT_FLAG_TRICKMODE_KEY_UNITS as u32; + const TRICKMODE_KEY_UNITS = ffi::GST_SEGMENT_FLAG_TRICKMODE_KEY_UNITS as _; #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] #[doc(alias = "GST_SEGMENT_FLAG_TRICKMODE_FORWARD_PREDICTED")] - const TRICKMODE_FORWARD_PREDICTED = ffi::GST_SEGMENT_FLAG_TRICKMODE_FORWARD_PREDICTED as u32; + const TRICKMODE_FORWARD_PREDICTED = ffi::GST_SEGMENT_FLAG_TRICKMODE_FORWARD_PREDICTED as _; #[doc(alias = "GST_SEGMENT_FLAG_TRICKMODE_NO_AUDIO")] - const TRICKMODE_NO_AUDIO = ffi::GST_SEGMENT_FLAG_TRICKMODE_NO_AUDIO as u32; + const TRICKMODE_NO_AUDIO = ffi::GST_SEGMENT_FLAG_TRICKMODE_NO_AUDIO as _; } } @@ -1700,9 +1700,9 @@ bitflags! { #[doc(alias = "GstSerializeFlags")] pub struct SerializeFlags: u32 { #[doc(alias = "GST_SERIALIZE_FLAG_NONE")] - const NONE = ffi::GST_SERIALIZE_FLAG_NONE as u32; + const NONE = ffi::GST_SERIALIZE_FLAG_NONE as _; #[doc(alias = "GST_SERIALIZE_FLAG_BACKWARD_COMPAT")] - const BACKWARD_COMPAT = ffi::GST_SERIALIZE_FLAG_BACKWARD_COMPAT as u32; + const BACKWARD_COMPAT = ffi::GST_SERIALIZE_FLAG_BACKWARD_COMPAT as _; } } @@ -1772,7 +1772,7 @@ bitflags! { #[doc(alias = "GstStackTraceFlags")] pub struct StackTraceFlags: u32 { #[doc(alias = "GST_STACK_TRACE_SHOW_FULL")] - const FULL = ffi::GST_STACK_TRACE_SHOW_FULL as u32; + const FULL = ffi::GST_STACK_TRACE_SHOW_FULL as _; } } @@ -1830,11 +1830,11 @@ bitflags! { #[doc(alias = "GstStreamFlags")] pub struct StreamFlags: u32 { #[doc(alias = "GST_STREAM_FLAG_SPARSE")] - const SPARSE = ffi::GST_STREAM_FLAG_SPARSE as u32; + const SPARSE = ffi::GST_STREAM_FLAG_SPARSE as _; #[doc(alias = "GST_STREAM_FLAG_SELECT")] - const SELECT = ffi::GST_STREAM_FLAG_SELECT as u32; + const SELECT = ffi::GST_STREAM_FLAG_SELECT as _; #[doc(alias = "GST_STREAM_FLAG_UNSELECT")] - const UNSELECT = ffi::GST_STREAM_FLAG_UNSELECT as u32; + const UNSELECT = ffi::GST_STREAM_FLAG_UNSELECT as _; } } @@ -1892,15 +1892,15 @@ bitflags! { #[doc(alias = "GstStreamType")] pub struct StreamType: u32 { #[doc(alias = "GST_STREAM_TYPE_UNKNOWN")] - const UNKNOWN = ffi::GST_STREAM_TYPE_UNKNOWN as u32; + const UNKNOWN = ffi::GST_STREAM_TYPE_UNKNOWN as _; #[doc(alias = "GST_STREAM_TYPE_AUDIO")] - const AUDIO = ffi::GST_STREAM_TYPE_AUDIO as u32; + const AUDIO = ffi::GST_STREAM_TYPE_AUDIO as _; #[doc(alias = "GST_STREAM_TYPE_VIDEO")] - const VIDEO = ffi::GST_STREAM_TYPE_VIDEO as u32; + const VIDEO = ffi::GST_STREAM_TYPE_VIDEO as _; #[doc(alias = "GST_STREAM_TYPE_CONTAINER")] - const CONTAINER = ffi::GST_STREAM_TYPE_CONTAINER as u32; + const CONTAINER = ffi::GST_STREAM_TYPE_CONTAINER as _; #[doc(alias = "GST_STREAM_TYPE_TEXT")] - const TEXT = ffi::GST_STREAM_TYPE_TEXT as u32; + const TEXT = ffi::GST_STREAM_TYPE_TEXT as _; } } diff --git a/gstreamer/src/auto/versions.txt b/gstreamer/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer/src/auto/versions.txt +++ b/gstreamer/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer/sys/build.rs b/gstreamer/sys/build.rs index 5762ce067..40e2cc398 100644 --- a/gstreamer/sys/build.rs +++ b/gstreamer/sys/build.rs @@ -12,7 +12,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure #[cfg(not(feature = "dox"))] fn main() { if let Err(s) = system_deps::Config::new().probe() { - println!("cargo:warning={}", s); + println!("cargo:warning={s}"); process::exit(1); } } diff --git a/gstreamer/sys/src/auto/versions.txt b/gstreamer/sys/src/auto/versions.txt index 4a81d3ac4..7ebb98936 100644 --- a/gstreamer/sys/src/auto/versions.txt +++ b/gstreamer/sys/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 952ff416b599) +Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4) from gir-files (https://github.com/gtk-rs/gir-files @ 89a11aa6a362) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ ad1d9ed0a03e) diff --git a/gstreamer/sys/src/lib.rs b/gstreamer/sys/src/lib.rs index 15fe57a69..68b28da6e 100644 --- a/gstreamer/sys/src/lib.rs +++ b/gstreamer/sys/src/lib.rs @@ -995,7 +995,7 @@ pub union GstControlBinding_ABI { impl ::std::fmt::Debug for GstControlBinding_ABI { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstControlBinding_ABI @ {:p}", self)) + f.debug_struct(&format!("GstControlBinding_ABI @ {self:p}")) .field("abi", unsafe { &self.abi }) .finish() } @@ -1010,7 +1010,7 @@ pub union GstPadProbeInfo_ABI { impl ::std::fmt::Debug for GstPadProbeInfo_ABI { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPadProbeInfo_ABI @ {:p}", self)) + f.debug_struct(&format!("GstPadProbeInfo_ABI @ {self:p}")) .field("_gst_reserved", unsafe { &self._gst_reserved }) .field("abi", unsafe { &self.abi }) .finish() @@ -1026,7 +1026,7 @@ pub union GstPadTemplate_ABI { impl ::std::fmt::Debug for GstPadTemplate_ABI { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPadTemplate_ABI @ {:p}", self)) + f.debug_struct(&format!("GstPadTemplate_ABI @ {self:p}")) .field("_gst_reserved", unsafe { &self._gst_reserved }) .field("abi", unsafe { &self.abi }) .finish() @@ -1042,7 +1042,7 @@ pub union GstPad_ABI { impl ::std::fmt::Debug for GstPad_ABI { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPad_ABI @ {:p}", self)) + f.debug_struct(&format!("GstPad_ABI @ {self:p}")) .field("_gst_reserved", unsafe { &self._gst_reserved }) .field("abi", unsafe { &self.abi }) .finish() @@ -1225,7 +1225,7 @@ pub struct GstAllocationParams { impl ::std::fmt::Debug for GstAllocationParams { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAllocationParams @ {:p}", self)) + f.debug_struct(&format!("GstAllocationParams @ {self:p}")) .field("flags", &self.flags) .field("align", &self.align) .field("prefix", &self.prefix) @@ -1247,7 +1247,7 @@ pub struct GstAllocatorClass { impl ::std::fmt::Debug for GstAllocatorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAllocatorClass @ {:p}", self)) + f.debug_struct(&format!("GstAllocatorClass @ {self:p}")) .field("object_class", &self.object_class) .field("alloc", &self.alloc) .field("free", &self.free) @@ -1271,7 +1271,7 @@ pub struct GstAtomicQueue { impl ::std::fmt::Debug for GstAtomicQueue { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAtomicQueue @ {:p}", self)) + f.debug_struct(&format!("GstAtomicQueue @ {self:p}")) .finish() } } @@ -1295,7 +1295,7 @@ pub struct GstBinClass { impl ::std::fmt::Debug for GstBinClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBinClass @ {:p}", self)) + f.debug_struct(&format!("GstBinClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("element_added", &self.element_added) .field("element_removed", &self.element_removed) @@ -1331,7 +1331,7 @@ pub struct GstBuffer { impl ::std::fmt::Debug for GstBuffer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBuffer @ {:p}", self)) + f.debug_struct(&format!("GstBuffer @ {self:p}")) .field("mini_object", &self.mini_object) .field("pool", &self.pool) .field("pts", &self.pts) @@ -1351,7 +1351,7 @@ pub struct GstBufferList { impl ::std::fmt::Debug for GstBufferList { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBufferList @ {:p}", self)) + f.debug_struct(&format!("GstBufferList @ {self:p}")) .finish() } } @@ -1368,7 +1368,7 @@ pub struct GstBufferPoolAcquireParams { impl ::std::fmt::Debug for GstBufferPoolAcquireParams { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBufferPoolAcquireParams @ {:p}", self)) + f.debug_struct(&format!("GstBufferPoolAcquireParams @ {self:p}")) .field("format", &self.format) .field("start", &self.start) .field("stop", &self.stop) @@ -1409,7 +1409,7 @@ pub struct GstBufferPoolClass { impl ::std::fmt::Debug for GstBufferPoolClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBufferPoolClass @ {:p}", self)) + f.debug_struct(&format!("GstBufferPoolClass @ {self:p}")) .field("object_class", &self.object_class) .field("get_options", &self.get_options) .field("set_config", &self.set_config) @@ -1445,7 +1445,7 @@ pub struct GstBusClass { impl ::std::fmt::Debug for GstBusClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBusClass @ {:p}", self)) + f.debug_struct(&format!("GstBusClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("message", &self.message) .field("sync_message", &self.sync_message) @@ -1469,7 +1469,7 @@ pub struct GstCaps { impl ::std::fmt::Debug for GstCaps { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstCaps @ {:p}", self)) + f.debug_struct(&format!("GstCaps @ {self:p}")) .field("mini_object", &self.mini_object) .finish() } @@ -1483,7 +1483,7 @@ pub struct GstCapsFeatures { impl ::std::fmt::Debug for GstCapsFeatures { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstCapsFeatures @ {:p}", self)) + f.debug_struct(&format!("GstCapsFeatures @ {self:p}")) .finish() } } @@ -1506,7 +1506,7 @@ pub struct GstChildProxyInterface { impl ::std::fmt::Debug for GstChildProxyInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstChildProxyInterface @ {:p}", self)) + f.debug_struct(&format!("GstChildProxyInterface @ {self:p}")) .field("parent", &self.parent) .field("get_child_by_name", &self.get_child_by_name) .field("get_child_by_index", &self.get_child_by_index) @@ -1540,7 +1540,7 @@ pub struct GstClockClass { impl ::std::fmt::Debug for GstClockClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstClockClass @ {:p}", self)) + f.debug_struct(&format!("GstClockClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("change_resolution", &self.change_resolution) .field("get_resolution", &self.get_resolution) @@ -1571,7 +1571,7 @@ pub struct GstClockEntry { impl ::std::fmt::Debug for GstClockEntry { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstClockEntry @ {:p}", self)) + f.debug_struct(&format!("GstClockEntry @ {self:p}")) .field("refcount", &self.refcount) .finish() } @@ -1593,7 +1593,7 @@ pub struct GstContext { impl ::std::fmt::Debug for GstContext { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstContext @ {:p}", self)).finish() + f.debug_struct(&format!("GstContext @ {self:p}")).finish() } } @@ -1634,7 +1634,7 @@ pub struct GstControlBindingClass { impl ::std::fmt::Debug for GstControlBindingClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstControlBindingClass @ {:p}", self)) + f.debug_struct(&format!("GstControlBindingClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("sync_values", &self.sync_values) .field("get_value", &self.get_value) @@ -1660,7 +1660,7 @@ pub struct GstControlBinding_ABI_abi { impl ::std::fmt::Debug for GstControlBinding_ABI_abi { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstControlBinding_ABI_abi @ {:p}", self)) + f.debug_struct(&format!("GstControlBinding_ABI_abi @ {self:p}")) .finish() } } @@ -1674,7 +1674,7 @@ pub struct GstControlSourceClass { impl ::std::fmt::Debug for GstControlSourceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstControlSourceClass @ {:p}", self)) + f.debug_struct(&format!("GstControlSourceClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -1688,7 +1688,7 @@ pub struct GstCustomMeta { impl ::std::fmt::Debug for GstCustomMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstCustomMeta @ {:p}", self)) + f.debug_struct(&format!("GstCustomMeta @ {self:p}")) .field("meta", &self.meta) .finish() } @@ -1702,8 +1702,7 @@ pub struct GstDateTime { impl ::std::fmt::Debug for GstDateTime { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDateTime @ {:p}", self)) - .finish() + f.debug_struct(&format!("GstDateTime @ {self:p}")).finish() } } @@ -1718,7 +1717,7 @@ pub struct GstDebugCategory { impl ::std::fmt::Debug for GstDebugCategory { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDebugCategory @ {:p}", self)) + f.debug_struct(&format!("GstDebugCategory @ {self:p}")) .finish() } } @@ -1744,7 +1743,7 @@ pub struct GstDeviceClass { impl ::std::fmt::Debug for GstDeviceClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDeviceClass @ {:p}", self)) + f.debug_struct(&format!("GstDeviceClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("create_element", &self.create_element) .field("reconfigure_element", &self.reconfigure_element) @@ -1761,7 +1760,7 @@ pub struct GstDeviceMonitorClass { impl ::std::fmt::Debug for GstDeviceMonitorClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDeviceMonitorClass @ {:p}", self)) + f.debug_struct(&format!("GstDeviceMonitorClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -1797,7 +1796,7 @@ pub struct GstDeviceProviderClass { impl ::std::fmt::Debug for GstDeviceProviderClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDeviceProviderClass @ {:p}", self)) + f.debug_struct(&format!("GstDeviceProviderClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("factory", &self.factory) .field("probe", &self.probe) @@ -1876,7 +1875,7 @@ pub struct GstElementClass { impl ::std::fmt::Debug for GstElementClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstElementClass @ {:p}", self)) + f.debug_struct(&format!("GstElementClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("metadata", &self.metadata) .field("elementfactory", &self.elementfactory) @@ -1922,7 +1921,7 @@ pub struct GstEvent { impl ::std::fmt::Debug for GstEvent { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstEvent @ {:p}", self)) + f.debug_struct(&format!("GstEvent @ {self:p}")) .field("mini_object", &self.mini_object) .field("type_", &self.type_) .field("timestamp", &self.timestamp) @@ -1942,7 +1941,7 @@ pub struct GstFormatDefinition { impl ::std::fmt::Debug for GstFormatDefinition { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstFormatDefinition @ {:p}", self)) + f.debug_struct(&format!("GstFormatDefinition @ {self:p}")) .field("value", &self.value) .field("nick", &self.nick) .field("description", &self.description) @@ -1960,7 +1959,7 @@ pub struct GstGhostPadClass { impl ::std::fmt::Debug for GstGhostPadClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGhostPadClass @ {:p}", self)) + f.debug_struct(&format!("GstGhostPadClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -1993,7 +1992,7 @@ pub struct GstIterator { impl ::std::fmt::Debug for GstIterator { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstIterator @ {:p}", self)) + f.debug_struct(&format!("GstIterator @ {self:p}")) .field("copy", &self.copy) .field("next", &self.next) .field("item", &self.item) @@ -2023,7 +2022,7 @@ pub struct GstMapInfo { impl ::std::fmt::Debug for GstMapInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMapInfo @ {:p}", self)) + f.debug_struct(&format!("GstMapInfo @ {self:p}")) .field("memory", &self.memory) .field("flags", &self.flags) .field("data", &self.data) @@ -2048,7 +2047,7 @@ pub struct GstMemory { impl ::std::fmt::Debug for GstMemory { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMemory @ {:p}", self)) + f.debug_struct(&format!("GstMemory @ {self:p}")) .field("mini_object", &self.mini_object) .field("allocator", &self.allocator) .field("parent", &self.parent) @@ -2074,7 +2073,7 @@ pub struct GstMessage { impl ::std::fmt::Debug for GstMessage { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMessage @ {:p}", self)) + f.debug_struct(&format!("GstMessage @ {self:p}")) .field("mini_object", &self.mini_object) .field("type_", &self.type_) .field("timestamp", &self.timestamp) @@ -2093,7 +2092,7 @@ pub struct GstMeta { impl ::std::fmt::Debug for GstMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMeta @ {:p}", self)) + f.debug_struct(&format!("GstMeta @ {self:p}")) .field("flags", &self.flags) .field("info", &self.info) .finish() @@ -2113,7 +2112,7 @@ pub struct GstMetaInfo { impl ::std::fmt::Debug for GstMetaInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMetaInfo @ {:p}", self)) + f.debug_struct(&format!("GstMetaInfo @ {self:p}")) .field("api", &self.api) .field("type_", &self.type_) .field("size", &self.size) @@ -2134,7 +2133,7 @@ pub struct GstMetaTransformCopy { impl ::std::fmt::Debug for GstMetaTransformCopy { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMetaTransformCopy @ {:p}", self)) + f.debug_struct(&format!("GstMetaTransformCopy @ {self:p}")) .field("region", &self.region) .field("offset", &self.offset) .field("size", &self.size) @@ -2158,7 +2157,7 @@ pub struct GstMiniObject { impl ::std::fmt::Debug for GstMiniObject { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstMiniObject @ {:p}", self)) + f.debug_struct(&format!("GstMiniObject @ {self:p}")) .field("type_", &self.type_) .field("refcount", &self.refcount) .field("lockstate", &self.lockstate) @@ -2182,7 +2181,7 @@ pub struct GstObjectClass { impl ::std::fmt::Debug for GstObjectClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstObjectClass @ {:p}", self)) + f.debug_struct(&format!("GstObjectClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("path_string_separator", &self.path_string_separator) .field("deep_notify", &self.deep_notify) @@ -2201,7 +2200,7 @@ pub struct GstPadClass { impl ::std::fmt::Debug for GstPadClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPadClass @ {:p}", self)) + f.debug_struct(&format!("GstPadClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("linked", &self.linked) .field("unlinked", &self.unlinked) @@ -2230,7 +2229,7 @@ pub struct GstPadProbeInfo { impl ::std::fmt::Debug for GstPadProbeInfo { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPadProbeInfo @ {:p}", self)) + f.debug_struct(&format!("GstPadProbeInfo @ {self:p}")) .field("type_", &self.type_) .field("id", &self.id) .field("data", &self.data) @@ -2249,7 +2248,7 @@ pub struct GstPadProbeInfo_ABI_abi { impl ::std::fmt::Debug for GstPadProbeInfo_ABI_abi { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPadProbeInfo_ABI_abi @ {:p}", self)) + f.debug_struct(&format!("GstPadProbeInfo_ABI_abi @ {self:p}")) .field("flow_ret", &self.flow_ret) .finish() } @@ -2265,7 +2264,7 @@ pub struct GstPadTemplateClass { impl ::std::fmt::Debug for GstPadTemplateClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPadTemplateClass @ {:p}", self)) + f.debug_struct(&format!("GstPadTemplateClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("pad_created", &self.pad_created) .finish() @@ -2281,7 +2280,7 @@ pub struct GstPadTemplate_ABI_abi { impl ::std::fmt::Debug for GstPadTemplate_ABI_abi { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPadTemplate_ABI_abi @ {:p}", self)) + f.debug_struct(&format!("GstPadTemplate_ABI_abi @ {self:p}")) .field("gtype", &self.gtype) .field("documentation_caps", &self.documentation_caps) .finish() @@ -2297,7 +2296,7 @@ pub struct GstPad_ABI_abi { impl ::std::fmt::Debug for GstPad_ABI_abi { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPad_ABI_abi @ {:p}", self)) + f.debug_struct(&format!("GstPad_ABI_abi @ {self:p}")) .field("last_flowret", &self.last_flowret) .field("eventfullfunc", &self.eventfullfunc) .finish() @@ -2313,7 +2312,7 @@ pub struct GstParamSpecArray { impl ::std::fmt::Debug for GstParamSpecArray { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstParamSpecArray @ {:p}", self)) + f.debug_struct(&format!("GstParamSpecArray @ {self:p}")) .field("parent_instance", &self.parent_instance) .field("element_spec", &self.element_spec) .finish() @@ -2334,7 +2333,7 @@ pub struct GstParamSpecFraction { impl ::std::fmt::Debug for GstParamSpecFraction { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstParamSpecFraction @ {:p}", self)) + f.debug_struct(&format!("GstParamSpecFraction @ {self:p}")) .field("parent_instance", &self.parent_instance) .field("min_num", &self.min_num) .field("min_den", &self.min_den) @@ -2355,7 +2354,7 @@ pub struct GstParentBufferMeta { impl ::std::fmt::Debug for GstParentBufferMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstParentBufferMeta @ {:p}", self)) + f.debug_struct(&format!("GstParentBufferMeta @ {self:p}")) .field("parent", &self.parent) .field("buffer", &self.buffer) .finish() @@ -2370,7 +2369,7 @@ pub struct GstParseContext { impl ::std::fmt::Debug for GstParseContext { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstParseContext @ {:p}", self)) + f.debug_struct(&format!("GstParseContext @ {self:p}")) .finish() } } @@ -2384,7 +2383,7 @@ pub struct GstPipelineClass { impl ::std::fmt::Debug for GstPipelineClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPipelineClass @ {:p}", self)) + f.debug_struct(&format!("GstPipelineClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -2425,7 +2424,7 @@ pub struct GstPluginDesc { impl ::std::fmt::Debug for GstPluginDesc { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPluginDesc @ {:p}", self)) + f.debug_struct(&format!("GstPluginDesc @ {self:p}")) .field("major_version", &self.major_version) .field("minor_version", &self.minor_version) .field("name", &self.name) @@ -2466,7 +2465,7 @@ pub struct GstPollFD { impl ::std::fmt::Debug for GstPollFD { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPollFD @ {:p}", self)) + f.debug_struct(&format!("GstPollFD @ {self:p}")) .field("fd", &self.fd) .finish() } @@ -2504,7 +2503,7 @@ pub struct GstPresetInterface { impl ::std::fmt::Debug for GstPresetInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPresetInterface @ {:p}", self)) + f.debug_struct(&format!("GstPresetInterface @ {self:p}")) .field("parent", &self.parent) .field("get_preset_names", &self.get_preset_names) .field("get_property_names", &self.get_property_names) @@ -2526,7 +2525,7 @@ pub struct GstPromise { impl ::std::fmt::Debug for GstPromise { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPromise @ {:p}", self)) + f.debug_struct(&format!("GstPromise @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -2541,7 +2540,7 @@ pub struct GstProtectionMeta { impl ::std::fmt::Debug for GstProtectionMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstProtectionMeta @ {:p}", self)) + f.debug_struct(&format!("GstProtectionMeta @ {self:p}")) .field("meta", &self.meta) .field("info", &self.info) .finish() @@ -2557,7 +2556,7 @@ pub struct GstProxyPadClass { impl ::std::fmt::Debug for GstProxyPadClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstProxyPadClass @ {:p}", self)) + f.debug_struct(&format!("GstProxyPadClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -2580,7 +2579,7 @@ pub struct GstQuery { impl ::std::fmt::Debug for GstQuery { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstQuery @ {:p}", self)) + f.debug_struct(&format!("GstQuery @ {self:p}")) .field("mini_object", &self.mini_object) .field("type_", &self.type_) .finish() @@ -2598,7 +2597,7 @@ pub struct GstReferenceTimestampMeta { impl ::std::fmt::Debug for GstReferenceTimestampMeta { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstReferenceTimestampMeta @ {:p}", self)) + f.debug_struct(&format!("GstReferenceTimestampMeta @ {self:p}")) .field("parent", &self.parent) .field("reference", &self.reference) .field("timestamp", &self.timestamp) @@ -2615,7 +2614,7 @@ pub struct GstRegistryClass { impl ::std::fmt::Debug for GstRegistryClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRegistryClass @ {:p}", self)) + f.debug_struct(&format!("GstRegistryClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -2637,7 +2636,7 @@ pub struct GstSample { impl ::std::fmt::Debug for GstSample { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSample @ {:p}", self)).finish() + f.debug_struct(&format!("GstSample @ {self:p}")).finish() } } @@ -2660,7 +2659,7 @@ pub struct GstSegment { impl ::std::fmt::Debug for GstSegment { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSegment @ {:p}", self)) + f.debug_struct(&format!("GstSegment @ {self:p}")) .field("flags", &self.flags) .field("rate", &self.rate) .field("applied_rate", &self.applied_rate) @@ -2685,7 +2684,7 @@ pub struct GstSharedTaskPoolClass { impl ::std::fmt::Debug for GstSharedTaskPoolClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSharedTaskPoolClass @ {:p}", self)) + f.debug_struct(&format!("GstSharedTaskPoolClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -2709,7 +2708,7 @@ pub struct GstStaticCaps { impl ::std::fmt::Debug for GstStaticCaps { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstStaticCaps @ {:p}", self)) + f.debug_struct(&format!("GstStaticCaps @ {self:p}")) .field("caps", &self.caps) .field("string", &self.string) .finish() @@ -2727,7 +2726,7 @@ pub struct GstStaticPadTemplate { impl ::std::fmt::Debug for GstStaticPadTemplate { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstStaticPadTemplate @ {:p}", self)) + f.debug_struct(&format!("GstStaticPadTemplate @ {self:p}")) .field("name_template", &self.name_template) .field("direction", &self.direction) .field("presence", &self.presence) @@ -2745,7 +2744,7 @@ pub struct GstStreamClass { impl ::std::fmt::Debug for GstStreamClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstStreamClass @ {:p}", self)) + f.debug_struct(&format!("GstStreamClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -2763,7 +2762,7 @@ pub struct GstStreamCollectionClass { impl ::std::fmt::Debug for GstStreamCollectionClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstStreamCollectionClass @ {:p}", self)) + f.debug_struct(&format!("GstStreamCollectionClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("stream_notify", &self.stream_notify) .finish() @@ -2795,7 +2794,7 @@ pub struct GstStructure { impl ::std::fmt::Debug for GstStructure { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstStructure @ {:p}", self)) + f.debug_struct(&format!("GstStructure @ {self:p}")) .field("type_", &self.type_) .finish() } @@ -2810,7 +2809,7 @@ pub struct GstSystemClockClass { impl ::std::fmt::Debug for GstSystemClockClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSystemClockClass @ {:p}", self)) + f.debug_struct(&format!("GstSystemClockClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -2832,7 +2831,7 @@ pub struct GstTagList { impl ::std::fmt::Debug for GstTagList { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTagList @ {:p}", self)) + f.debug_struct(&format!("GstTagList @ {self:p}")) .field("mini_object", &self.mini_object) .finish() } @@ -2846,7 +2845,7 @@ pub struct GstTagSetterInterface { impl ::std::fmt::Debug for GstTagSetterInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTagSetterInterface @ {:p}", self)) + f.debug_struct(&format!("GstTagSetterInterface @ {self:p}")) .field("g_iface", &self.g_iface) .finish() } @@ -2862,7 +2861,7 @@ pub struct GstTaskClass { impl ::std::fmt::Debug for GstTaskClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTaskClass @ {:p}", self)) + f.debug_struct(&format!("GstTaskClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -2889,7 +2888,7 @@ pub struct GstTaskPoolClass { impl ::std::fmt::Debug for GstTaskPoolClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTaskPoolClass @ {:p}", self)) + f.debug_struct(&format!("GstTaskPoolClass @ {self:p}")) .field("parent_class", &self.parent_class) .field("prepare", &self.prepare) .field("cleanup", &self.cleanup) @@ -2917,7 +2916,7 @@ pub struct GstTimedValue { impl ::std::fmt::Debug for GstTimedValue { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTimedValue @ {:p}", self)) + f.debug_struct(&format!("GstTimedValue @ {self:p}")) .field("timestamp", &self.timestamp) .field("value", &self.value) .finish() @@ -2932,7 +2931,7 @@ pub struct GstToc { impl ::std::fmt::Debug for GstToc { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstToc @ {:p}", self)).finish() + f.debug_struct(&format!("GstToc @ {self:p}")).finish() } } @@ -2944,8 +2943,7 @@ pub struct GstTocEntry { impl ::std::fmt::Debug for GstTocEntry { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTocEntry @ {:p}", self)) - .finish() + f.debug_struct(&format!("GstTocEntry @ {self:p}")).finish() } } @@ -2957,7 +2955,7 @@ pub struct GstTocSetterInterface { impl ::std::fmt::Debug for GstTocSetterInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTocSetterInterface @ {:p}", self)) + f.debug_struct(&format!("GstTocSetterInterface @ {self:p}")) .field("g_iface", &self.g_iface) .finish() } @@ -2972,7 +2970,7 @@ pub struct GstTracerClass { impl ::std::fmt::Debug for GstTracerClass { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTracerClass @ {:p}", self)) + f.debug_struct(&format!("GstTracerClass @ {self:p}")) .field("parent_class", &self.parent_class) .finish() } @@ -3014,7 +3012,7 @@ pub struct GstTypeFind { impl ::std::fmt::Debug for GstTypeFind { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTypeFind @ {:p}", self)) + f.debug_struct(&format!("GstTypeFind @ {self:p}")) .field("peek", &self.peek) .field("suggest", &self.suggest) .field("data", &self.data) @@ -3045,7 +3043,7 @@ pub struct GstURIHandlerInterface { impl ::std::fmt::Debug for GstURIHandlerInterface { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstURIHandlerInterface @ {:p}", self)) + f.debug_struct(&format!("GstURIHandlerInterface @ {self:p}")) .field("parent", &self.parent) .field("get_type", &self.get_type) .field("get_protocols", &self.get_protocols) @@ -3063,7 +3061,7 @@ pub struct GstUri { impl ::std::fmt::Debug for GstUri { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstUri @ {:p}", self)).finish() + f.debug_struct(&format!("GstUri @ {self:p}")).finish() } } @@ -3080,7 +3078,7 @@ pub struct GstValueTable { impl ::std::fmt::Debug for GstValueTable { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValueTable @ {:p}", self)) + f.debug_struct(&format!("GstValueTable @ {self:p}")) .field("type_", &self.type_) .field("compare", &self.compare) .field("serialize", &self.serialize) @@ -3109,7 +3107,7 @@ pub struct GstAllocator { impl ::std::fmt::Debug for GstAllocator { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstAllocator @ {:p}", self)) + f.debug_struct(&format!("GstAllocator @ {self:p}")) .field("object", &self.object) .field("mem_type", &self.mem_type) .field("mem_map", &self.mem_map) @@ -3143,7 +3141,7 @@ pub struct GstBin { impl ::std::fmt::Debug for GstBin { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBin @ {:p}", self)) + f.debug_struct(&format!("GstBin @ {self:p}")) .field("element", &self.element) .field("numchildren", &self.numchildren) .field("children", &self.children) @@ -3167,7 +3165,7 @@ pub struct GstBitmask { impl ::std::fmt::Debug for GstBitmask { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBitmask @ {:p}", self)).finish() + f.debug_struct(&format!("GstBitmask @ {self:p}")).finish() } } @@ -3182,7 +3180,7 @@ pub struct GstBufferPool { impl ::std::fmt::Debug for GstBufferPool { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBufferPool @ {:p}", self)) + f.debug_struct(&format!("GstBufferPool @ {self:p}")) .field("object", &self.object) .field("flushing", &self.flushing) .finish() @@ -3199,7 +3197,7 @@ pub struct GstBus { impl ::std::fmt::Debug for GstBus { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstBus @ {:p}", self)) + f.debug_struct(&format!("GstBus @ {self:p}")) .field("object", &self.object) .finish() } @@ -3215,7 +3213,7 @@ pub struct GstClock { impl ::std::fmt::Debug for GstClock { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstClock @ {:p}", self)) + f.debug_struct(&format!("GstClock @ {self:p}")) .field("object", &self.object) .finish() } @@ -3234,7 +3232,7 @@ pub struct GstControlBinding { impl ::std::fmt::Debug for GstControlBinding { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstControlBinding @ {:p}", self)) + f.debug_struct(&format!("GstControlBinding @ {self:p}")) .field("parent", &self.parent) .field("name", &self.name) .field("pspec", &self.pspec) @@ -3254,7 +3252,7 @@ pub struct GstControlSource { impl ::std::fmt::Debug for GstControlSource { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstControlSource @ {:p}", self)) + f.debug_struct(&format!("GstControlSource @ {self:p}")) .field("parent", &self.parent) .field("get_value", &self.get_value) .field("get_value_array", &self.get_value_array) @@ -3272,7 +3270,7 @@ pub struct GstDevice { impl ::std::fmt::Debug for GstDevice { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDevice @ {:p}", self)) + f.debug_struct(&format!("GstDevice @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -3288,7 +3286,7 @@ pub struct GstDeviceMonitor { impl ::std::fmt::Debug for GstDeviceMonitor { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDeviceMonitor @ {:p}", self)) + f.debug_struct(&format!("GstDeviceMonitor @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -3305,7 +3303,7 @@ pub struct GstDeviceProvider { impl ::std::fmt::Debug for GstDeviceProvider { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDeviceProvider @ {:p}", self)) + f.debug_struct(&format!("GstDeviceProvider @ {self:p}")) .field("parent", &self.parent) .field("devices", &self.devices) .finish() @@ -3320,7 +3318,7 @@ pub struct GstDeviceProviderFactory { impl ::std::fmt::Debug for GstDeviceProviderFactory { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDeviceProviderFactory @ {:p}", self)) + f.debug_struct(&format!("GstDeviceProviderFactory @ {self:p}")) .finish() } } @@ -3333,7 +3331,7 @@ pub struct GstDoubleRange { impl ::std::fmt::Debug for GstDoubleRange { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDoubleRange @ {:p}", self)) + f.debug_struct(&format!("GstDoubleRange @ {self:p}")) .finish() } } @@ -3346,7 +3344,7 @@ pub struct GstDynamicTypeFactory { impl ::std::fmt::Debug for GstDynamicTypeFactory { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstDynamicTypeFactory @ {:p}", self)) + f.debug_struct(&format!("GstDynamicTypeFactory @ {self:p}")) .finish() } } @@ -3380,7 +3378,7 @@ pub struct GstElement { impl ::std::fmt::Debug for GstElement { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstElement @ {:p}", self)) + f.debug_struct(&format!("GstElement @ {self:p}")) .field("object", &self.object) .field("state_lock", &self.state_lock) .field("state_cond", &self.state_cond) @@ -3414,7 +3412,7 @@ pub struct GstElementFactory { impl ::std::fmt::Debug for GstElementFactory { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstElementFactory @ {:p}", self)) + f.debug_struct(&format!("GstElementFactory @ {self:p}")) .finish() } } @@ -3427,7 +3425,7 @@ pub struct GstFlagSet { impl ::std::fmt::Debug for GstFlagSet { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstFlagSet @ {:p}", self)).finish() + f.debug_struct(&format!("GstFlagSet @ {self:p}")).finish() } } @@ -3439,8 +3437,7 @@ pub struct GstFraction { impl ::std::fmt::Debug for GstFraction { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstFraction @ {:p}", self)) - .finish() + f.debug_struct(&format!("GstFraction @ {self:p}")).finish() } } @@ -3452,7 +3449,7 @@ pub struct GstFractionRange { impl ::std::fmt::Debug for GstFractionRange { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstFractionRange @ {:p}", self)) + f.debug_struct(&format!("GstFractionRange @ {self:p}")) .finish() } } @@ -3466,7 +3463,7 @@ pub struct GstGhostPad { impl ::std::fmt::Debug for GstGhostPad { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstGhostPad @ {:p}", self)) + f.debug_struct(&format!("GstGhostPad @ {self:p}")) .field("pad", &self.pad) .finish() } @@ -3480,7 +3477,7 @@ pub struct GstInt64Range { impl ::std::fmt::Debug for GstInt64Range { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstInt64Range @ {:p}", self)) + f.debug_struct(&format!("GstInt64Range @ {self:p}")) .finish() } } @@ -3493,8 +3490,7 @@ pub struct GstIntRange { impl ::std::fmt::Debug for GstIntRange { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstIntRange @ {:p}", self)) - .finish() + f.debug_struct(&format!("GstIntRange @ {self:p}")).finish() } } @@ -3514,7 +3510,7 @@ pub struct GstObject { impl ::std::fmt::Debug for GstObject { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstObject @ {:p}", self)) + f.debug_struct(&format!("GstObject @ {self:p}")) .field("object", &self.object) .field("lock", &self.lock) .field("name", &self.name) @@ -3576,7 +3572,7 @@ pub struct GstPad { impl ::std::fmt::Debug for GstPad { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPad @ {:p}", self)) + f.debug_struct(&format!("GstPad @ {self:p}")) .field("object", &self.object) .field("element_private", &self.element_private) .field("padtemplate", &self.padtemplate) @@ -3599,7 +3595,7 @@ pub struct GstPadTemplate { impl ::std::fmt::Debug for GstPadTemplate { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPadTemplate @ {:p}", self)) + f.debug_struct(&format!("GstPadTemplate @ {self:p}")) .field("object", &self.object) .field("name_template", &self.name_template) .field("direction", &self.direction) @@ -3618,7 +3614,7 @@ pub struct GstParamArray { impl ::std::fmt::Debug for GstParamArray { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstParamArray @ {:p}", self)) + f.debug_struct(&format!("GstParamArray @ {self:p}")) .finish() } } @@ -3631,7 +3627,7 @@ pub struct GstParamFraction { impl ::std::fmt::Debug for GstParamFraction { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstParamFraction @ {:p}", self)) + f.debug_struct(&format!("GstParamFraction @ {self:p}")) .finish() } } @@ -3649,7 +3645,7 @@ pub struct GstPipeline { impl ::std::fmt::Debug for GstPipeline { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPipeline @ {:p}", self)) + f.debug_struct(&format!("GstPipeline @ {self:p}")) .field("bin", &self.bin) .field("fixed_clock", &self.fixed_clock) .field("stream_time", &self.stream_time) @@ -3666,7 +3662,7 @@ pub struct GstPlugin { impl ::std::fmt::Debug for GstPlugin { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPlugin @ {:p}", self)).finish() + f.debug_struct(&format!("GstPlugin @ {self:p}")).finish() } } @@ -3678,7 +3674,7 @@ pub struct GstPluginFeature { impl ::std::fmt::Debug for GstPluginFeature { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstPluginFeature @ {:p}", self)) + f.debug_struct(&format!("GstPluginFeature @ {self:p}")) .finish() } } @@ -3692,7 +3688,7 @@ pub struct GstProxyPad { impl ::std::fmt::Debug for GstProxyPad { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstProxyPad @ {:p}", self)) + f.debug_struct(&format!("GstProxyPad @ {self:p}")) .field("pad", &self.pad) .finish() } @@ -3707,7 +3703,7 @@ pub struct GstRegistry { impl ::std::fmt::Debug for GstRegistry { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstRegistry @ {:p}", self)) + f.debug_struct(&format!("GstRegistry @ {self:p}")) .field("object", &self.object) .finish() } @@ -3723,7 +3719,7 @@ pub struct GstSharedTaskPool { impl ::std::fmt::Debug for GstSharedTaskPool { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSharedTaskPool @ {:p}", self)) + f.debug_struct(&format!("GstSharedTaskPool @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -3740,7 +3736,7 @@ pub struct GstStream { impl ::std::fmt::Debug for GstStream { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstStream @ {:p}", self)) + f.debug_struct(&format!("GstStream @ {self:p}")) .field("stream_id", &self.stream_id) .finish() } @@ -3757,7 +3753,7 @@ pub struct GstStreamCollection { impl ::std::fmt::Debug for GstStreamCollection { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstStreamCollection @ {:p}", self)) + f.debug_struct(&format!("GstStreamCollection @ {self:p}")) .finish() } } @@ -3772,7 +3768,7 @@ pub struct GstSystemClock { impl ::std::fmt::Debug for GstSystemClock { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstSystemClock @ {:p}", self)) + f.debug_struct(&format!("GstSystemClock @ {self:p}")) .field("clock", &self.clock) .finish() } @@ -3796,7 +3792,7 @@ pub struct GstTask { impl ::std::fmt::Debug for GstTask { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTask @ {:p}", self)) + f.debug_struct(&format!("GstTask @ {self:p}")) .field("object", &self.object) .field("state", &self.state) .field("cond", &self.cond) @@ -3819,7 +3815,7 @@ pub struct GstTaskPool { impl ::std::fmt::Debug for GstTaskPool { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTaskPool @ {:p}", self)) + f.debug_struct(&format!("GstTaskPool @ {self:p}")) .field("object", &self.object) .finish() } @@ -3835,7 +3831,7 @@ pub struct GstTracer { impl ::std::fmt::Debug for GstTracer { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTracer @ {:p}", self)) + f.debug_struct(&format!("GstTracer @ {self:p}")) .field("parent", &self.parent) .finish() } @@ -3849,7 +3845,7 @@ pub struct GstTracerFactory { impl ::std::fmt::Debug for GstTracerFactory { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTracerFactory @ {:p}", self)) + f.debug_struct(&format!("GstTracerFactory @ {self:p}")) .finish() } } @@ -3862,7 +3858,7 @@ pub struct GstTracerRecord { impl ::std::fmt::Debug for GstTracerRecord { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTracerRecord @ {:p}", self)) + f.debug_struct(&format!("GstTracerRecord @ {self:p}")) .finish() } } @@ -3875,7 +3871,7 @@ pub struct GstTypeFindFactory { impl ::std::fmt::Debug for GstTypeFindFactory { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstTypeFindFactory @ {:p}", self)) + f.debug_struct(&format!("GstTypeFindFactory @ {self:p}")) .finish() } } @@ -3888,7 +3884,7 @@ pub struct GstValueArray { impl ::std::fmt::Debug for GstValueArray { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValueArray @ {:p}", self)) + f.debug_struct(&format!("GstValueArray @ {self:p}")) .finish() } } @@ -3901,8 +3897,7 @@ pub struct GstValueList { impl ::std::fmt::Debug for GstValueList { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - f.debug_struct(&format!("GstValueList @ {:p}", self)) - .finish() + f.debug_struct(&format!("GstValueList @ {self:p}")).finish() } } @@ -3915,7 +3910,7 @@ pub struct GstChildProxy { impl ::std::fmt::Debug for GstChildProxy { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstChildProxy @ {:p}", self) + write!(f, "GstChildProxy @ {self:p}") } } @@ -3927,7 +3922,7 @@ pub struct GstPreset { impl ::std::fmt::Debug for GstPreset { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstPreset @ {:p}", self) + write!(f, "GstPreset @ {self:p}") } } @@ -3939,7 +3934,7 @@ pub struct GstTagSetter { impl ::std::fmt::Debug for GstTagSetter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstTagSetter @ {:p}", self) + write!(f, "GstTagSetter @ {self:p}") } } @@ -3951,7 +3946,7 @@ pub struct GstTocSetter { impl ::std::fmt::Debug for GstTocSetter { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstTocSetter @ {:p}", self) + write!(f, "GstTocSetter @ {self:p}") } } @@ -3963,7 +3958,7 @@ pub struct GstURIHandler { impl ::std::fmt::Debug for GstURIHandler { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { - write!(f, "GstURIHandler @ {:p}", self) + write!(f, "GstURIHandler @ {self:p}") } } diff --git a/gstreamer/sys/tests/abi.rs b/gstreamer/sys/tests/abi.rs index 2abc58a55..8a6db63c7 100644 --- a/gstreamer/sys/tests/abi.rs +++ b/gstreamer/sys/tests/abi.rs @@ -41,7 +41,7 @@ impl Compiler { cmd.arg(out); let status = cmd.spawn()?.wait()?; if !status.success() { - return Err(format!("compilation command {:?} failed, {}", &cmd, status).into()); + return Err(format!("compilation command {cmd:?} failed, {status}").into()); } Ok(()) } @@ -57,7 +57,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { match env::var(name) { Ok(value) => Ok(shell_words::split(&value)?), Err(env::VarError::NotPresent) => Ok(shell_words::split(default)?), - Err(err) => Err(format!("{} {}", name, err).into()), + Err(err) => Err(format!("{name} {err}").into()), } } @@ -71,7 +71,7 @@ fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { cmd.args(packages); let out = cmd.output()?; if !out.status.success() { - return Err(format!("command {:?} returned {}", &cmd, out.status).into()); + return Err(format!("command {cmd:?} returned {}", out.status).into()); } let stdout = str::from_utf8(&out.stdout)?; Ok(shell_words::split(stdout.trim())?) @@ -127,15 +127,14 @@ fn cross_validate_constants_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_value != c_value { results.record_failed(); eprintln!( - "Constant value mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_value, &c_value + "Constant value mismatch for {rust_name}\nRust: {rust_value:?}\nC: {c_value:?}", ); continue; } @@ -165,16 +164,13 @@ fn cross_validate_layout_with_c() { { if rust_name != c_name { results.record_failed(); - eprintln!("Name mismatch:\nRust: {:?}\nC: {:?}", rust_name, c_name,); + eprintln!("Name mismatch:\nRust: {rust_name:?}\nC: {c_name:?}"); continue; } if rust_layout != c_layout { results.record_failed(); - eprintln!( - "Layout mismatch for {}\nRust: {:?}\nC: {:?}", - rust_name, rust_layout, &c_layout - ); + eprintln!("Layout mismatch for {rust_name}\nRust: {rust_layout:?}\nC: {c_layout:?}",); continue; } @@ -195,7 +191,7 @@ fn get_c_output(name: &str) -> Result> { let mut abi_cmd = Command::new(exe); let output = abi_cmd.output()?; if !output.status.success() { - return Err(format!("command {:?} failed, {:?}", &abi_cmd, &output).into()); + return Err(format!("command {abi_cmd:?} failed, {output:?}").into()); } Ok(String::from_utf8(output.stdout)?)