Skip to content

refactor: Move from Lazy to OnceCell #88

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
epage merged 1 commit into from
May 21, 2025
+66 −60
Merged

refactor: Move from Lazy to OnceCell #88

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
21 changes: 11 additions & 10 deletions crates/libtest2-mimic/tests/testsuite/all_passing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
fn test_cmd() -> snapbox::cmd::Command {
static BIN: once_cell::sync::Lazy<(std::path::PathBuf, std::path::PathBuf)> =
once_cell::sync::Lazy::new(|| {
let package_root = crate::util::new_test(
r#"
static BIN: once_cell::sync::OnceCell<(std::path::PathBuf, std::path::PathBuf)> =
once_cell::sync::OnceCell::new();
let (bin, current_dir) = BIN.get_or_init(|| {
let package_root = crate::util::new_test(
r#"
fn main() {
use libtest2_mimic::Trial;
libtest2_mimic::Harness::with_env()
Expand All @@ -14,12 +15,12 @@ fn main() {
.main();
}
"#,
false,
);
let bin = crate::util::compile_test(&package_root);
(bin, package_root)
});
snapbox::cmd::Command::new(&BIN.0).current_dir(&BIN.1)
false,
);
let bin = crate::util::compile_test(&package_root);
(bin, package_root)
});
snapbox::cmd::Command::new(bin).current_dir(current_dir)
}

fn check(args: &[&str], single: &str, parallel: &str) {
Expand Down
21 changes: 11 additions & 10 deletions crates/libtest2-mimic/tests/testsuite/mixed_bag.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
fn test_cmd() -> snapbox::cmd::Command {
static BIN: once_cell::sync::Lazy<(std::path::PathBuf, std::path::PathBuf)> =
once_cell::sync::Lazy::new(|| {
let package_root = crate::util::new_test(
r#"
static BIN: once_cell::sync::OnceCell<(std::path::PathBuf, std::path::PathBuf)> =
once_cell::sync::OnceCell::new();
let (bin, current_dir) = BIN.get_or_init(|| {
let package_root = crate::util::new_test(
r#"
fn main() {
use libtest2_mimic::Trial;
use libtest2_mimic::RunError;
Expand Down Expand Up @@ -35,12 +36,12 @@ fn main() {
.main();
}
"#,
false,
);
let bin = crate::util::compile_test(&package_root);
(bin, package_root)
});
snapbox::cmd::Command::new(&BIN.0).current_dir(&BIN.1)
false,
);
let bin = crate::util::compile_test(&package_root);
(bin, package_root)
});
snapbox::cmd::Command::new(bin).current_dir(current_dir)
}

fn check(args: &[&str], code: i32, single: &str, parallel: &str) {
Expand Down
21 changes: 11 additions & 10 deletions crates/libtest2-mimic/tests/testsuite/panic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
fn test_cmd() -> snapbox::cmd::Command {
static BIN: once_cell::sync::Lazy<(std::path::PathBuf, std::path::PathBuf)> =
once_cell::sync::Lazy::new(|| {
let package_root = crate::util::new_test(
r#"
static BIN: once_cell::sync::OnceCell<(std::path::PathBuf, std::path::PathBuf)> =
once_cell::sync::OnceCell::new();
let (bin, current_dir) = BIN.get_or_init(|| {
let package_root = crate::util::new_test(
r#"
fn main() {
use libtest2_mimic::Trial;
libtest2_mimic::Harness::with_env()
Expand All @@ -13,12 +14,12 @@ fn main() {
.main();
}
"#,
false,
);
let bin = crate::util::compile_test(&package_root);
(bin, package_root)
});
snapbox::cmd::Command::new(&BIN.0).current_dir(&BIN.1)
false,
);
let bin = crate::util::compile_test(&package_root);
(bin, package_root)
});
snapbox::cmd::Command::new(bin).current_dir(current_dir)
}

fn check(args: &[&str], code: i32, single: &str, parallel: &str) {
Expand Down
21 changes: 11 additions & 10 deletions crates/libtest2/tests/testsuite/all_passing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
fn test_cmd() -> snapbox::cmd::Command {
static BIN: once_cell::sync::Lazy<(std::path::PathBuf, std::path::PathBuf)> =
once_cell::sync::Lazy::new(|| {
let package_root = crate::util::new_test(
r#"
static BIN: once_cell::sync::OnceCell<(std::path::PathBuf, std::path::PathBuf)> =
once_cell::sync::OnceCell::new();
let (bin, current_dir) = BIN.get_or_init(|| {
let package_root = crate::util::new_test(
r#"
libtest2::libtest2_main!(foo, bar, barro);

fn foo(_state: &libtest2::State) -> libtest2::RunResult {
Expand All @@ -17,12 +18,12 @@ fn barro(_state: &libtest2::State) -> libtest2::RunResult {
Ok(())
}
"#,
false,
);
let bin = crate::util::compile_test(&package_root);
(bin, package_root)
});
snapbox::cmd::Command::new(&BIN.0).current_dir(&BIN.1)
false,
);
let bin = crate::util::compile_test(&package_root);
(bin, package_root)
});
snapbox::cmd::Command::new(bin).current_dir(current_dir)
}

fn check(args: &[&str], single: &str, parallel: &str) {
Expand Down
21 changes: 11 additions & 10 deletions crates/libtest2/tests/testsuite/mixed_bag.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
fn test_cmd() -> snapbox::cmd::Command {
static BIN: once_cell::sync::Lazy<(std::path::PathBuf, std::path::PathBuf)> =
once_cell::sync::Lazy::new(|| {
let package_root = crate::util::new_test(
r#"
static BIN: once_cell::sync::OnceCell<(std::path::PathBuf, std::path::PathBuf)> =
once_cell::sync::OnceCell::new();
let (bin, current_dir) = BIN.get_or_init(|| {
let package_root = crate::util::new_test(
r#"
libtest2::libtest2_main!(cat, dog, fox, bunny, frog, owl, fly, bear);

fn cat(_state: &libtest2::State) -> libtest2::RunResult {
Expand Down Expand Up @@ -42,12 +43,12 @@ fn bear(state: &libtest2::State) -> libtest2::RunResult {
Err(libtest2::RunError::fail("no honey"))
}
"#,
false,
);
let bin = crate::util::compile_test(&package_root);
(bin, package_root)
});
snapbox::cmd::Command::new(&BIN.0).current_dir(&BIN.1)
false,
);
let bin = crate::util::compile_test(&package_root);
(bin, package_root)
});
snapbox::cmd::Command::new(bin).current_dir(current_dir)
}

fn check(args: &[&str], code: i32, single: &str, parallel: &str) {
Expand Down
21 changes: 11 additions & 10 deletions crates/libtest2/tests/testsuite/panic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
fn test_cmd() -> snapbox::cmd::Command {
static BIN: once_cell::sync::Lazy<(std::path::PathBuf, std::path::PathBuf)> =
once_cell::sync::Lazy::new(|| {
let package_root = crate::util::new_test(
r#"
static BIN: once_cell::sync::OnceCell<(std::path::PathBuf, std::path::PathBuf)> =
once_cell::sync::OnceCell::new();
let (bin, current_dir) = BIN.get_or_init(|| {
let package_root = crate::util::new_test(
r#"
libtest2::libtest2_main!(passes, panics);

fn passes(_state: &libtest2::State) -> libtest2::RunResult {
Expand All @@ -13,12 +14,12 @@ fn panics(_state: &libtest2::State) -> libtest2::RunResult {
panic!("uh oh")
}
"#,
false,
);
let bin = crate::util::compile_test(&package_root);
(bin, package_root)
});
snapbox::cmd::Command::new(&BIN.0).current_dir(&BIN.1)
false,
);
let bin = crate::util::compile_test(&package_root);
(bin, package_root)
});
snapbox::cmd::Command::new(bin).current_dir(current_dir)
}

fn check(args: &[&str], code: i32, single: &str, parallel: &str) {
Expand Down