bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

[Refactor] Rename Lint and LintGroup\'s is_loaded to is_externally_loaded

Browse source
This commit is contained in:
blyxyas 2024-04-29 15:44:51 +02:00
parent 90846015cc
commit d31b7db8e4
4 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_driver_impl/src/lib.rs
View file

@ -971,7 +971,7 @@ Available lint options:
let lint_store = unerased_lint_store(sess); let lint_store = unerased_lint_store(sess);
let (loaded, builtin): (Vec<_>, _) = let (loaded, builtin): (Vec<_>, _) =
lint_store.get_lints().iter().cloned().partition(|&lint| lint.is_loaded); lint_store.get_lints().iter().cloned().partition(|&lint| lint.is_externally_loaded);
let loaded = sort_lints(sess, loaded); let loaded = sort_lints(sess, loaded);
let builtin = sort_lints(sess, builtin); let builtin = sort_lints(sess, builtin);

18
compiler/rustc_lint/src/context.rs
View file

@ -110,7 +110,7 @@ struct LintAlias {
struct LintGroup { struct LintGroup {
lint_ids: Vec<LintId>, lint_ids: Vec<LintId>,
is_loaded: bool, is_externally_loaded: bool,
depr: Option<LintAlias>, depr: Option<LintAlias>,
} }
@ -159,7 +159,9 @@ impl LintStore {
// Don't display deprecated lint groups. // Don't display deprecated lint groups.
depr.is_none() depr.is_none()
}) })
.map(|(k, LintGroup { lint_ids, is_loaded, .. })| (*k, lint_ids.clone(), *is_loaded)) .map(|(k, LintGroup { lint_ids, is_externally_loaded, .. })| {
(*k, lint_ids.clone(), *is_externally_loaded)
})
} }
pub fn register_early_pass( pub fn register_early_pass(
@ -218,7 +220,7 @@ impl LintStore {
.entry(edition.lint_name()) .entry(edition.lint_name())
.or_insert(LintGroup { .or_insert(LintGroup {
lint_ids: vec![], lint_ids: vec![],
is_loaded: lint.is_loaded, is_externally_loaded: lint.is_externally_loaded,
depr: None, depr: None,
}) })
.lint_ids .lint_ids
@ -231,7 +233,7 @@ impl LintStore {
.entry("future_incompatible") .entry("future_incompatible")
.or_insert(LintGroup { .or_insert(LintGroup {
lint_ids: vec![], lint_ids: vec![],
is_loaded: lint.is_loaded, is_externally_loaded: lint.is_externally_loaded,
depr: None, depr: None,
}) })
.lint_ids .lint_ids
@ -246,7 +248,7 @@ impl LintStore {
alias, alias,
LintGroup { LintGroup {
lint_ids: vec![], lint_ids: vec![],
is_loaded: false, is_externally_loaded: false,
depr: Some(LintAlias { name: lint_name, silent: true }), depr: Some(LintAlias { name: lint_name, silent: true }),
}, },
); );
@ -254,21 +256,21 @@ impl LintStore {
pub fn register_group( pub fn register_group(
&mut self, &mut self,
is_loaded: bool, is_externally_loaded: bool,
name: &'static str, name: &'static str,
deprecated_name: Option<&'static str>, deprecated_name: Option<&'static str>,
to: Vec<LintId>, to: Vec<LintId>,
) { ) {
let new = self let new = self
.lint_groups .lint_groups
.insert(name, LintGroup { lint_ids: to, is_loaded, depr: None }) .insert(name, LintGroup { lint_ids: to, is_externally_loaded, depr: None })
.is_none(); .is_none();
if let Some(deprecated) = deprecated_name { if let Some(deprecated) = deprecated_name {
self.lint_groups.insert( self.lint_groups.insert(
deprecated, deprecated,
LintGroup { LintGroup {
lint_ids: vec![], lint_ids: vec![],
is_loaded, is_externally_loaded,
depr: Some(LintAlias { name, silent: false }), depr: Some(LintAlias { name, silent: false }),
}, },
); );

9
compiler/rustc_lint_defs/src/lib.rs
View file

@ -323,7 +323,8 @@ pub struct Lint {
pub future_incompatible: Option<FutureIncompatibleInfo>, pub future_incompatible: Option<FutureIncompatibleInfo>,
pub is_loaded: bool, /// `true` if this lint is being loaded by another tool (e.g. Clippy).
pub is_externally_loaded: bool,
/// `Some` if this lint is feature gated, otherwise `None`. /// `Some` if this lint is feature gated, otherwise `None`.
pub feature_gate: Option<Symbol>, pub feature_gate: Option<Symbol>,
@ -468,7 +469,7 @@ impl Lint {
default_level: Level::Forbid, default_level: Level::Forbid,
desc: "", desc: "",
edition_lint_opts: None, edition_lint_opts: None,
is_loaded: false, is_externally_loaded: false,
report_in_external_macro: false, report_in_external_macro: false,
future_incompatible: None, future_incompatible: None,
feature_gate: None, feature_gate: None,
@ -817,7 +818,7 @@ macro_rules! declare_lint {
name: stringify!($NAME), name: stringify!($NAME),
default_level: $crate::$Level, default_level: $crate::$Level,
desc: $desc, desc: $desc,
is_loaded: false, is_externally_loaded: false,
$($v: true,)* $($v: true,)*
$(feature_gate: Some($gate),)? $(feature_gate: Some($gate),)?
$(future_incompatible: Some($crate::FutureIncompatibleInfo { $(future_incompatible: Some($crate::FutureIncompatibleInfo {
@ -859,7 +860,7 @@ macro_rules! declare_tool_lint {
edition_lint_opts: None, edition_lint_opts: None,
report_in_external_macro: $external, report_in_external_macro: $external,
future_incompatible: None, future_incompatible: None,
is_loaded: true, is_externally_loaded: true,
$(feature_gate: Some($gate),)? $(feature_gate: Some($gate),)?
crate_level_only: false, crate_level_only: false,
..$crate::Lint::default_fields_for_macro() ..$crate::Lint::default_fields_for_macro()

4
tests/ui/statics/nested_struct.rs
View file

@ -9,7 +9,7 @@ pub struct Lint {
pub name: &'static str, pub name: &'static str,
pub desc: &'static str, pub desc: &'static str,
pub report_in_external_macro: bool, pub report_in_external_macro: bool,
pub is_loaded: bool, pub is_externally_loaded: bool,
pub crate_level_only: bool, pub crate_level_only: bool,
} }
@ -17,7 +17,7 @@ static FOO: &Lint = &Lint {
name: &"foo", name: &"foo",
desc: "desc", desc: "desc",
report_in_external_macro: false, report_in_external_macro: false,
is_loaded: true, is_externally_loaded: true,
crate_level_only: false, crate_level_only: false,
}; };