Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-28 20:16:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge #11924

Browse Source 
11924: internal: remove `FnFlags::IS_IN_EXTERN_BLOCK` r=jonas-schievink a=jonas-schievink

This flag was determined purely based on the AST, which cannot work reliably since macros are allowed in `extern` blocks (in which case the function would not have an extern block parent in the AST).

bors r+

Co-authored-by: Jonas Schievink <jonas.schievink@ferrous-systems.com>
This commit is contained in:
bors[bot]
2022-04-07 13:23:50 +00:00
committed by GitHub
parent 134dbc6104 6501e45131
commit 8765baaf9d
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/hir_def/src/data.rs
-8
View File
@@ -57,10 +57,6 @@ pub(crate) fn fn_data_query(db: &dyn DefDatabase, func: FunctionId) -> Arc<Funct
flags.bits |= FnFlags::IS_VARARGS;
}
if matches!(loc.container, ItemContainerId::ExternBlockId(_)) {
flags.bits |= FnFlags::IS_IN_EXTERN_BLOCK;
}
let legacy_const_generics_indices = item_tree
.attrs(db, krate, ModItem::from(loc.id.value).into())
.by_key("rustc_legacy_const_generics")
@@ -114,10 +110,6 @@ pub fn is_unsafe(&self) -> bool {
self.flags.bits & FnFlags::IS_UNSAFE != 0
}
pub fn is_in_extern_block(&self) -> bool {
self.flags.bits & FnFlags::IS_IN_EXTERN_BLOCK != 0
}
pub fn is_varargs(&self) -> bool {
self.flags.bits & FnFlags::IS_VARARGS != 0
}
crates/hir_def/src/item_tree.rs
-3
View File
@@ -612,9 +612,6 @@ impl FnFlags {
pub(crate) const IS_CONST: u8 = 1 << 3;
pub(crate) const IS_ASYNC: u8 = 1 << 4;
pub(crate) const IS_UNSAFE: u8 = 1 << 5;
/// Whether the function is located in an `extern` block (*not* whether it is an
/// `extern "abi" fn`).
pub(crate) const IS_IN_EXTERN_BLOCK: u8 = 1 << 6;
pub(crate) const IS_VARARGS: u8 = 1 << 7;
}
crates/hir_ty/src/diagnostics/decl_check.rs
+3 -2
View File
@@ -19,7 +19,8 @@
adt::VariantData,
expr::{Pat, PatId},
src::HasSource,
AdtId, AttrDefId, ConstId, EnumId, FunctionId, Lookup, ModuleDefId, StaticId, StructId,
AdtId, AttrDefId, ConstId, EnumId, FunctionId, ItemContainerId, Lookup, ModuleDefId, StaticId,
StructId,
};
use hir_expand::{
name::{AsName, Name},
@@ -198,7 +199,7 @@ fn allowed(&self, id: AttrDefId, allow_name: &str, recursing: bool) -> bool {
fn validate_func(&mut self, func: FunctionId) {
let data = self.db.function_data(func);
if data.is_in_extern_block() {
if matches!(func.lookup(self.db.upcast()).container, ItemContainerId::ExternBlockId(_)) {
cov_mark::hit!(extern_func_incorrect_case_ignored);
return;
}