Skip to content

Commit e86e3fb

Browse files
committed
misc: Use compile-time macro env!
1 parent 87b53d4 commit e86e3fb

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

misc/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ edition.workspace = true
88
rust-version.workspace = true
99

1010
[dependencies]
11-
plib = { path = "../plib" }
1211
clap.workspace = true
1312
libc.workspace = true
1413
gettext-rs.workspace = true
1514

15+
[dev-dependencies]
16+
plib = { path = "../plib" }
17+
1618
[lints]
1719
workspace = true
1820

misc/test.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@
1111
// - fix and test unary ops
1212
//
1313

14-
use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
15-
use plib::PROJECT_NAME;
16-
use std::os::unix::fs::FileTypeExt;
17-
use std::os::unix::fs::MetadataExt;
18-
use std::os::unix::fs::PermissionsExt;
14+
use std::os::unix::fs::{FileTypeExt, MetadataExt, PermissionsExt};
1915
use std::path::Path;
2016

17+
use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
18+
2119
/// Unary operators
2220
#[allow(clippy::upper_case_acronyms)]
2321
#[derive(PartialEq)]
@@ -281,8 +279,8 @@ fn eval_binary(s1: &str, op_str: &str, s2: &str) -> bool {
281279

282280
fn main() -> Result<(), Box<dyn std::error::Error>> {
283281
setlocale(LocaleCategory::LcAll, "");
284-
textdomain(PROJECT_NAME)?;
285-
bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
282+
textdomain(env!("PROJECT_NAME"))?;
283+
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
286284

287285
let mut args: Vec<String> = std::env::args().collect();
288286

misc/tests/false/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// SPDX-License-Identifier: MIT
88
//
99

10-
use plib::{run_test, TestPlan};
10+
use plib::testing::{run_test, TestPlan};
1111

1212
fn truefalse_test(cmd: &str, expected_exit_code: i32) {
1313
run_test(TestPlan {

misc/tests/test/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// SPDX-License-Identifier: MIT
99
//
1010

11-
use plib::{run_test, TestPlan};
11+
use plib::testing::{run_test, TestPlan};
1212

1313
fn test_test(args: &[&str], expected_code: i32) {
1414
let str_args: Vec<String> = args.iter().map(|s| String::from(*s)).collect();

misc/tests/true/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// SPDX-License-Identifier: MIT
88
//
99

10-
use plib::{run_test, TestPlan};
10+
use plib::testing::{run_test, TestPlan};
1111

1212
fn truefalse_test(cmd: &str, expected_exit_code: i32) {
1313
run_test(TestPlan {

0 commit comments

Comments
 (0)