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

Pass real crate-level attributes to pre_expansion_lint

Browse source
This commit is contained in:
Samuel Moelius 2021-09-26 20:50:26 +00:00
parent 551220c48d
commit 1e15bbe552
3 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_interface/src/passes.rs
View file

@ -240,6 +240,7 @@ fn pre_expansion_lint(
sess: &Session,
lint_store: &LintStore,
krate: &ast::Crate,
crate_attrs: &[ast::Attribute],
crate_name: &str,
) {
sess.prof.generic_activity_with_arg("pre_AST_expansion_lint_checks", crate_name).run(|| {
@ -247,6 +248,7 @@ fn pre_expansion_lint(
sess,
lint_store,
&krate,
crate_attrs,
true,
None,
rustc_lint::BuiltinCombinedPreExpansionLintPass::new(),
@ -266,7 +268,7 @@ pub fn configure_and_expand(
resolver: &mut Resolver<'_>,
) -> Result<ast::Crate> {
tracing::trace!("configure_and_expand");
pre_expansion_lint(sess, lint_store, &krate, crate_name);
pre_expansion_lint(sess, lint_store, &krate, &krate.attrs, crate_name);
rustc_builtin_macros::register_builtin_macros(resolver);
krate = sess.time("crate_injection", || {
@ -323,9 +325,10 @@ pub fn configure_and_expand(
..rustc_expand::expand::ExpansionConfig::default(crate_name.to_string())
};
let crate_attrs = krate.attrs.clone();
let extern_mod_loaded = |ident: Ident, attrs, items, span| {
let krate = ast::Crate { attrs, items, span };
pre_expansion_lint(sess, lint_store, &krate, &ident.name.as_str());
pre_expansion_lint(sess, lint_store, &krate, &crate_attrs, &ident.name.as_str());
(krate.attrs, krate.items)
};
let mut ecx = ExtCtxt::new(&sess, cfg, resolver, Some(&extern_mod_loaded));
@ -469,6 +472,7 @@ pub fn lower_to_hir<'res, 'tcx>(
sess,
lint_store,
&krate,
&krate.attrs,
false,
Some(std::mem::take(resolver.lint_buffer())),
rustc_lint::BuiltinCombinedEarlyLintPass::new(),