From 8ac0f92d7d9cabe8388a7cea40c4fd1077c23ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 19 Nov 2019 11:49:46 +0200 Subject: [PATCH] Regenerate everything with latest gir --- gstreamer-app-sys/Cargo.toml | 2 +- gstreamer-app-sys/build.rs | 4 +-- gstreamer-app-sys/src/lib.rs | 4 +-- gstreamer-app-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-app-sys/tests/constant.c | 4 +-- gstreamer-app-sys/tests/layout.c | 4 +-- gstreamer-audio-sys/Cargo.toml | 2 +- gstreamer-audio-sys/build.rs | 4 +-- gstreamer-audio-sys/src/lib.rs | 4 +-- gstreamer-audio-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-audio-sys/tests/constant.c | 4 +-- gstreamer-audio-sys/tests/layout.c | 4 +-- gstreamer-base-sys/Cargo.toml | 2 +- gstreamer-base-sys/build.rs | 4 +-- gstreamer-base-sys/src/lib.rs | 4 +-- gstreamer-base-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-base-sys/tests/constant.c | 4 +-- gstreamer-base-sys/tests/layout.c | 4 +-- gstreamer-check-sys/Cargo.toml | 2 +- gstreamer-check-sys/build.rs | 4 +-- gstreamer-check-sys/src/lib.rs | 4 +-- gstreamer-check-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-check-sys/tests/constant.c | 4 +-- gstreamer-check-sys/tests/layout.c | 4 +-- gstreamer-editing-services-sys/Cargo.toml | 2 +- gstreamer-editing-services-sys/build.rs | 4 +-- gstreamer-editing-services-sys/src/lib.rs | 4 +-- gstreamer-editing-services-sys/tests/abi.rs | 29 ++++++++++++------- .../tests/constant.c | 4 +-- gstreamer-editing-services-sys/tests/layout.c | 4 +-- gstreamer-gl-sys/Cargo.toml | 2 +- gstreamer-gl-sys/build.rs | 4 +-- gstreamer-gl-sys/src/lib.rs | 4 +-- gstreamer-gl-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-gl-sys/tests/constant.c | 4 +-- gstreamer-gl-sys/tests/layout.c | 4 +-- gstreamer-mpegts-sys/Cargo.toml | 2 +- gstreamer-mpegts-sys/build.rs | 4 +-- gstreamer-mpegts-sys/src/lib.rs | 4 +-- gstreamer-mpegts-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-mpegts-sys/tests/constant.c | 4 +-- gstreamer-mpegts-sys/tests/layout.c | 4 +-- gstreamer-net-sys/Cargo.toml | 2 +- gstreamer-net-sys/build.rs | 4 +-- gstreamer-net-sys/src/lib.rs | 4 +-- gstreamer-net-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-net-sys/tests/constant.c | 4 +-- gstreamer-net-sys/tests/layout.c | 4 +-- gstreamer-pbutils-sys/Cargo.toml | 2 +- gstreamer-pbutils-sys/build.rs | 4 +-- gstreamer-pbutils-sys/src/lib.rs | 4 +-- gstreamer-pbutils-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-pbutils-sys/tests/constant.c | 4 +-- gstreamer-pbutils-sys/tests/layout.c | 4 +-- gstreamer-player-sys/Cargo.toml | 2 +- gstreamer-player-sys/build.rs | 4 +-- gstreamer-player-sys/src/lib.rs | 4 +-- gstreamer-player-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-player-sys/tests/constant.c | 4 +-- gstreamer-player-sys/tests/layout.c | 4 +-- gstreamer-rtp-sys/Cargo.toml | 2 +- gstreamer-rtp-sys/build.rs | 4 +-- gstreamer-rtp-sys/src/lib.rs | 4 +-- gstreamer-rtp-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-rtp-sys/tests/constant.c | 4 +-- gstreamer-rtp-sys/tests/layout.c | 4 +-- gstreamer-rtsp-server-sys/Cargo.toml | 2 +- gstreamer-rtsp-server-sys/build.rs | 4 +-- gstreamer-rtsp-server-sys/src/lib.rs | 4 +-- gstreamer-rtsp-server-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-rtsp-server-sys/tests/constant.c | 4 +-- gstreamer-rtsp-server-sys/tests/layout.c | 4 +-- gstreamer-rtsp-sys/Cargo.toml | 2 +- gstreamer-rtsp-sys/build.rs | 4 +-- gstreamer-rtsp-sys/src/lib.rs | 4 +-- gstreamer-rtsp-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-rtsp-sys/tests/constant.c | 4 +-- gstreamer-rtsp-sys/tests/layout.c | 4 +-- gstreamer-sdp-sys/Cargo.toml | 2 +- gstreamer-sdp-sys/build.rs | 4 +-- gstreamer-sdp-sys/src/lib.rs | 4 +-- gstreamer-sdp-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-sdp-sys/tests/constant.c | 4 +-- gstreamer-sdp-sys/tests/layout.c | 4 +-- gstreamer-sys/Cargo.toml | 2 +- gstreamer-sys/build.rs | 4 +-- gstreamer-sys/src/lib.rs | 4 +-- gstreamer-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-sys/tests/constant.c | 4 +-- gstreamer-sys/tests/layout.c | 4 +-- gstreamer-tag-sys/Cargo.toml | 2 +- gstreamer-tag-sys/build.rs | 4 +-- gstreamer-tag-sys/src/lib.rs | 4 +-- gstreamer-tag-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-tag-sys/tests/constant.c | 4 +-- gstreamer-tag-sys/tests/layout.c | 4 +-- gstreamer-video-sys/Cargo.toml | 2 +- gstreamer-video-sys/build.rs | 4 +-- gstreamer-video-sys/src/lib.rs | 4 +-- gstreamer-video-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-video-sys/tests/constant.c | 4 +-- gstreamer-video-sys/tests/layout.c | 4 +-- gstreamer-webrtc-sys/Cargo.toml | 2 +- gstreamer-webrtc-sys/build.rs | 4 +-- gstreamer-webrtc-sys/src/lib.rs | 4 +-- gstreamer-webrtc-sys/tests/abi.rs | 29 ++++++++++++------- gstreamer-webrtc-sys/tests/constant.c | 4 +-- gstreamer-webrtc-sys/tests/layout.c | 4 +-- 108 files changed, 486 insertions(+), 360 deletions(-) diff --git a/gstreamer-app-sys/Cargo.toml b/gstreamer-app-sys/Cargo.toml index b6fd27457..1b55f6078 100644 --- a/gstreamer-app-sys/Cargo.toml +++ b/gstreamer-app-sys/Cargo.toml @@ -15,7 +15,7 @@ path = "../gstreamer-sys" [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] v1_2 = ["gstreamer-sys/v1_2", "gstreamer-base-sys/v1_2"] diff --git a/gstreamer-app-sys/build.rs b/gstreamer-app-sys/build.rs index 709c82b6e..f1d98ad6b 100644 --- a/gstreamer-app-sys/build.rs +++ b/gstreamer-app-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-app-sys/src/lib.rs b/gstreamer-app-sys/src/lib.rs index 13df98059..bf8a78a6f 100644 --- a/gstreamer-app-sys/src/lib.rs +++ b/gstreamer-app-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-app-sys/tests/abi.rs b/gstreamer-app-sys/tests/abi.rs index 40de7bcc6..73df39567 100644 --- a/gstreamer-app-sys/tests/abi.rs +++ b/gstreamer-app-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_app_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_app_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-app-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-app-sys/tests/constant.c b/gstreamer-app-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-app-sys/tests/constant.c +++ b/gstreamer-app-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-app-sys/tests/layout.c b/gstreamer-app-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-app-sys/tests/layout.c +++ b/gstreamer-app-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-audio-sys/Cargo.toml b/gstreamer-audio-sys/Cargo.toml index 2e93da2ee..9918b5851 100644 --- a/gstreamer-audio-sys/Cargo.toml +++ b/gstreamer-audio-sys/Cargo.toml @@ -18,7 +18,7 @@ path = "../gstreamer-sys" [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] v1_2 = ["gstreamer-sys/v1_2", "gstreamer-base-sys/v1_2"] diff --git a/gstreamer-audio-sys/build.rs b/gstreamer-audio-sys/build.rs index c97402b6e..68dda2f4b 100644 --- a/gstreamer-audio-sys/build.rs +++ b/gstreamer-audio-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-audio-sys/src/lib.rs b/gstreamer-audio-sys/src/lib.rs index eef684405..ac99fe389 100644 --- a/gstreamer-audio-sys/src/lib.rs +++ b/gstreamer-audio-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-audio-sys/tests/abi.rs b/gstreamer-audio-sys/tests/abi.rs index e2fcab474..58246e1ff 100644 --- a/gstreamer-audio-sys/tests/abi.rs +++ b/gstreamer-audio-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_audio_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_audio_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-audio-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-audio-sys/tests/constant.c b/gstreamer-audio-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-audio-sys/tests/constant.c +++ b/gstreamer-audio-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-audio-sys/tests/layout.c b/gstreamer-audio-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-audio-sys/tests/layout.c +++ b/gstreamer-audio-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-base-sys/Cargo.toml b/gstreamer-base-sys/Cargo.toml index 9e4a83412..2b078d360 100644 --- a/gstreamer-base-sys/Cargo.toml +++ b/gstreamer-base-sys/Cargo.toml @@ -15,7 +15,7 @@ path = "../gstreamer-sys" [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] v1_0_1 = [] diff --git a/gstreamer-base-sys/build.rs b/gstreamer-base-sys/build.rs index f8d071708..3a145af57 100644 --- a/gstreamer-base-sys/build.rs +++ b/gstreamer-base-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-base-sys/src/lib.rs b/gstreamer-base-sys/src/lib.rs index 1ee4a48b3..9c43e1b58 100644 --- a/gstreamer-base-sys/src/lib.rs +++ b/gstreamer-base-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-base-sys/tests/abi.rs b/gstreamer-base-sys/tests/abi.rs index 21d2ee21d..a1b3bc400 100644 --- a/gstreamer-base-sys/tests/abi.rs +++ b/gstreamer-base-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_base_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_base_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-base-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-base-sys/tests/constant.c b/gstreamer-base-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-base-sys/tests/constant.c +++ b/gstreamer-base-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-base-sys/tests/layout.c b/gstreamer-base-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-base-sys/tests/layout.c +++ b/gstreamer-base-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-check-sys/Cargo.toml b/gstreamer-check-sys/Cargo.toml index d3d379c7f..bf8c553f6 100644 --- a/gstreamer-check-sys/Cargo.toml +++ b/gstreamer-check-sys/Cargo.toml @@ -15,7 +15,7 @@ path = "../gstreamer-sys" [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] dox = ["v1_16"] diff --git a/gstreamer-check-sys/build.rs b/gstreamer-check-sys/build.rs index 9e4a9c309..9cf78412a 100644 --- a/gstreamer-check-sys/build.rs +++ b/gstreamer-check-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-check-sys/src/lib.rs b/gstreamer-check-sys/src/lib.rs index 5b0c70182..29b9a54bd 100644 --- a/gstreamer-check-sys/src/lib.rs +++ b/gstreamer-check-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-check-sys/tests/abi.rs b/gstreamer-check-sys/tests/abi.rs index 9d26ca8f0..9c57d1246 100644 --- a/gstreamer-check-sys/tests/abi.rs +++ b/gstreamer-check-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_check_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_check_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-check-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-check-sys/tests/constant.c b/gstreamer-check-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-check-sys/tests/constant.c +++ b/gstreamer-check-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-check-sys/tests/layout.c b/gstreamer-check-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-check-sys/tests/layout.c +++ b/gstreamer-check-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-editing-services-sys/Cargo.toml b/gstreamer-editing-services-sys/Cargo.toml index b9cbc4d27..ddf2de3f2 100644 --- a/gstreamer-editing-services-sys/Cargo.toml +++ b/gstreamer-editing-services-sys/Cargo.toml @@ -24,7 +24,7 @@ path = "../gstreamer-sys" [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] dox = ["v1_16"] diff --git a/gstreamer-editing-services-sys/build.rs b/gstreamer-editing-services-sys/build.rs index 42ce72d0b..5ad02acdd 100644 --- a/gstreamer-editing-services-sys/build.rs +++ b/gstreamer-editing-services-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-editing-services-sys/src/lib.rs b/gstreamer-editing-services-sys/src/lib.rs index 3f884e3c6..57efef620 100644 --- a/gstreamer-editing-services-sys/src/lib.rs +++ b/gstreamer-editing-services-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-editing-services-sys/tests/abi.rs b/gstreamer-editing-services-sys/tests/abi.rs index eeccd02f1..b12568403 100644 --- a/gstreamer-editing-services-sys/tests/abi.rs +++ b/gstreamer-editing-services-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_editing_services_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_editing_services_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gst-editing-services-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-editing-services-sys/tests/constant.c b/gstreamer-editing-services-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-editing-services-sys/tests/constant.c +++ b/gstreamer-editing-services-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-editing-services-sys/tests/layout.c b/gstreamer-editing-services-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-editing-services-sys/tests/layout.c +++ b/gstreamer-editing-services-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-gl-sys/Cargo.toml b/gstreamer-gl-sys/Cargo.toml index 529ccf05f..a31d52695 100644 --- a/gstreamer-gl-sys/Cargo.toml +++ b/gstreamer-gl-sys/Cargo.toml @@ -24,7 +24,7 @@ features = ["v1_14"] [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] dox = ["v1_16"] diff --git a/gstreamer-gl-sys/build.rs b/gstreamer-gl-sys/build.rs index 39fcbde0d..c32a2a00d 100644 --- a/gstreamer-gl-sys/build.rs +++ b/gstreamer-gl-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-gl-sys/src/lib.rs b/gstreamer-gl-sys/src/lib.rs index 6317f2b2d..7eb4a57e3 100644 --- a/gstreamer-gl-sys/src/lib.rs +++ b/gstreamer-gl-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-gl-sys/tests/abi.rs b/gstreamer-gl-sys/tests/abi.rs index c9ae728a1..a41d7bc2e 100644 --- a/gstreamer-gl-sys/tests/abi.rs +++ b/gstreamer-gl-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_gl_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_gl_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-gl-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-gl-sys/tests/constant.c b/gstreamer-gl-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-gl-sys/tests/constant.c +++ b/gstreamer-gl-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-gl-sys/tests/layout.c b/gstreamer-gl-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-gl-sys/tests/layout.c +++ b/gstreamer-gl-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-mpegts-sys/Cargo.toml b/gstreamer-mpegts-sys/Cargo.toml index 86a29731d..ba538da4f 100644 --- a/gstreamer-mpegts-sys/Cargo.toml +++ b/gstreamer-mpegts-sys/Cargo.toml @@ -18,7 +18,7 @@ path = "../gstreamer-sys" [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] v1_2 = ["gstreamer-sys/v1_2", "gstreamer-base-sys/v1_2"] diff --git a/gstreamer-mpegts-sys/build.rs b/gstreamer-mpegts-sys/build.rs index 2c1fabd28..6f1f89272 100644 --- a/gstreamer-mpegts-sys/build.rs +++ b/gstreamer-mpegts-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-mpegts-sys/src/lib.rs b/gstreamer-mpegts-sys/src/lib.rs index 6c52f444f..ed018e225 100644 --- a/gstreamer-mpegts-sys/src/lib.rs +++ b/gstreamer-mpegts-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-mpegts-sys/tests/abi.rs b/gstreamer-mpegts-sys/tests/abi.rs index fc0573c0c..7f18e9774 100644 --- a/gstreamer-mpegts-sys/tests/abi.rs +++ b/gstreamer-mpegts-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_mpegts_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_mpegts_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-mpegts-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-mpegts-sys/tests/constant.c b/gstreamer-mpegts-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-mpegts-sys/tests/constant.c +++ b/gstreamer-mpegts-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-mpegts-sys/tests/layout.c b/gstreamer-mpegts-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-mpegts-sys/tests/layout.c +++ b/gstreamer-mpegts-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-net-sys/Cargo.toml b/gstreamer-net-sys/Cargo.toml index 1856441f5..80ca77d65 100644 --- a/gstreamer-net-sys/Cargo.toml +++ b/gstreamer-net-sys/Cargo.toml @@ -18,7 +18,7 @@ path = "../gstreamer-sys" [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] v1_2 = ["gstreamer-sys/v1_2"] diff --git a/gstreamer-net-sys/build.rs b/gstreamer-net-sys/build.rs index c18bc8f33..c107700b8 100644 --- a/gstreamer-net-sys/build.rs +++ b/gstreamer-net-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-net-sys/src/lib.rs b/gstreamer-net-sys/src/lib.rs index b938091f8..fce0275b1 100644 --- a/gstreamer-net-sys/src/lib.rs +++ b/gstreamer-net-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-net-sys/tests/abi.rs b/gstreamer-net-sys/tests/abi.rs index 602b16c12..8b981de7c 100644 --- a/gstreamer-net-sys/tests/abi.rs +++ b/gstreamer-net-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_net_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_net_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-net-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-net-sys/tests/constant.c b/gstreamer-net-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-net-sys/tests/constant.c +++ b/gstreamer-net-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-net-sys/tests/layout.c b/gstreamer-net-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-net-sys/tests/layout.c +++ b/gstreamer-net-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-pbutils-sys/Cargo.toml b/gstreamer-pbutils-sys/Cargo.toml index c43094075..48feed830 100644 --- a/gstreamer-pbutils-sys/Cargo.toml +++ b/gstreamer-pbutils-sys/Cargo.toml @@ -21,7 +21,7 @@ path = "../gstreamer-video-sys" [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] v1_2 = ["gstreamer-sys/v1_2", "gstreamer-audio-sys/v1_2", "gstreamer-video-sys/v1_2"] diff --git a/gstreamer-pbutils-sys/build.rs b/gstreamer-pbutils-sys/build.rs index fd5cd5368..9ccbaa2b7 100644 --- a/gstreamer-pbutils-sys/build.rs +++ b/gstreamer-pbutils-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-pbutils-sys/src/lib.rs b/gstreamer-pbutils-sys/src/lib.rs index 046069506..e71ebbf21 100644 --- a/gstreamer-pbutils-sys/src/lib.rs +++ b/gstreamer-pbutils-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-pbutils-sys/tests/abi.rs b/gstreamer-pbutils-sys/tests/abi.rs index 0deec5b13..ece178147 100644 --- a/gstreamer-pbutils-sys/tests/abi.rs +++ b/gstreamer-pbutils-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_pbutils_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_pbutils_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-pbutils-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-pbutils-sys/tests/constant.c b/gstreamer-pbutils-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-pbutils-sys/tests/constant.c +++ b/gstreamer-pbutils-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-pbutils-sys/tests/layout.c b/gstreamer-pbutils-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-pbutils-sys/tests/layout.c +++ b/gstreamer-pbutils-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-player-sys/Cargo.toml b/gstreamer-player-sys/Cargo.toml index d7a926889..ed8cbb73c 100644 --- a/gstreamer-player-sys/Cargo.toml +++ b/gstreamer-player-sys/Cargo.toml @@ -20,7 +20,7 @@ features = ["v1_12"] [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] v1_14 = ["gstreamer-sys/v1_14", "gstreamer-video-sys/v1_14"] diff --git a/gstreamer-player-sys/build.rs b/gstreamer-player-sys/build.rs index ee64f27aa..c0cde1910 100644 --- a/gstreamer-player-sys/build.rs +++ b/gstreamer-player-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-player-sys/src/lib.rs b/gstreamer-player-sys/src/lib.rs index 37c4290a7..d0c074c81 100644 --- a/gstreamer-player-sys/src/lib.rs +++ b/gstreamer-player-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-player-sys/tests/abi.rs b/gstreamer-player-sys/tests/abi.rs index 53fedabf9..da88f811d 100644 --- a/gstreamer-player-sys/tests/abi.rs +++ b/gstreamer-player-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_player_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_player_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-player-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-player-sys/tests/constant.c b/gstreamer-player-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-player-sys/tests/constant.c +++ b/gstreamer-player-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-player-sys/tests/layout.c b/gstreamer-player-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-player-sys/tests/layout.c +++ b/gstreamer-player-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-rtp-sys/Cargo.toml b/gstreamer-rtp-sys/Cargo.toml index 4762adf55..56fb0afa1 100644 --- a/gstreamer-rtp-sys/Cargo.toml +++ b/gstreamer-rtp-sys/Cargo.toml @@ -18,7 +18,7 @@ path = "../gstreamer-sys" [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] v1_4 = ["v1_2"] diff --git a/gstreamer-rtp-sys/build.rs b/gstreamer-rtp-sys/build.rs index 4eeeb90d9..c05151d97 100644 --- a/gstreamer-rtp-sys/build.rs +++ b/gstreamer-rtp-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-rtp-sys/src/lib.rs b/gstreamer-rtp-sys/src/lib.rs index cf6360813..228696243 100644 --- a/gstreamer-rtp-sys/src/lib.rs +++ b/gstreamer-rtp-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-rtp-sys/tests/abi.rs b/gstreamer-rtp-sys/tests/abi.rs index d1babef2c..563b4142e 100644 --- a/gstreamer-rtp-sys/tests/abi.rs +++ b/gstreamer-rtp-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_rtp_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_rtp_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-rtp-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-rtp-sys/tests/constant.c b/gstreamer-rtp-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-rtp-sys/tests/constant.c +++ b/gstreamer-rtp-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-rtp-sys/tests/layout.c b/gstreamer-rtp-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-rtp-sys/tests/layout.c +++ b/gstreamer-rtp-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-rtsp-server-sys/Cargo.toml b/gstreamer-rtsp-server-sys/Cargo.toml index afc7a89a8..727bcc664 100644 --- a/gstreamer-rtsp-server-sys/Cargo.toml +++ b/gstreamer-rtsp-server-sys/Cargo.toml @@ -27,7 +27,7 @@ path = "../gstreamer-sys" [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] dox = ["v1_16"] diff --git a/gstreamer-rtsp-server-sys/build.rs b/gstreamer-rtsp-server-sys/build.rs index d6cf92a63..556098414 100644 --- a/gstreamer-rtsp-server-sys/build.rs +++ b/gstreamer-rtsp-server-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-rtsp-server-sys/src/lib.rs b/gstreamer-rtsp-server-sys/src/lib.rs index 428de54ba..45cb936e4 100644 --- a/gstreamer-rtsp-server-sys/src/lib.rs +++ b/gstreamer-rtsp-server-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-rtsp-server-sys/tests/abi.rs b/gstreamer-rtsp-server-sys/tests/abi.rs index 85bcf9c54..0936389f5 100644 --- a/gstreamer-rtsp-server-sys/tests/abi.rs +++ b/gstreamer-rtsp-server-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_rtsp_server_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_rtsp_server_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-rtsp-server-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-rtsp-server-sys/tests/constant.c b/gstreamer-rtsp-server-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-rtsp-server-sys/tests/constant.c +++ b/gstreamer-rtsp-server-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-rtsp-server-sys/tests/layout.c b/gstreamer-rtsp-server-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-rtsp-server-sys/tests/layout.c +++ b/gstreamer-rtsp-server-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-rtsp-sys/Cargo.toml b/gstreamer-rtsp-sys/Cargo.toml index 5e130ba2a..cecd34147 100644 --- a/gstreamer-rtsp-sys/Cargo.toml +++ b/gstreamer-rtsp-sys/Cargo.toml @@ -21,7 +21,7 @@ path = "../gstreamer-sys" [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] dox = ["v1_16"] diff --git a/gstreamer-rtsp-sys/build.rs b/gstreamer-rtsp-sys/build.rs index b8c1e7eb6..e89700489 100644 --- a/gstreamer-rtsp-sys/build.rs +++ b/gstreamer-rtsp-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-rtsp-sys/src/lib.rs b/gstreamer-rtsp-sys/src/lib.rs index 99df7cc81..8872945e2 100644 --- a/gstreamer-rtsp-sys/src/lib.rs +++ b/gstreamer-rtsp-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-rtsp-sys/tests/abi.rs b/gstreamer-rtsp-sys/tests/abi.rs index c0aa40de1..537db15c7 100644 --- a/gstreamer-rtsp-sys/tests/abi.rs +++ b/gstreamer-rtsp-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_rtsp_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_rtsp_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-rtsp-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-rtsp-sys/tests/constant.c b/gstreamer-rtsp-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-rtsp-sys/tests/constant.c +++ b/gstreamer-rtsp-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-rtsp-sys/tests/layout.c b/gstreamer-rtsp-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-rtsp-sys/tests/layout.c +++ b/gstreamer-rtsp-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-sdp-sys/Cargo.toml b/gstreamer-sdp-sys/Cargo.toml index ee2eff687..e2c91c7b0 100644 --- a/gstreamer-sdp-sys/Cargo.toml +++ b/gstreamer-sdp-sys/Cargo.toml @@ -15,7 +15,7 @@ path = "../gstreamer-sys" [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] dox = ["v1_16"] diff --git a/gstreamer-sdp-sys/build.rs b/gstreamer-sdp-sys/build.rs index 2b5469f61..ec7170721 100644 --- a/gstreamer-sdp-sys/build.rs +++ b/gstreamer-sdp-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-sdp-sys/src/lib.rs b/gstreamer-sdp-sys/src/lib.rs index 3fe880738..dd834117f 100644 --- a/gstreamer-sdp-sys/src/lib.rs +++ b/gstreamer-sdp-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-sdp-sys/tests/abi.rs b/gstreamer-sdp-sys/tests/abi.rs index 1471045a3..2e2671658 100644 --- a/gstreamer-sdp-sys/tests/abi.rs +++ b/gstreamer-sdp-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_sdp_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_sdp_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-sdp-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-sdp-sys/tests/constant.c b/gstreamer-sdp-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-sdp-sys/tests/constant.c +++ b/gstreamer-sdp-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-sdp-sys/tests/layout.c b/gstreamer-sdp-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-sdp-sys/tests/layout.c +++ b/gstreamer-sdp-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-sys/Cargo.toml b/gstreamer-sys/Cargo.toml index 7669e341c..2af6065c3 100644 --- a/gstreamer-sys/Cargo.toml +++ b/gstreamer-sys/Cargo.toml @@ -12,7 +12,7 @@ git = "https://github.com/gtk-rs/sys" [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] v1_0_10 = [] diff --git a/gstreamer-sys/build.rs b/gstreamer-sys/build.rs index 847f07427..e4d766347 100644 --- a/gstreamer-sys/build.rs +++ b/gstreamer-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-sys/src/lib.rs b/gstreamer-sys/src/lib.rs index b544279b8..5f281afe0 100644 --- a/gstreamer-sys/src/lib.rs +++ b/gstreamer-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-sys/tests/abi.rs b/gstreamer-sys/tests/abi.rs index 98585039a..7c7bb4c92 100644 --- a/gstreamer-sys/tests/abi.rs +++ b/gstreamer-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-sys/tests/constant.c b/gstreamer-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-sys/tests/constant.c +++ b/gstreamer-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-sys/tests/layout.c b/gstreamer-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-sys/tests/layout.c +++ b/gstreamer-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-tag-sys/Cargo.toml b/gstreamer-tag-sys/Cargo.toml index cbedd2569..a6c68c62e 100644 --- a/gstreamer-tag-sys/Cargo.toml +++ b/gstreamer-tag-sys/Cargo.toml @@ -18,7 +18,7 @@ path = "../gstreamer-sys" [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] v1_2 = ["gstreamer-sys/v1_2", "gstreamer-base-sys/v1_2"] diff --git a/gstreamer-tag-sys/build.rs b/gstreamer-tag-sys/build.rs index f8d212366..39a026727 100644 --- a/gstreamer-tag-sys/build.rs +++ b/gstreamer-tag-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-tag-sys/src/lib.rs b/gstreamer-tag-sys/src/lib.rs index e110e9f9b..f191728f0 100644 --- a/gstreamer-tag-sys/src/lib.rs +++ b/gstreamer-tag-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-tag-sys/tests/abi.rs b/gstreamer-tag-sys/tests/abi.rs index 8f538c34b..820d417fd 100644 --- a/gstreamer-tag-sys/tests/abi.rs +++ b/gstreamer-tag-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_tag_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_tag_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-tag-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-tag-sys/tests/constant.c b/gstreamer-tag-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-tag-sys/tests/constant.c +++ b/gstreamer-tag-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-tag-sys/tests/layout.c b/gstreamer-tag-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-tag-sys/tests/layout.c +++ b/gstreamer-tag-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-video-sys/Cargo.toml b/gstreamer-video-sys/Cargo.toml index c4e52f711..73d76aa6e 100644 --- a/gstreamer-video-sys/Cargo.toml +++ b/gstreamer-video-sys/Cargo.toml @@ -18,7 +18,7 @@ path = "../gstreamer-sys" [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] v1_0_3 = [] diff --git a/gstreamer-video-sys/build.rs b/gstreamer-video-sys/build.rs index 1bcf0358f..7a03e9a2b 100644 --- a/gstreamer-video-sys/build.rs +++ b/gstreamer-video-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-video-sys/src/lib.rs b/gstreamer-video-sys/src/lib.rs index df5abe7df..87802ac14 100644 --- a/gstreamer-video-sys/src/lib.rs +++ b/gstreamer-video-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-video-sys/tests/abi.rs b/gstreamer-video-sys/tests/abi.rs index 1e4fa4545..cc407f9b1 100644 --- a/gstreamer-video-sys/tests/abi.rs +++ b/gstreamer-video-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_video_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_video_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-video-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-video-sys/tests/constant.c b/gstreamer-video-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-video-sys/tests/constant.c +++ b/gstreamer-video-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-video-sys/tests/layout.c b/gstreamer-video-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-video-sys/tests/layout.c +++ b/gstreamer-video-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-webrtc-sys/Cargo.toml b/gstreamer-webrtc-sys/Cargo.toml index d26c742f8..6e0c010b5 100644 --- a/gstreamer-webrtc-sys/Cargo.toml +++ b/gstreamer-webrtc-sys/Cargo.toml @@ -20,7 +20,7 @@ features = ["v1_14"] [dev-dependencies] shell-words = "0.1.0" -tempdir = "0.3" +tempfile = "3" [features] dox = ["v1_16"] diff --git a/gstreamer-webrtc-sys/build.rs b/gstreamer-webrtc-sys/build.rs index f1fa9668c..81bb3e3c2 100644 --- a/gstreamer-webrtc-sys/build.rs +++ b/gstreamer-webrtc-sys/build.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 8f15e55) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #[cfg(not(feature = "dox"))] diff --git a/gstreamer-webrtc-sys/src/lib.rs b/gstreamer-webrtc-sys/src/lib.rs index 625c5a2a0..c23449466 100644 --- a/gstreamer-webrtc-sys/src/lib.rs +++ b/gstreamer-webrtc-sys/src/lib.rs @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] diff --git a/gstreamer-webrtc-sys/tests/abi.rs b/gstreamer-webrtc-sys/tests/abi.rs index 5208d788f..a21219e09 100644 --- a/gstreamer-webrtc-sys/tests/abi.rs +++ b/gstreamer-webrtc-sys/tests/abi.rs @@ -1,10 +1,10 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT extern crate gstreamer_webrtc_sys; extern crate shell_words; -extern crate tempdir; +extern crate tempfile; use gstreamer_webrtc_sys::*; use std::env; use std::error::Error; @@ -12,6 +12,7 @@ use std::mem::{align_of, size_of}; use std::path::Path; use std::process::Command; use std::str; +use tempfile::Builder; static PACKAGES: &[&str] = &["gstreamer-webrtc-1.0"]; @@ -21,7 +22,7 @@ struct Compiler { } impl Compiler { - pub fn new() -> Result> { + pub fn new() -> Result> { let mut args = get_var("CC", "cc")?; args.push("-Wno-deprecated-declarations".to_owned()); // For %z support in printf when using MinGW. @@ -40,7 +41,7 @@ impl Compiler { self.args.push(arg); } - pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { + pub fn compile(&self, src: &Path, out: &Path) -> Result<(), Box> { let mut cmd = self.to_command(); cmd.arg(src); cmd.arg("-o"); @@ -59,7 +60,7 @@ impl Compiler { } } -fn get_var(name: &str, default: &str) -> Result, Box> { +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)?), @@ -67,7 +68,7 @@ fn get_var(name: &str, default: &str) -> Result, Box> { } } -fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { +fn pkg_config_cflags(packages: &[&str]) -> Result, Box> { if packages.is_empty() { return Ok(Vec::new()); } @@ -126,7 +127,10 @@ impl Results { #[test] fn cross_validate_constants_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -163,7 +167,10 @@ fn cross_validate_constants_with_c() { #[test] fn cross_validate_layout_with_c() { - let tmpdir = tempdir::TempDir::new("abi").expect("temporary directory"); + let tmpdir = Builder::new() + .prefix("abi") + .tempdir() + .expect("temporary directory"); let cc = Compiler::new().expect("configured compiler"); assert_eq!( @@ -201,7 +208,7 @@ fn cross_validate_layout_with_c() { results.expect_total_success(); } -fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { +fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("layout"); let mut cc = cc.clone(); cc.define("ABI_TYPE_NAME", name); @@ -220,7 +227,7 @@ fn get_c_layout(dir: &Path, cc: &Compiler, name: &str) -> Result Result> { +fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result> { let exe = dir.join("constant"); let mut cc = cc.clone(); cc.define("ABI_CONSTANT_NAME", name); diff --git a/gstreamer-webrtc-sys/tests/constant.c b/gstreamer-webrtc-sys/tests/constant.c index 9c4f30998..e22347ffb 100644 --- a/gstreamer-webrtc-sys/tests/constant.c +++ b/gstreamer-webrtc-sys/tests/constant.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h" diff --git a/gstreamer-webrtc-sys/tests/layout.c b/gstreamer-webrtc-sys/tests/layout.c index 5909a8090..35a905b7a 100644 --- a/gstreamer-webrtc-sys/tests/layout.c +++ b/gstreamer-webrtc-sys/tests/layout.c @@ -1,5 +1,5 @@ -// This file was generated by gir (https://github.com/gtk-rs/gir @ 7cca816) -// from gir-files (https://github.com/gtk-rs/gir-files @ ???) +// This file was generated by gir (https://github.com/gtk-rs/gir @ 1ee9edf) +// from gir-files (https://github.com/gtk-rs/gir-files @ a6c6926) // DO NOT EDIT #include "manual.h"