Skip to content

Commit 28ccf7e

Browse files
jgarzikjgarzik
authored
Merge pull request #350 from fox0/envvv
Use compile-time macro env!
2 parents 3509eb9 + f95e943 commit 28ccf7e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+140
-194
lines changed

‎tree/chgrp.rs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
use clap::Parser;
1414
use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
15-
use plib::PROJECT_NAME;
1615
use std::ffi::CString;
1716
use std::path::Path;
1817
use std::{fs, io};
@@ -92,13 +91,11 @@ fn parse_group(group: &str) -> Result<u32, &'static str> {
9291
}
9392

9493
fn main() -> Result<(), Box<dyn std::error::Error>> {
95-
// parse command line arguments
96-
let args = Args::parse();
97-
98-
// initialize translations
9994
setlocale(LocaleCategory::LcAll, "");
100-
textdomain(PROJECT_NAME)?;
101-
bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
95+
textdomain(env!("PROJECT_NAME"))?;
96+
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
97+
98+
let args = Args::parse();
10299

103100
let mut exit_code = 0;
104101

‎tree/chmod.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use clap::Parser;
1111
use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
1212
use modestr::{ChmodMode, ChmodSymbolic};
13-
use plib::{modestr, PROJECT_NAME};
13+
use plib::modestr;
1414
use std::os::unix::fs::PermissionsExt;
1515
use std::path::Path;
1616
use std::{fs, io};
@@ -75,13 +75,11 @@ fn chmod_file(filename: &str, mode: &ChmodMode, recurse: bool) -> Result<(), io:
7575
}
7676

7777
fn main() -> Result<(), Box<dyn std::error::Error>> {
78-
// parse command line arguments
79-
let args = Args::parse();
80-
81-
// initialize translations
8278
setlocale(LocaleCategory::LcAll, "");
83-
textdomain(PROJECT_NAME)?;
84-
bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
79+
textdomain(env!("PROJECT_NAME"))?;
80+
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
81+
82+
let args = Args::parse();
8583

8684
let mut exit_code = 0;
8785

‎tree/chown.rs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
use clap::Parser;
1414
use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
15-
use plib::PROJECT_NAME;
1615
use std::ffi::CString;
1716
use std::os::unix::fs::MetadataExt;
1817
use std::path::Path;
@@ -132,13 +131,11 @@ fn parse_owner_group(owner_group: &str) -> Result<(u32, Option<u32>), &'static s
132131
}
133132

134133
fn main() -> Result<(), Box<dyn std::error::Error>> {
135-
// parse command line arguments
136-
let args = Args::parse();
137-
138-
// initialize translations
139134
setlocale(LocaleCategory::LcAll, "");
140-
textdomain(PROJECT_NAME)?;
141-
bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
135+
textdomain(env!("PROJECT_NAME"))?;
136+
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
137+
138+
let args = Args::parse();
142139

143140
let mut exit_code = 0;
144141

‎tree/cp.rs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ mod common;
1212
use self::common::{copy_file, copy_files, error_string, CopyConfig};
1313
use clap::Parser;
1414
use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
15-
use plib::PROJECT_NAME;
1615
use std::collections::HashSet;
1716
use std::path::PathBuf;
1817
use std::{fs, io};
@@ -103,13 +102,11 @@ fn prompt_user(prompt: &str) -> bool {
103102
}
104103

105104
fn main() -> Result<(), Box<dyn std::error::Error>> {
106-
// parse command line arguments
107-
let args = Args::parse();
108-
109-
// Initialize translation system
110105
setlocale(LocaleCategory::LcAll, "");
111-
textdomain(PROJECT_NAME)?;
112-
bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
106+
textdomain(env!("PROJECT_NAME"))?;
107+
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
108+
109+
let args = Args::parse();
113110

114111
if args.files.len() < 2 {
115112
eprintln!("{}", gettext("Must supply a source and target for copy"));

‎tree/du.rs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
use clap::Parser;
1414
use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
15-
use plib::PROJECT_NAME;
1615
use std::os::unix::fs::MetadataExt;
1716
use std::path::Path;
1817
use std::{fs, io};
@@ -104,19 +103,16 @@ fn du_cli_arg(
104103
}
105104

106105
fn main() -> Result<(), Box<dyn std::error::Error>> {
107-
// parse command line arguments
106+
setlocale(LocaleCategory::LcAll, "");
107+
textdomain(env!("PROJECT_NAME"))?;
108+
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
109+
108110
let mut args = Args::parse();
109111

110112
// default to current directory
111113
if args.files.is_empty() {
112114
args.files.push(".".to_string());
113115
}
114-
115-
// initialize translations
116-
setlocale(LocaleCategory::LcAll, "");
117-
textdomain(PROJECT_NAME)?;
118-
bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
119-
120116
let mut exit_code = 0;
121117
let mut total = 0;
122118

‎tree/link.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
use clap::Parser;
1111
use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
12-
use plib::PROJECT_NAME;
1312
use std::{fs, io};
1413

1514
/// link - call link function
@@ -29,12 +28,11 @@ fn do_link(file1: &str, file2: &str) -> io::Result<()> {
2928
}
3029

3130
fn main() -> Result<(), Box<dyn std::error::Error>> {
32-
// parse command line arguments
33-
let args = Args::parse();
34-
3531
setlocale(LocaleCategory::LcAll, "");
36-
textdomain(PROJECT_NAME)?;
37-
bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
32+
textdomain(env!("PROJECT_NAME"))?;
33+
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
34+
35+
let args = Args::parse();
3836

3937
let mut exit_code = 0;
4038

‎tree/ln.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
use clap::Parser;
1111
use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
12-
use plib::PROJECT_NAME;
1312
use std::path::{Path, PathBuf};
1413
use std::{fs, io};
1514

@@ -48,12 +47,11 @@ fn do_link_into(args: &Args, src: &str, target_dir: &str) -> io::Result<()> {
4847
}
4948

5049
fn main() -> Result<(), Box<dyn std::error::Error>> {
51-
// parse command line arguments
52-
let args = Args::parse();
53-
5450
setlocale(LocaleCategory::LcAll, "");
55-
textdomain(PROJECT_NAME)?;
56-
bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
51+
textdomain(env!("PROJECT_NAME"))?;
52+
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
53+
54+
let args = Args::parse();
5755

5856
if args.files.len() < 2 {
5957
eprintln!("{}", gettext("Must supply a source and target for linking"));

‎tree/ls.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ mod ls_util;
1212
use self::ls_util::{ls_from_utf8_lossy, Entry, LongFormatPadding, MultiColumnPadding};
1313
use clap::{CommandFactory, FromArgMatches, Parser};
1414
use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
15-
use plib::{platform::P_WINSIZE_REQUEST_CODE, PROJECT_NAME};
15+
use plib::platform::P_WINSIZE_REQUEST_CODE;
1616
use std::{
1717
collections::HashMap,
1818
ffi::{CString, OsStr},
@@ -1320,9 +1320,8 @@ fn process_single_dir(
13201320

13211321
fn main() -> ExitCode {
13221322
setlocale(LocaleCategory::LcAll, "");
1323-
textdomain(PROJECT_NAME).unwrap();
1324-
bind_textdomain_codeset(PROJECT_NAME, "UTF-8").unwrap();
1325-
1323+
textdomain(env!("PROJECT_NAME")).unwrap();
1324+
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8").unwrap();
13261325
let (config, paths) = Config::new();
13271326

13281327
match ls(paths, &config) {

‎tree/mkdir.rs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use clap::Parser;
1111
use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
1212
use modestr::ChmodMode;
13-
use plib::{modestr, PROJECT_NAME};
13+
use plib::modestr;
1414
use std::ffi::CString;
1515
use std::io;
1616
use std::path::PathBuf;
@@ -66,12 +66,11 @@ fn do_mkdir(dirname: &str, mode: &ChmodMode, parents: bool) -> io::Result<()> {
6666
}
6767

6868
fn main() -> Result<(), Box<dyn std::error::Error>> {
69-
// parse command line arguments
70-
let args = Args::parse();
71-
7269
setlocale(LocaleCategory::LcAll, "");
73-
textdomain(PROJECT_NAME)?;
74-
bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
70+
textdomain(env!("PROJECT_NAME"))?;
71+
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
72+
73+
let args = Args::parse();
7574

7675
let mut exit_code = 0;
7776

‎tree/mkfifo.rs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use clap::Parser;
1111
use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
1212
use modestr::ChmodMode;
13-
use plib::{modestr, PROJECT_NAME};
13+
use plib::modestr;
1414
use std::io;
1515

1616
/// mkfifo - make FIFO special files
@@ -40,12 +40,11 @@ fn do_mkfifo(filename: &str, mode: &ChmodMode) -> io::Result<()> {
4040
}
4141

4242
fn main() -> Result<(), Box<dyn std::error::Error>> {
43-
// parse command line arguments
44-
let args = Args::parse();
45-
4643
setlocale(LocaleCategory::LcAll, "");
47-
textdomain(PROJECT_NAME)?;
48-
bind_textdomain_codeset(PROJECT_NAME, "UTF-8")?;
44+
textdomain(env!("PROJECT_NAME"))?;
45+
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
46+
47+
let args = Args::parse();
4948

5049
let mut exit_code = 0;
5150

0 commit comments

Comments
 (0)