Skip to content

Drop old tempdir dep #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
workingjubilee merged 1 commit into from
Jul 14, 2023
+6 −72
Merged

Drop old tempdir dep #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 3 additions & 66 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions plrust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ pgrx = { version = "=0.9.7" }
# language handler support
libloading = "0.8.0"
toml = "0.7.4"
tempdir = "0.3.7" # for building crates
tempfile = "3.6.0"

# error handling, tracing, formatting
Expand All @@ -68,6 +67,5 @@ memfd = "0.6.3" # for anonymously writing/loading user function .so

[dev-dependencies]
pgrx-tests = { version = "=0.9.7" }
tempdir = "0.3.7"
once_cell = "1.18.0"
toml = "0.7.4"
7 changes: 3 additions & 4 deletions plrust/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,19 +1403,18 @@ insert into people (p) values (make_person('Dr. Beverly Crusher of the Starship
#[cfg(any(test, feature = "pg_test"))]
pub mod pg_test {
use once_cell::sync::Lazy;
use tempdir::TempDir;
use tempfile::{tempdir, TempDir};

static WORK_DIR: Lazy<String> = Lazy::new(|| {
let work_dir = TempDir::new("plrust-tests").expect("Couldn't create tempdir");
let work_dir = tempdir().expect("Couldn't create tempdir");
format!("plrust.work_dir='{}'", work_dir.path().display())
});
static LOG_LEVEL: &str = "plrust.tracing_level=trace";

static PLRUST_ALLOWED_DEPENDENCIES_FILE_NAME: &str = "allowed_deps.toml";
static PLRUST_ALLOWED_DEPENDENCIES_FILE_DIRECTORY: Lazy<TempDir> = Lazy::new(|| {
use std::io::Write;
let temp_allowed_deps_dir =
TempDir::new("plrust-allowed-deps").expect("Couldnt create tempdir");
let temp_allowed_deps_dir = tempdir().expect("Couldnt create tempdir");

let file_path = temp_allowed_deps_dir
.path()
Expand Down