about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-12-17 04:23:08 +0000
committerbors <bors@rust-lang.org>2023-12-17 04:23:08 +0000
commitcac74d98f6730b8419cfcff5d153a39de9c387b4 (patch)
treebc3000cd9000e088af19480c8c610ad5cd0d9e08
parentbe035e80e8633eb93850b28370b60b4534c96330 (diff)
parent6adb21a40851d7b2432e89e6b43b83bc72812c8e (diff)
downloadrust-cac74d98f6730b8419cfcff5d153a39de9c387b4.tar.gz
rust-cac74d98f6730b8419cfcff5d153a39de9c387b4.zip
Auto merge of #118830 - GuillaumeGomez:env-tracked_env, r=Nilstrieb
Add support for `--env` on `tracked_env::var`

Follow-up of https://github.com/rust-lang/rust/pull/118368.
Part of Part of https://github.com/rust-lang/rust/issues/80792.

It adds support of the `--env` option for proc-macros through `tracked_env::var`.

r? `@Nilstrieb`
-rw-r--r--crates/proc-macro-srv/src/server.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/crates/proc-macro-srv/src/server.rs b/crates/proc-macro-srv/src/server.rs
index 54430e0d190..917d8a6e26a 100644
--- a/crates/proc-macro-srv/src/server.rs
+++ b/crates/proc-macro-srv/src/server.rs
@@ -58,6 +58,10 @@ impl server::Types for RustAnalyzer {
 }
 
 impl server::FreeFunctions for RustAnalyzer {
+    fn injected_env_var(&mut self, _var: &str) -> Option<String> {
+        None
+    }
+
     fn track_env_var(&mut self, _var: &str, _value: Option<&str>) {
         // FIXME: track env var accesses
         // https://github.com/rust-lang/rust/pull/71858