Auto merge of #116487 - tamird:avoid-unwrap-absolute, r=bjorn3

bors · bors · commit fea943debfab · 2023-10-08T05:24:16.000Z
compiler: env/path handling fixes Please see individual commits. r? `@bjorn3` cf. #116426
diff --git a/build_system/main.rs b/build_system/main.rs
@@ -55,7 +55,7 @@ enum CodegenBackend {
 }
 
 fn main() {
-    if env::var("RUST_BACKTRACE").is_err() {
+    if env::var_os("RUST_BACKTRACE").is_none() {
         env::set_var("RUST_BACKTRACE", "1");
     }
     env::set_var("CG_CLIF_DISABLE_INCR_CACHE", "1");

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ enum CodegenBackend {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`fn main() {`
`58`		`- if env::var("RUST_BACKTRACE").is_err() {`
	`58`	`+ if env::var_os("RUST_BACKTRACE").is_none() {`
`59`	`59`	`env::set_var("RUST_BACKTRACE", "1");`
`60`	`60`	`}`
`61`	`61`	`env::set_var("CG_CLIF_DISABLE_INCR_CACHE", "1");`