diff options
| author | Urgau <urgau@numericable.fr> | 2024-02-29 21:02:47 +0100 |
|---|---|---|
| committer | Urgau <urgau@numericable.fr> | 2024-03-07 07:54:15 +0100 |
| commit | 98dbe9abac8e02f9a60393ae2eb2ca448c69e7d4 (patch) | |
| tree | 1a15d68a142f3aa6e08120f47394eb210628e5bf | |
| parent | 6c4eadd74746eaa21c6da1756c440b1fdabf0729 (diff) | |
| download | rust-98dbe9abac8e02f9a60393ae2eb2ca448c69e7d4.tar.gz rust-98dbe9abac8e02f9a60393ae2eb2ca448c69e7d4.zip | |
Use was_invoked_from_cargo method instead of hand-written one
| -rw-r--r-- | compiler/rustc_lint/src/non_local_def.rs | 2 | ||||
| -rw-r--r-- | tests/ui/lint/non_local_definitions.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_lint/src/non_local_def.rs b/compiler/rustc_lint/src/non_local_def.rs index 1ae1c72b6e8..7c4d92d3ce0 100644 --- a/compiler/rustc_lint/src/non_local_def.rs +++ b/compiler/rustc_lint/src/non_local_def.rs @@ -83,7 +83,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 index d14312d237a..eee582a6f11 100644 --- 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)] #![warn(non_local_definitions)] |