Remove is_build_script check for misleading_cfg_in_build_script rustc lint

Author: GuillaumeGomez

compiler/rustc_lint/src/misleading_cfg_in_build_script.rs

@@ -19,7 +19,7 @@ declare_lint! {
     ///
     /// ### Example
     ///
-    /// ```rust,ignore (can only be run in cargo build scripts)
+    /// ```rust,ignore (should only be run in cargo build scripts)
     /// if cfg!(windows) {}
     /// ```
     ///
@@ -199,19 +199,10 @@ fn get_invalid_cfg_attrs(attr: &MetaItem, spans: &mut Vec<Span>, has_unknown: &m
     }
 }
 
-fn is_build_script(cx: &EarlyContext<'_>) -> bool {
-    rustc_session::utils::was_invoked_from_cargo()
-        && cx.sess().opts.crate_name.as_deref() == Some("build_script_build")
-}
-
 const ERROR_MESSAGE: &str = "target-based cfg should be avoided in build scripts";
 
 impl EarlyLintPass for MisleadingCfgInBuildScript {
     fn check_attribute(&mut self, cx: &EarlyContext<'_>, attr: &Attribute) {
-        if !is_build_script(cx) {
-            return;
-        }
-
         let mut spans = Vec::new();
         let mut has_unknown = false;
         match attr.name() {
@@ -252,10 +243,6 @@ impl EarlyLintPass for MisleadingCfgInBuildScript {
     }
 
     fn check_mac(&mut self, cx: &EarlyContext<'_>, call: &MacCall) {
-        if !is_build_script(cx) {
-            return;
-        }
-
         if call.path.segments.len() == 1 && call.path.segments[0].ident.name == sym::cfg {
             let mut ast = Vec::new();
             let mut has_unknown = false;

tests/ui/lint/misleading_cfg_in_build_script-no-cargo.rs

@@ -1,8 +1,6 @@
 // This test checks the `cfg()` attributes/macros in cargo build scripts.
 //
 //@ no-auto-check-cfg
-//@ rustc-env:CARGO_CRATE_NAME=build_script_build
-//@ compile-flags:--crate-name=build_script_build
 
 #![deny(misleading_cfg_in_build_script)]
 #![allow(dead_code)]

tests/ui/lint/misleading_cfg_in_build_script.rs

@@ -1,71 +1,71 @@
 error: target-based cfg should be avoided in build scripts
-  --> $DIR/misleading_cfg_in_build_script.rs:10:1
+  --> $DIR/misleading_cfg_in_build_script.rs:8:1
    |
 LL | #[cfg(windows)]
    | ^^^^^^^^^^^^^^^
    |
 note: the lint level is defined here
-  --> $DIR/misleading_cfg_in_build_script.rs:7:9
+  --> $DIR/misleading_cfg_in_build_script.rs:5:9
    |
 LL | #![deny(misleading_cfg_in_build_script)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: target-based cfg should be avoided in build scripts
-  --> $DIR/misleading_cfg_in_build_script.rs:13:1
+  --> $DIR/misleading_cfg_in_build_script.rs:11:1
    |
 LL | #[cfg(not(windows))]
    | ^^^^^^^^^^^^^^^^^^^^
 
 error: target-based cfg should be avoided in build scripts
-  --> $DIR/misleading_cfg_in_build_script.rs:16:11
+  --> $DIR/misleading_cfg_in_build_script.rs:14:11
    |
 LL | #[cfg(any(windows, feature = "yellow", unix))]
    |           ^^^^^^^                      ^^^^
 
 error: target-based cfg should be avoided in build scripts
-  --> $DIR/misleading_cfg_in_build_script.rs:27:8
+  --> $DIR/misleading_cfg_in_build_script.rs:25:8
    |
 LL |     if cfg!(windows) {}
    |        ^^^^^^^^^^^^^ help: use cargo environment variables if possible: `std::env::var("CARGO_CFG_WINDOWS").is_ok()`
 
 error: target-based cfg should be avoided in build scripts
-  --> $DIR/misleading_cfg_in_build_script.rs:29:8
+  --> $DIR/misleading_cfg_in_build_script.rs:27:8
    |
 LL |     if cfg!(not(windows)) {}
    |        ^^^^^^^^^^^^^^^^^^ help: use cargo environment variables if possible: `std::env::var("CARGO_CFG_WINDOWS").is_err()`
 
 error: target-based cfg should be avoided in build scripts
-  --> $DIR/misleading_cfg_in_build_script.rs:31:8
+  --> $DIR/misleading_cfg_in_build_script.rs:29:8
    |
 LL |     if cfg!(target_os = "freebsd") {}
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use cargo environment variables if possible: `std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default() == "freebsd"`
 
 error: target-based cfg should be avoided in build scripts
-  --> $DIR/misleading_cfg_in_build_script.rs:33:8
+  --> $DIR/misleading_cfg_in_build_script.rs:31:8
    |
 LL |     if cfg!(any(target_os = "freebsd", windows)) {}
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use cargo environment variables if possible: `std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default() == "freebsd" || std::env::var("CARGO_CFG_WINDOWS").is_ok()`
 
 error: target-based cfg should be avoided in build scripts
-  --> $DIR/misleading_cfg_in_build_script.rs:35:8
+  --> $DIR/misleading_cfg_in_build_script.rs:33:8
    |
 LL |     if cfg!(not(any(target_os = "freebsd", windows))) {}
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use cargo environment variables if possible: `!(std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default() == "freebsd" || std::env::var("CARGO_CFG_WINDOWS").is_ok())`
 
 error: target-based cfg should be avoided in build scripts
-  --> $DIR/misleading_cfg_in_build_script.rs:37:8
+  --> $DIR/misleading_cfg_in_build_script.rs:35:8
    |
 LL |     if cfg!(all(target_os = "freebsd", windows)) {}
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use cargo environment variables if possible: `std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default() == "freebsd" && std::env::var("CARGO_CFG_WINDOWS").is_ok()`
 
 error: target-based cfg should be avoided in build scripts
-  --> $DIR/misleading_cfg_in_build_script.rs:39:8
+  --> $DIR/misleading_cfg_in_build_script.rs:37:8
    |
 LL |     if cfg!(not(all(target_os = "freebsd", windows))) {}
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use cargo environment variables if possible: `!(std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default() == "freebsd" && std::env::var("CARGO_CFG_WINDOWS").is_ok())`
 
 error: target-based cfg should be avoided in build scripts
-  --> $DIR/misleading_cfg_in_build_script.rs:41:8
+  --> $DIR/misleading_cfg_in_build_script.rs:39:8
    |
 LL |     if cfg!(all(target_os = "freebsd", any(windows, not(feature = "red")))) {}
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use cargo environment variables if possible: `std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default() == "freebsd" && (std::env::var("CARGO_CFG_WINDOWS").is_ok() || cfg!(not(feature = red)))`