add --env to env-dep-info test

Author: beepster4096

library/proc_macro/src/lib.rs

@@ -1508,7 +1508,7 @@ pub mod tracked_env {
         let injected_value = crate::bridge::client::FreeFunctions::injected_env_var(key);
         let env_value = env::var(key);
 
-        let value = injected_value.map_or_else(env_value, Ok);
+        let value = injected_value.map_or(env_value, Ok);
         crate::bridge::client::FreeFunctions::track_env_var(key, value.as_deref().ok());
         value
     }

src/test/run-make/env-dep-info/Makefile

@@ -7,13 +7,17 @@ ADDITIONAL_ARGS := $(RUSTFLAGS)
 endif
 
 all:
-	EXISTING_ENV=1 EXISTING_OPT_ENV=1 $(RUSTC) --emit dep-info main.rs
+	EXISTING_ENV=1 EXISTING_OPT_ENV=1 OVERRIDEN_INJECTED_ENV=0 $(RUSTC) --emit dep-info --env INJECTED_ENV=1 --env OVERRIDEN_ENV=1 main.rs
 	$(CGREP) "# env-dep:EXISTING_ENV=1" < $(TMPDIR)/main.d
 	$(CGREP) "# env-dep:EXISTING_OPT_ENV=1" < $(TMPDIR)/main.d
 	$(CGREP) "# env-dep:NONEXISTENT_OPT_ENV" < $(TMPDIR)/main.d
 	$(CGREP) "# env-dep:ESCAPE\nESCAPE\\" < $(TMPDIR)/main.d
+	$(CGREP) "# env-dep:INJECTED_ENV=1" < $(TMPDIR)/main.d
+	$(CGREP) "# env-dep:OVERRIDEN_ENV=1" < $(TMPDIR)/main.d
 	# Proc macro
 	$(BARE_RUSTC) $(ADDITIONAL_ARGS) --out-dir $(TMPDIR) macro_def.rs
-	EXISTING_PROC_MACRO_ENV=1 $(RUSTC) --emit dep-info macro_use.rs
+	EXISTING_PROC_MACRO_ENV=1 OVERRIDEN_PROC_MACRO_ENV=0 $(RUSTC) --emit dep-info --env INJECTED_PROC_MACRO_ENV=1 --env OVERRIDEN_PROC_MACRO_ENV=1 macro_use.rs
 	$(CGREP) "# env-dep:EXISTING_PROC_MACRO_ENV=1" < $(TMPDIR)/macro_use.d
 	$(CGREP) "# env-dep:NONEXISTENT_PROC_MACEO_ENV" < $(TMPDIR)/macro_use.d
+	$(CGREP) "# env-dep:INJECTED_PROC_MACRO_ENV=1" < $(TMPDIR)/macro_use.d
+	$(CGREP) "# env-dep:OVERRIDEN_PROC_MACRO_ENV=1" < $(TMPDIR)/macro_use.d

src/test/run-make/env-dep-info/macro_def.rs

@@ -8,5 +8,7 @@ use proc_macro::*;
 pub fn access_env_vars(_: TokenStream) -> TokenStream {
     let _ = tracked_env::var("EXISTING_PROC_MACRO_ENV");
     let _ = tracked_env::var("NONEXISTENT_PROC_MACEO_ENV");
+    let _ = tracked_env::var("INJECTED_PROC_MACRO_ENV");
+    let _ = tracked_env::var("OVERRIDEN_PROC_MACRO_ENV");
     TokenStream::new()
 }

src/test/run-make/env-dep-info/main.rs

@@ -3,4 +3,6 @@ fn main() {
     option_env!("EXISTING_OPT_ENV");
     option_env!("NONEXISTENT_OPT_ENV");
     option_env!("ESCAPE\nESCAPE\\");
+    env!("INJECTED_ENV");
+    env!("OVERRIDEN_ENV");
 }