Try tweaking the env def-path and unconditionally exposing the env diagnostic item

Author: thomcc

plrust/build

@@ -75,7 +75,7 @@ fi
         git pull
         git submodule update --init --recursive
     else
-        git clone https://github.com/tcdi/postgrestd.git --branch "rust-1.73.0" --recurse-submodules
+        git clone https://github.com/tcdi/postgrestd.git --branch "thomcc/uncond-env" --recurse-submodules
         cd ./postgrestd
     fi
     rm -f rust-toolchain.toml

plrustc/plrustc/src/lints/builtin_macros.rs

@@ -61,6 +61,10 @@ impl PlrustBuiltinMacros {
         let env_def_paths: &[&[Symbol]] = &[
             &[sym!(core), sym!(macros), sym!(builtin), sym!(env)],
             &[sym!(core), sym!(macros), sym!(builtin), sym!(option_env)],
+            &[sym!(core), sym!(macros), sym!(env)],
+            &[sym!(core), sym!(macros), sym!(option_env)],
+            &[sym!(core), sym!(env)],
+            &[sym!(core), sym!(option_env)],
         ];
         if let Some((s, ..)) = utils::check_span_against_macro_def_paths(cx, span, &env_def_paths) {
             self.lint_env(cx, s);