Skip to content

Commit a1eceb4

Browse files
jgarzikjgarzik
authored
Merge pull request #381 from fox0/noenv
Remove compile-time macro env!
2 parents 8a7cbe4 + 4ea3433 commit a1eceb4

Some content is hidden

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

96 files changed

+191
-193
lines changed

‎.cargo/config.toml‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎awk/src/main.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ fn exit_if_error<T, U: Display>(r: Result<T, U>) -> T {
5656

5757
fn main() -> Result<(), Box<dyn Error>> {
5858
setlocale(LocaleCategory::LcAll, "");
59-
textdomain(env!("PROJECT_NAME"))?;
60-
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
59+
textdomain("posixutils-rs")?;
60+
bind_textdomain_codeset("posixutils-rs", "UTF-8")?;
6161

6262
let args = Args::parse();
6363

‎calc/bc.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ fn print_output_or_error(result: ExecutionResult<String>) {
4444

4545
fn main() -> Result<()> {
4646
setlocale(LocaleCategory::LcAll, "");
47-
textdomain(env!("PROJECT_NAME"))?;
48-
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
47+
textdomain("posixutils-rs")?;
48+
bind_textdomain_codeset("posixutils-rs", "UTF-8")?;
4949

5050
let args = Args::parse();
5151

‎calc/expr.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,8 @@ fn eval_expression(tokens: &[Token]) -> Result<Token, &'static str> {
370370

371371
fn main() -> Result<(), Box<dyn std::error::Error>> {
372372
setlocale(LocaleCategory::LcAll, "");
373-
textdomain(env!("PROJECT_NAME"))?;
374-
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
373+
textdomain("posixutils-rs")?;
374+
bind_textdomain_codeset("posixutils-rs", "UTF-8")?;
375375

376376
// tokenize and evaluate the expression
377377
let arg_tokens = tokenize();

‎datetime/cal.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ fn print_year(year: u32) {
9494

9595
fn main() -> Result<(), Box<dyn std::error::Error>> {
9696
setlocale(LocaleCategory::LcAll, "");
97-
textdomain(env!("PROJECT_NAME"))?;
98-
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
97+
textdomain("posixutils-rs")?;
98+
bind_textdomain_codeset("posixutils-rs", "UTF-8")?;
9999

100100
let mut args = Args::parse();
101101

‎datetime/date.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ fn set_time(utc: bool, timestr: &str) -> Result<(), &'static str> {
146146

147147
fn main() -> Result<(), Box<dyn std::error::Error>> {
148148
setlocale(LocaleCategory::LcAll, "");
149-
textdomain(env!("PROJECT_NAME"))?;
150-
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
149+
textdomain("posixutils-rs")?;
150+
bind_textdomain_codeset("posixutils-rs", "UTF-8")?;
151151

152152
let args = Args::parse();
153153

‎datetime/sleep.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ struct Args {
2323

2424
fn main() -> Result<(), Box<dyn std::error::Error>> {
2525
setlocale(LocaleCategory::LcAll, "");
26-
textdomain(env!("PROJECT_NAME"))?;
27-
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
26+
textdomain("posixutils-rs")?;
27+
bind_textdomain_codeset("posixutils-rs", "UTF-8")?;
2828

2929
let args = Args::parse();
3030

‎datetime/time.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ impl Status {
132132

133133
fn main() -> Result<(), Box<dyn std::error::Error>> {
134134
setlocale(LocaleCategory::LcAll, "");
135-
textdomain(env!("PROJECT_NAME"))?;
136-
bindtextdomain(env!("PROJECT_NAME"), "locale")?;
137-
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
135+
textdomain("posixutils-rs")?;
136+
bindtextdomain("posixutils-rs", "locale")?;
137+
bind_textdomain_codeset("posixutils-rs", "UTF-8")?;
138138

139139
let args = Args::parse();
140140

‎dev/nm.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ fn show_object_file(args: &Args) -> Result<(), Box<dyn std::error::Error>> {
143143

144144
fn main() -> Result<(), Box<dyn std::error::Error>> {
145145
setlocale(LocaleCategory::LcAll, "");
146-
textdomain(env!("PROJECT_NAME"))?;
147-
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
146+
textdomain("posixutils-rs")?;
147+
bind_textdomain_codeset("posixutils-rs", "UTF-8")?;
148148

149149
let args = Args::parse();
150150

‎dev/strings.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ where
187187

188188
fn main() -> StringsResult {
189189
setlocale(LocaleCategory::LcAll, "");
190-
textdomain(env!("PROJECT_NAME"))?;
191-
bind_textdomain_codeset(env!("PROJECT_NAME"), "UTF-8")?;
190+
textdomain("posixutils-rs")?;
191+
bind_textdomain_codeset("posixutils-rs", "UTF-8")?;
192192

193193
let args = Args::parse();
194194

0 commit comments

Comments
 (0)