Skip to content

Commit 8a06a6c

Browse files
committed
sccs: Use compile-time macro env!
1 parent 4d2a359 commit 8a06a6c

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

sccs/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ edition.workspace = true
88
rust-version.workspace = true
99

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

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

1820
[[bin]]
1921
name = "what"
2022
path = "./what.rs"
21-

sccs/tests/what/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
use std::path::PathBuf;
1212

1313
fn test_file_path(file_name: &str) -> PathBuf {

sccs/what.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
// SPDX-License-Identifier: MIT
88
//
99

10-
use clap::Parser;
11-
use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
12-
use plib::PROJECT_NAME;
1310
use std::fs::File;
1411
use std::io::{self, BufRead, BufReader};
1512
use std::path::{Path, PathBuf};
1613

14+
use clap::Parser;
15+
use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
16+
1717
#[derive(Parser)]
1818
#[command(version, about = gettext("what - identify SCCS files"))]
1919
struct Args {
@@ -51,11 +51,11 @@ fn process_file<R: BufRead>(reader: R, single: bool) -> io::Result<()> {
5151
}
5252

5353
fn main() -> io::Result<()> {
54-
let args = Args::parse();
55-
5654
setlocale(LocaleCategory::LcAll, "");
57-
textdomain(PROJECT_NAME)?;
58-
bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
55+
textdomain(env!("PROJECT_NAME"))?;
56+
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
57+
58+
let args = Args::parse();
5959

6060
for file in &args.files {
6161
let path = Path::new(file);

0 commit comments

Comments
 (0)