Skip to content

Commit

Permalink
Replace tempdir with tempfile, as the tempdir crate have been superce…
Browse files Browse the repository at this point in the history 
…ded by tempfile
  • Loading branch information
@alexanderkjall
alexanderkjall authored and Alexander Kjäll committed Feb 8, 2022
1 parent e7d37e0 commit a8ff8c2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Expand Up @@ -16,6 +16,6 @@ categories = ["development-tools::build-utils"]
[dependencies]

[dev-dependencies]
tempdir = "0.3.7"
tempfile = "3"
lazy_static = "1"

23 changes: 12 additions & 11 deletions src/lib.rs
View file
Expand Up @@ -1420,11 +1420,12 @@ fn msvc_target() -> Result<TargetTriplet, Error> {
#[cfg(test)]
mod tests {

extern crate tempdir;
extern crate tempfile;

use super::*;
use std::env;
use std::sync::Mutex;
use self::tempfile::tempdir;

lazy_static! {
static ref LOCK: Mutex<()> = Mutex::new(());
Expand Down Expand Up @@ -1495,7 +1496,7 @@ mod tests {
clean_env();
env::set_var("VCPKG_ROOT", vcpkg_test_tree_loc("normalized"));
env::set_var("TARGET", "x86_64-pc-windows-msvc");
let tmp_dir = tempdir::TempDir::new("vcpkg_tests").unwrap();
let tmp_dir = tempdir().unwrap();
env::set_var("OUT_DIR", tmp_dir.path());

// CARGO_CFG_TARGET_FEATURE is set in response to
Expand All @@ -1517,7 +1518,7 @@ mod tests {
env::set_var("VCPKG_ROOT", vcpkg_test_tree_loc("no-status"));
env::set_var("TARGET", "x86_64-pc-windows-msvc");
env::set_var("VCPKGRS_DYNAMIC", "1");
let tmp_dir = tempdir::TempDir::new("vcpkg_tests").unwrap();
let tmp_dir = tempdir().unwrap();
env::set_var("OUT_DIR", tmp_dir.path());

println!("Result is {:?}", ::find_package("libmysql"));
Expand All @@ -1535,7 +1536,7 @@ mod tests {
env::set_var("VCPKG_ROOT", vcpkg_test_tree_loc("multiline-description"));
env::set_var("TARGET", "i686-pc-windows-msvc");
env::set_var("VCPKGRS_DYNAMIC", "1");
let tmp_dir = tempdir::TempDir::new("vcpkg_tests").unwrap();
let tmp_dir = tempdir().unwrap();
env::set_var("OUT_DIR", tmp_dir.path());

println!("Result is {:?}", ::find_package("graphite2"));
Expand All @@ -1553,7 +1554,7 @@ mod tests {
env::set_var("VCPKG_ROOT", vcpkg_test_tree_loc("normalized"));
env::set_var("TARGET", "i686-pc-windows-msvc");
env::set_var("VCPKGRS_DYNAMIC", "1");
let tmp_dir = tempdir::TempDir::new("vcpkg_tests").unwrap();
let tmp_dir = tempdir().unwrap();
env::set_var("OUT_DIR", tmp_dir.path());

println!("Result is {:?}", ::find_package("harfbuzz"));
Expand Down Expand Up @@ -1582,7 +1583,7 @@ mod tests {
env::set_var("VCPKG_ROOT", vcpkg_test_tree_loc("normalized"));
env::set_var("TARGET", target);
env::set_var("VCPKGRS_DYNAMIC", "1");
let tmp_dir = tempdir::TempDir::new("vcpkg_tests").unwrap();
let tmp_dir = tempdir().unwrap();
env::set_var("OUT_DIR", tmp_dir.path());

println!("Result is {:?}", ::find_package("harfbuzz"));
Expand All @@ -1605,7 +1606,7 @@ mod tests {
env::set_var("VCPKG_ROOT", vcpkg_test_tree_loc("normalized"));
env::set_var("TARGET", "i686-pc-windows-msvc");
env::set_var("VCPKGRS_DYNAMIC", "1");
let tmp_dir = tempdir::TempDir::new("vcpkg_tests").unwrap();
let tmp_dir = tempdir().unwrap();
env::set_var("OUT_DIR", tmp_dir.path());

let lib = ::find_package("harfbuzz").unwrap();
Expand Down Expand Up @@ -1646,7 +1647,7 @@ mod tests {
env::set_var("VCPKG_ROOT", vcpkg_test_tree_loc("normalized"));
env::set_var("TARGET", "aarch64-apple-ios");
env::set_var("VCPKGRS_DYNAMIC", "1");
let tmp_dir = tempdir::TempDir::new("vcpkg_tests").unwrap();
let tmp_dir = tempdir().unwrap();
env::set_var("OUT_DIR", tmp_dir.path());

let harfbuzz = ::Config::new()
Expand All @@ -1669,7 +1670,7 @@ mod tests {
env::set_var("VCPKG_ROOT", vcpkg_test_tree_loc("normalized"));
env::set_var("TARGET", "aarch64-apple-doesnotexist");
env::set_var("VCPKGRS_DYNAMIC", "1");
let tmp_dir = tempdir::TempDir::new("vcpkg_tests").unwrap();
let tmp_dir = tempdir().unwrap();
env::set_var("OUT_DIR", tmp_dir.path());

let harfbuzz = ::find_package("harfbuzz");
Expand All @@ -1691,7 +1692,7 @@ mod tests {
env::set_var("VCPKG_ROOT", vcpkg_test_tree_loc("normalized"));
env::set_var("TARGET", "aarch64-apple-ios");
env::set_var("VCPKGRS_DYNAMIC", "1");
let tmp_dir = tempdir::TempDir::new("vcpkg_tests").unwrap();
let tmp_dir = tempdir().unwrap();
env::set_var("OUT_DIR", tmp_dir.path());

let harfbuzz = ::find_package("harfbuzz").unwrap();
Expand Down Expand Up @@ -1744,7 +1745,7 @@ mod tests {
env::set_var("VCPKG_ROOT", vcpkg_test_tree_loc("normalized"));
env::set_var("TARGET", "x86_64-unknown-linux-gnu");
// env::set_var("VCPKGRS_DYNAMIC", "1");
let tmp_dir = tempdir::TempDir::new("vcpkg_tests").unwrap();
let tmp_dir = tempdir().unwrap();
env::set_var("OUT_DIR", tmp_dir.path());

let target_triplet = msvc_target().unwrap();
Expand Down

0 comments on commit a8ff8c2

Please sign in to comment.