Move check_cfg to rustc_attr_parsing

Author: JonathanBrouwer

Cargo.lock

@@ -3461,6 +3461,7 @@ dependencies = [
  "rustc_hir",
  "rustc_lexer",
  "rustc_macros",
+ "rustc_middle",
  "rustc_parse",
  "rustc_session",
  "rustc_span",

compiler/rustc_attr_parsing/Cargo.toml

@@ -14,6 +14,7 @@ rustc_fluent_macro = { path = "../rustc_fluent_macro" }
 rustc_hir = { path = "../rustc_hir" }
 rustc_lexer = { path = "../rustc_lexer" }
 rustc_macros = { path = "../rustc_macros" }
+rustc_middle = { path = "../rustc_middle" }
 rustc_parse = { path = "../rustc_parse" }
 rustc_session = { path = "../rustc_session" }
 rustc_span = { path = "../rustc_span" }

compiler/rustc_attr_parsing/messages.ftl

@@ -219,6 +219,49 @@ attr_parsing_stability_outside_std = stability attributes may not be used outsid
 attr_parsing_suffixed_literal_in_attribute = suffixed literals are not allowed in attributes
     .help = instead of using a suffixed literal (`1u8`, `1.0f32`, etc.), use an unsuffixed version (`1`, `1.0`, etc.)
 
+attr_parsing_unexpected_cfg_add_build_rs_println = or consider adding `{$build_rs_println}` to the top of the `build.rs`
+attr_parsing_unexpected_cfg_add_cargo_feature = consider using a Cargo feature instead
+attr_parsing_unexpected_cfg_add_cargo_toml_lint_cfg = or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint:{$cargo_toml_lint_cfg}
+attr_parsing_unexpected_cfg_add_cmdline_arg = to expect this configuration use `{$cmdline_arg}`
+attr_parsing_unexpected_cfg_cargo_update = the {$macro_kind} `{$macro_name}` may come from an old version of the `{$crate_name}` crate, try updating your dependency with `cargo update -p {$crate_name}`
+
+attr_parsing_unexpected_cfg_define_features = consider defining some features in `Cargo.toml`
+attr_parsing_unexpected_cfg_doc_cargo = see <https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html> for more information about checking conditional configuration
+attr_parsing_unexpected_cfg_doc_rustc = see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
+
+attr_parsing_unexpected_cfg_from_external_macro_origin = using a cfg inside a {$macro_kind} will use the cfgs from the destination crate and not the ones from the defining crate
+attr_parsing_unexpected_cfg_from_external_macro_refer = try referring to `{$macro_name}` crate for guidance on how handle this unexpected cfg
+attr_parsing_unexpected_cfg_name = unexpected `cfg` condition name: `{$name}`
+attr_parsing_unexpected_cfg_name_expected_names = expected names are: {$possibilities}{$and_more ->
+        [0] {""}
+        *[other] {" "}and {$and_more} more
+    }
+attr_parsing_unexpected_cfg_name_expected_values = expected values for `{$best_match}` are: {$possibilities}
+attr_parsing_unexpected_cfg_name_similar_name = there is a config with a similar name
+attr_parsing_unexpected_cfg_name_similar_name_different_values = there is a config with a similar name and different values
+attr_parsing_unexpected_cfg_name_similar_name_no_value = there is a config with a similar name and no value
+attr_parsing_unexpected_cfg_name_similar_name_value = there is a config with a similar name and value
+attr_parsing_unexpected_cfg_name_version_syntax = there is a similar config predicate: `version("..")`
+attr_parsing_unexpected_cfg_name_with_similar_value = found config with similar value
+
+attr_parsing_unexpected_cfg_value = unexpected `cfg` condition value: {$has_value ->
+        [true] `{$value}`
+        *[false] (none)
+    }
+attr_parsing_unexpected_cfg_value_add_feature = consider adding `{$value}` as a feature in `Cargo.toml`
+attr_parsing_unexpected_cfg_value_expected_values = expected values for `{$name}` are: {$have_none_possibility ->
+        [true] {"(none), "}
+        *[false] {""}
+    }{$possibilities}{$and_more ->
+        [0] {""}
+        *[other] {" "}and {$and_more} more
+    }
+attr_parsing_unexpected_cfg_value_no_expected_value = no expected value for `{$name}`
+attr_parsing_unexpected_cfg_value_no_expected_values = no expected values for `{$name}`
+attr_parsing_unexpected_cfg_value_remove_condition = remove the condition
+attr_parsing_unexpected_cfg_value_remove_value = remove the value
+attr_parsing_unexpected_cfg_value_similar_name = there is a expected value with a similar name
+attr_parsing_unexpected_cfg_value_specify_value = specify a config value
 attr_parsing_unknown_meta_item =
     unknown meta item '{$item}'
     .label = expected one of {$expected}

compiler/rustc_attr_parsing/src/attributes/cfg.rs

@@ -1,3 +1,5 @@
+pub(crate) mod check_cfg;
+
 use rustc_ast::token::Delimiter;
 use rustc_ast::tokenstream::DelimSpan;
 use rustc_ast::{AttrItem, Attribute, CRATE_NODE_ID, LitKind, NodeId, ast, token};

…_lint/src/early/diagnostics/check_cfg.rs …_parsing/src/attributes/cfg/check_cfg.rscompiler/rustc_lint/src/early/diagnostics/check_cfg.rs renamed to compiler/rustc_attr_parsing/src/attributes/cfg/check_cfg.rs compiler/rustc_lint/src/early/diagnostics/check_cfg.rs renamed to compiler/rustc_attr_parsing/src/attributes/cfg/check_cfg.rs

@@ -6,7 +6,7 @@ use rustc_session::config::ExpectedValues;
 use rustc_span::edit_distance::find_best_match_for_name;
 use rustc_span::{ExpnKind, Ident, Span, Symbol, sym};
 
-use crate::lints;
+use crate::session_diagnostics as lints;
 
 const MAX_CHECK_CFG_NAMES_OR_VALUES: usize = 35;
 
@@ -109,7 +109,7 @@ fn cargo_macro_help(
     }
 }
 
-pub(super) fn unexpected_cfg_name(
+pub fn unexpected_cfg_name(
     sess: &Session,
     tcx: Option<TyCtxt<'_>>,
     (name, name_span): (Symbol, Span),
@@ -266,7 +266,7 @@ pub(super) fn unexpected_cfg_name(
     lints::UnexpectedCfgName { code_sugg, invocation_help, name }
 }
 
-pub(super) fn unexpected_cfg_value(
+pub fn unexpected_cfg_value(
     sess: &Session,
     tcx: Option<TyCtxt<'_>>,
     (name, name_span): (Symbol, Span),
@@ -353,7 +353,7 @@ pub(super) fn unexpected_cfg_value(
         // basic heuristic, we use the "cheat" unstable feature enable method and the
         // non-ui-testing enabled option.
         || (matches!(sess.psess.unstable_features, rustc_feature::UnstableFeatures::Cheat)
-            && !sess.opts.unstable_opts.ui_testing);
+        && !sess.opts.unstable_opts.ui_testing);
 
     let inst = |escape_quotes| {
         to_check_cfg_arg(Ident::new(name, name_span), value.map(|(v, _s)| v), escape_quotes)

compiler/rustc_attr_parsing/src/lib.rs

@@ -102,6 +102,7 @@ mod session_diagnostics;
 mod target_checking;
 pub mod validate_attr;
 
+pub use attributes::cfg::check_cfg::{unexpected_cfg_name, unexpected_cfg_value};
 pub use attributes::cfg::{
     CFG_TEMPLATE, EvalConfigResult, eval_config_entry, parse_cfg, parse_cfg_attr, parse_cfg_entry,
 };