Use dedicated method for cargo detection

Urgau · Urgau · commit 7c21492124b8 · 2024-02-29T00:19:37.000+01:00
diff --git a/compiler/rustc_lint/src/non_local_def.rs b/compiler/rustc_lint/src/non_local_def.rs
@@ -81,7 +81,7 @@ impl<'tcx> LateLintPass<'tcx> for NonLocalDefinitions {
             if let Some(def_id) = oexpn.macro_def_id
                 && let ExpnKind::Macro(macro_kind, macro_name) = oexpn.kind
                 && def_id.krate != LOCAL_CRATE
-                && std::env::var_os("CARGO").is_some()
+                && rustc_session::utils::was_invoked_from_cargo()
             {
                 Some(NonLocalDefinitionsCargoUpdateNote {
                     macro_kind: macro_kind.descr(),
diff --git a/tests/ui/lint/non_local_definitions.rs b/tests/ui/lint/non_local_definitions.rs
@@ -1,7 +1,7 @@
 //@ check-pass
 //@ edition:2021
 //@ aux-build:non_local_macro.rs
-//@ rustc-env:CARGO=/usr/bin/cargo
+//@ rustc-env:CARGO_CRATE_NAME=non_local_def
 
 #![feature(inline_const)]
 

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ impl<'tcx> LateLintPass<'tcx> for NonLocalDefinitions {`
`81`	`81`	`if let Some(def_id) = oexpn.macro_def_id`
`82`	`82`	`&& let ExpnKind::Macro(macro_kind, macro_name) = oexpn.kind`
`83`	`83`	`&& def_id.krate != LOCAL_CRATE`
`84`		`- && std::env::var_os("CARGO").is_some()`
	`84`	`+ && rustc_session::utils::was_invoked_from_cargo()`
`85`	`85`	`{`
`86`	`86`	`Some(NonLocalDefinitionsCargoUpdateNote {`
`87`	`87`	`macro_kind: macro_kind.descr(),`